From: Olof Johansson <olof@lixom.net>
Date: Fri, 19 Apr 2013 18:40:52 +0000 (-0700)
Subject: Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: next-20130422~16^2~8^2
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=cd4cb1a7dfd7d90fa1de8b51222d96efceb6f3ef

Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup

From Tony Lindgren:
Display related clean-up from Tomi Valkeinen.

These were separated from the DSS driver changes to leave out
a dependency between the driver and arch/arm related code.

* tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device
  arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices
  arm: omap: dss-common: use picodlp panel's gpio handling
  arm: omap: board-omap3pandora: use tpo panel's gpio handling
  arm: omap: board-zoom: use NEC panel's gpio handling
  arm: omap: board-rx-51: use acx565akm panel's gpio handling
  arm: omap: board-sdp3430: use sharp panel's gpio handling
  arm: omap: board-omap3evm: use sharp panel's gpio handling
  arm: omap: board-overo: use lb035q02 dpi panel's gpio handling
  arm: omap: board-ldp: use generic dpi panel's gpio handling
  arm: omap: board-am3517: use generic dpi panel's gpio handling
  arm: omap: board-cm-t35: use generic dpi panel's gpio handling
  arm: omap: board-devkit8000: use generic dpi panel's gpio handling
  arm: omap: board-2430: use generic dpi panel's gpio handling
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  OMAPDSS: add fields to panels' platform data
  OMAPDSS: panels: keep platform data of all panels in a single header

Conflicts:
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-zoom-display.c
---

cd4cb1a7dfd7d90fa1de8b51222d96efceb6f3ef
diff --cc arch/arm/mach-omap2/board-2430sdp.c
index cb0596b631cf,e551aae7d5f4..244d8a5aa54b
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -146,27 -135,7 +135,7 @@@ static struct omap_dss_board_info sdp24
  	.default_device	= &sdp2430_lcd_device,
  };
  
- static void __init sdp2430_display_init(void)
- {
- 	int r;
- 
- 	static struct gpio gpios[] __initdata = {
- 		{ SDP2430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
- 			"LCD reset" },
- 		{ SDP2430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW,
- 			"LCD Backlight" },
- 	};
- 
- 	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
- 	if (r) {
- 		pr_err("Cannot request LCD GPIOs, error %d\n", r);
- 		return;
- 	}
- 
- 	omap_display_init(&sdp2430_dss_data);
- }
- 
 -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
 +#if IS_ENABLED(CONFIG_SMC91X)
  
  static struct omap_smc91x_platform_data board_smc91x_data = {
  	.cs		= 5,