diff options
| author | Petr Cvek <petr.cvek@tul.cz> | 2015-09-28 23:40:57 +0200 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-10-14 23:07:00 +0200 |
| commit | e2f1b8b0ad1e8bd083241a79c179448ec7994b2a (patch) | |
| tree | e171dfe2d39cf1cb8f3f11ae5958f5e462a3aff2 /arch/arm/mach-pxa/magician.c | |
| parent | 539122ad349af70a6780291f7c4a5d7bf17a5b59 (diff) | |
| download | linux-e2f1b8b0ad1e8bd083241a79c179448ec7994b2a.tar.bz2 | |
ARM: pxa: magician: Add missing regulator for PWM backlight
Add a fake regulator, which is required for the correct initialization
of the PWM backlight driver.
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Acked-by: Philipp Zabel <philipp.zabel@gmail.com>
[ added a missing include for fixed regulator ]
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index c32d760f8100..d77f95ddd198 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -27,6 +27,7 @@ #include <linux/pwm.h> #include <linux/pwm_backlight.h> #include <linux/regulator/driver.h> +#include <linux/regulator/fixed.h> #include <linux/regulator/gpio-regulator.h> #include <linux/regulator/machine.h> #include <linux/usb/gpio_vbus.h> @@ -346,6 +347,15 @@ static struct pwm_lookup magician_pwm_lookup[] = { PWM_POLARITY_NORMAL), }; + /* + * fixed regulator for pwm_backlight + */ + +static struct regulator_consumer_supply pwm_backlight_supply[] = { + REGULATOR_SUPPLY("power", "pwm_backlight"), +}; + + static struct gpio magician_bl_gpios[] = { { EGPIO_MAGICIAN_BL_POWER, GPIOF_DIR_OUT, "Backlight power" }, { EGPIO_MAGICIAN_BL_POWER2, GPIOF_DIR_OUT, "Backlight power 2" }, @@ -867,6 +877,9 @@ static void __init magician_init(void) lcd_select ? &samsung_info : &toppoly_info); } else pr_err("LCD detection: CPLD mapping failed\n"); + + regulator_register_always_on(0, "power", pwm_backlight_supply, + ARRAY_SIZE(pwm_backlight_supply), 5000000); } MACHINE_START(MAGICIAN, "HTC Magician") |