Skip to contentSkip to conversation

ARM: board-zoom: Do not request LCD panel enable GPIO from twl4030

PATCH New Peter Ujfalusi 2 participants 3 messages Jan 21, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Peter Ujfalusi

author
#0 lore raw

PATCH 1/1 ARM: board-zoom: Do not request LCD panel enable GPIO from twl4030

The pin in question is muxed between GPIO7 and PWM1. For backlight control there is a custom code in board-zoom-display to control the backlight. No need to request the GPIO7 - which was failing since the way it is requested no longer valid: twl's gpio range is allocated dynamically.

Signed-off-by Peter Ujfalusi <[email protected]>

---
Hi Tony,

This patch is generated on top of my previous series for audio/pwm support:
http://www.spinics.net/lists/linux-omap/msg85085.html

Regards,
Peter

 arch/arm/mach-omap2/board-zoom-peripherals.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
arch/arm/mach-omap2/board-zoom-peripherals.c +1 -11
index f4ea926..0745bd9 100644
@@ -38,8 +38,6 @@
 #define OMAP_ZOOM_TSC2004_IRQ_GPIO	(153)
 #define OMAP_ZOOM_WLAN_IRQ_GPIO		(162)
 
-#define LCD_PANEL_ENABLE_GPIO		(7 + OMAP_MAX_GPIO_LINES)
-
 /* Zoom2 has Qwerty keyboard*/
 static uint32_t board_keymap[] = {
 	KEY(0, 0, KEY_E),

@@ -243,23 +241,15 @@ static struct omap_tw4030_pdata omap_twl4030_audio_data = {
 static int zoom_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
-	int ret;
-
 	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
 	mmc[0].gpio_cd = gpio + 0;
 	omap_hsmmc_late_init(mmc);
 
-	ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
-			       "lcd enable");
-	if (ret)
-		pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n",
-				LCD_PANEL_ENABLE_GPIO);
-
 	/* Audio setup */
 	omap_twl4030_audio_data.jack_detect = gpio + 2;
 	omap_twl4030_audio_init("Zoom2", &omap_twl4030_audio_data);
 
-	return ret;
+	return 0;
 }
 
 static struct twl4030_gpio_platform_data zoom_gpio_data = {
Signature · 1 line
1.8.1.1
maintainer
#1 lore raw

PATCH 1/1 ARM: board-zoom: Do not request LCD panel enable GPIO from twl4030

Quoted 11 lines · Peter Ujfalusi

The pin in question is muxed between GPIO7 and PWM1. For backlight control there is a custom code in board-zoom-display to control the backlight. No need to request the GPIO7 - which was failing since the way it is requested no longer valid: twl's gpio range is allocated dynamically.

Signed-off-by Peter Ujfalusi <[email protected]>

---
Hi Tony,

This patch is generated on top of my previous series for audio/pwm support:
http://www.spinics.net/lists/linux-omap/msg85085.html

Can you do a pull request for me for all the arch/arm/*omap* parts against v3.8-rc4 for the v3.9 merge window?

That way you can also merge the same branch into ASoC tree if needed as long as you keep your arch/arm/*omap* branch immutable.

Regards,

Tony

maintainer
#2 lore raw

PATCH 1/1 ARM: board-zoom: Do not request LCD panel enable GPIO from twl4030

Quoted 10 lines · Tony Lindgren
Quoted 9 lines · Peter Ujfalusi

The pin in question is muxed between GPIO7 and PWM1. For backlight control there is a custom code in board-zoom-display to control the backlight. No need to request the GPIO7 - which was failing since the way it is requested no longer valid: twl's gpio range is allocated dynamically.

Signed-off-by Peter Ujfalusi <[email protected]>

---
Hi Tony,

Quoted 8 lines
Quoted 2 lines

This patch is generated on top of my previous series for audio/pwm support:
http://www.spinics.net/lists/linux-omap/msg85085.html

Can you do a pull request for me for all the arch/arm/*omap* parts against v3.8-rc4 for the v3.9 merge window?

That way you can also merge the same branch into ASoC tree if needed as long as you keep your arch/arm/*omap* branch immutable.

Probably needs to be several branches though, at least the .dts changes should be separate for Benoit.

Regards,

Tony