From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Chew Subject: [PATCH V4 4/9] ARM: EXYNOS: Provide regulator to pwm-backlight Date: Tue, 19 Mar 2013 11:59:28 -0700 Message-ID: <1363719573-20926-5-git-send-email-achew@nvidia.com> References: <1363719573-20926-1-git-send-email-achew@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1363719573-20926-1-git-send-email-achew-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: romain.naour-oid7hba3+9NWj0EZb7rXcA@public.gmane.org, kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, drwyrm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, stefan-WB6LKoYH/xlAfugRpC6u6w@public.gmane.org, laforge-WB6LKoYH/xlAfugRpC6u6w@public.gmane.org, philipp.zabel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, lost.distance-/E1597aS9LQAvxtiuMwx3w@public.gmane.org, marek.vasut-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, robert.jarzmik-GANU6spQydw@public.gmane.org, eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org, haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, gxt-TG0Ac1+ktVePQbnJrJN+5g@public.gmane.org, shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org, swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org Cc: thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org, acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, achew-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, openezx-devel-ZwoEplunGu3n3BO9LpVK+9i2O/JbrIOy@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org The pwm-backlight driver now takes a mandatory regulator that is gotten during driver probe. Initialize a dummy regulator to satisfy this requirement. Signed-off-by: Andrew Chew --- arch/arm/mach-exynos/mach-nuri.c | 7 +++++++ arch/arm/plat-samsung/dev-backlight.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 1ea7973..35e881e 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -294,6 +294,10 @@ static void nuri_bl_exit(struct device *dev) gpio_free(EXYNOS4_GPE2(3)); } +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("enable", "pwm-backlight"); + /* nuri pwm backlight */ static struct platform_pwm_backlight_data nuri_backlight_data = { .pwm_id = 0, @@ -1368,6 +1372,9 @@ static void __init nuri_machine_init(void) nuri_ehci_init(); s3c_hsotg_set_platdata(&nuri_hsotg_pdata); + regulator_register_always_on(-1, "backlight-enable", + &backlight_supply, 1, 0); + /* Last */ platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); } diff --git a/arch/arm/plat-samsung/dev-backlight.c b/arch/arm/plat-samsung/dev-backlight.c index 5f197dc..7277821 100644 --- a/arch/arm/plat-samsung/dev-backlight.c +++ b/arch/arm/plat-samsung/dev-backlight.c @@ -14,12 +14,18 @@ #include #include #include +#include +#include #include #include #include #include +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("enable", "pwm-backlight"); + static int samsung_bl_init(struct device *dev) { int ret = 0; @@ -37,6 +43,9 @@ static int samsung_bl_init(struct device *dev) /* Configure GPIO pin with specific GPIO function for PWM timer */ s3c_gpio_cfgpin(bl_gpio_info->no, bl_gpio_info->func); + regulator_register_always_on(-1, "backlight-enable", + &backlight_supply, 1, 0); + return 0; } -- 1.8.1.5