From: Olof Johansson <olof@lixom.net>
Date: Fri, 11 May 2012 06:51:21 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d211093fbad99e6c38e168f71ca2ede64a51fe58;p=deliverable%2Flinux.git

Merge tag 'omap-cleanup-dss-for-v3.5' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

Clean up for omap DSS board init in preparation for adding DT support.

By Tomi Valkeinen
via Tomi Valkeinen (1) and Tony Lindgren (1)
* tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  OMAPDSS: DSI: implement generic DSI pin config
  OMAPDSS: Taal: move reset gpio handling to taal driver
  OMAPDSS: TFP410: rename dvi files to tfp410
  OMAPDSS: TFP410: rename dvi -> tfp410
  OMAP: board-files: remove custom PD GPIO handling for DVI output
  OMAPDSS: panel-dvi: add PD gpio handling

Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

d211093fbad99e6c38e168f71ca2ede64a51fe58
diff --cc arch/arm/mach-omap2/board-omap4panda.c
index 8216e5f64a6a,b26cd15f3c8b..59dd8b7f5b4f
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -420,47 -420,23 +420,22 @@@ static struct omap_board_mux board_mux[
  /* Display DVI */
  #define PANDA_DVI_TFP410_POWER_DOWN_GPIO	0
  
- static int omap4_panda_enable_dvi(struct omap_dss_device *dssdev)
- {
- 	gpio_set_value(dssdev->reset_gpio, 1);
- 	return 0;
- }
- 
- static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev)
- {
- 	gpio_set_value(dssdev->reset_gpio, 0);
- }
- 
  /* Using generic display panel */
- static struct panel_dvi_platform_data omap4_dvi_panel = {
- 	.platform_enable	= omap4_panda_enable_dvi,
- 	.platform_disable	= omap4_panda_disable_dvi,
- 	.i2c_bus_num = 3,
+ static struct tfp410_platform_data omap4_dvi_panel = {
+ 	.i2c_bus_num		= 3,
+ 	.power_down_gpio	= PANDA_DVI_TFP410_POWER_DOWN_GPIO,
  };
  
 -struct omap_dss_device omap4_panda_dvi_device = {
 +static struct omap_dss_device omap4_panda_dvi_device = {
  	.type			= OMAP_DISPLAY_TYPE_DPI,
  	.name			= "dvi",
- 	.driver_name		= "dvi",
+ 	.driver_name		= "tfp410",
  	.data			= &omap4_dvi_panel,
  	.phy.dpi.data_lines	= 24,
  	.reset_gpio		= PANDA_DVI_TFP410_POWER_DOWN_GPIO,
  	.channel		= OMAP_DSS_CHANNEL_LCD2,
  };
  
- static int __init omap4_panda_dvi_init(void)
- {
- 	int r;
- 
- 	/* Requesting TFP410 DVI GPIO and disabling it, at bootup */
- 	r = gpio_request_one(omap4_panda_dvi_device.reset_gpio,
- 				GPIOF_OUT_INIT_LOW, "DVI PD");
- 	if (r)
- 		pr_err("Failed to get DVI powerdown GPIO\n");
- 
- 	return r;
- }
--
  static struct gpio panda_hdmi_gpios[] = {
  	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
  	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
@@@ -509,13 -485,8 +484,8 @@@ static struct omap_dss_board_info omap4
  	.default_device	= &omap4_panda_dvi_device,
  };
  
 -void __init omap4_panda_display_init(void)
 +static void __init omap4_panda_display_init(void)
  {
- 	int r;
- 
- 	r = omap4_panda_dvi_init();
- 	if (r)
- 		pr_err("error initializing panda DVI\n");
  
  	omap_display_init(&omap4_panda_dss_data);