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

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

diff --combined arch/arm/mach-omap2/board-2430sdp.c
index cb0596b631cff4feef830b27f0904be930416b47,e551aae7d5f4f19b2ac35ad93920968f650c1d16..244d8a5aa54befd47712d22dc2a43bfb7326370e
--- 1/arch/arm/mach-omap2/board-2430sdp.c
--- 2/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@@ -38,7 -38,7 +38,7 @@@
  #include "gpmc-smc91x.h"
  
  #include <video/omapdss.h>
- #include <video/omap-panel-generic-dpi.h>
+ #include <video/omap-panel-data.h>
  
  #include "mux.h"
  #include "hsmmc.h"
@@@ -108,24 -108,13 +108,13 @@@ static struct platform_device *sdp2430_
  #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO      91
  #define SDP2430_LCD_PANEL_ENABLE_GPIO         154
  
- static int sdp2430_panel_enable_lcd(struct omap_dss_device *dssdev)
- {
-       gpio_direction_output(SDP2430_LCD_PANEL_ENABLE_GPIO, 1);
-       gpio_direction_output(SDP2430_LCD_PANEL_BACKLIGHT_GPIO, 1);
- 
-       return 0;
- }
- 
- static void sdp2430_panel_disable_lcd(struct omap_dss_device *dssdev)
- {
-       gpio_direction_output(SDP2430_LCD_PANEL_ENABLE_GPIO, 0);
-       gpio_direction_output(SDP2430_LCD_PANEL_BACKLIGHT_GPIO, 0);
- }
- 
  static struct panel_generic_dpi_data sdp2430_panel_data = {
        .name                   = "nec_nl2432dr22-11b",
-       .platform_enable        = sdp2430_panel_enable_lcd,
-       .platform_disable       = sdp2430_panel_disable_lcd,
+       .num_gpios              = 2,
+       .gpios                  = {
+               SDP2430_LCD_PANEL_ENABLE_GPIO,
+               SDP2430_LCD_PANEL_BACKLIGHT_GPIO,
+       },
  };
  
  static struct omap_dss_device sdp2430_lcd_device = {
@@@ -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,
@@@ -273,7 -242,7 +242,7 @@@ static void __init omap_2430sdp_init(vo
        gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,
                         "Secondary LCD backlight");
  
-       sdp2430_display_init();
+       omap_display_init(&sdp2430_dss_data);
  }
  
  MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")

diff --combined arch/arm/mach-omap2/board-h4.c
index 5b4ec51c385f06ecdaf0b3f0b231e0f281bee3c2,0c1bdd7ee32d7d3817b10c46c28b8fd7e072aa49..69c0acf5aa63cbf9f9f0eaeb89edb0bc52c6590c
--- 1/arch/arm/mach-omap2/board-h4.c
--- 2/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -34,7 -34,7 +34,7 @@@
  #include <asm/mach/map.h>
  
  #include <video/omapdss.h>
- #include <video/omap-panel-generic-dpi.h>
+ #include <video/omap-panel-data.h>
  
  #include "common.h"
  #include "mux.h"
@@@ -246,7 -246,7 +246,7 @@@ static u32 is_gpmc_muxed(void
                return 0;
  }
  
 -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
 +#if IS_ENABLED(CONFIG_SMC91X)
  
  static struct omap_smc91x_platform_data board_smc91x_data = {
        .cs             = 1,