[v4,25/26] ARM: pxa: magician: Add missing regulator for PWM backlight

Commit Message

Petr Cvek Sept. 28, 2015, 9:40 p.m. UTC

Add a fake regulator, which is required for the correct initialization
of the PWM backlight driver.

Signed-off-by: Petr Cvek <[e-mail]>
---
 arch/arm/mach-pxa/magician.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Philipp Zabel Oct. 3, 2015, 1:02 p.m. UTC | #1

Am Montag, den 28.09.2015, 23:40 +0200 schrieb Petr Cvek:
> Add a fake regulator, which is required for the correct
> initialization
> of the PWM backlight driver.

Fixed, not fake. Even though we can't control it, the backlight does
have a supply.

> Signed-off-by: Petr Cvek <[e-mail]>

Acked-by: Philipp Zabel <[e-mail]>

regards
Philipp

Patch

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 5de33c6..8d3946d 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -425,6 +425,15 @@  static struct pxafb_mach_info samsung_info = {
  * Backlight
  */
 
+ /*
+ * 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" },
@@ -1125,6 +1134,9 @@  static void __init magician_init(void)
 	spi_register_board_info(ARRAY_AND_SIZE(ads7846_spi_board_info));
 
 	pxa_set_camera_info(&magician_pxacamera_pdata);
+
+	regulator_register_always_on(0, "power", pwm_backlight_supply,
+		ARRAY_SIZE(pwm_backlight_supply), 5000000);
 }
 
 MACHINE_START(MAGICIAN, "HTC Magician")