Re: [PATCH v2 06/17] OMAP2,3 board files DSS Driver register moved to devices.c

2010-12-21 Thread Tomi Valkeinen
Hi,

On Mon, 2010-11-29 at 17:21 +0530, ext Guruswamy Senthilvadivu wrote:
> From: Senthilvadivu Guruswamy 
> 
> Move DSS driver register from board file to devices.c
> Regulator initialisation done with driver name instead
> of device structure name.
> Changed driver name from omapdss to omap_display as the
> driver takes care of panel information.
> Board files that have dss registeration are updated.
> 3430sdp, am3517evm, cm-t35, devkit8000, igep0020,
> omap3evm, omap3pandora, omap3stalker, rx-51

Here are also too many changes in one patch. Change the driver name
first (could be done in the previous patches), then the regulator
initialization, and then the omap_display_init() change.

 Tomi


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v2 06/17] OMAP2,3 board files DSS Driver register moved to devices.c

2010-11-29 Thread Guruswamy Senthilvadivu
From: Senthilvadivu Guruswamy 

Move DSS driver register from board file to devices.c
Regulator initialisation done with driver name instead
of device structure name.
Changed driver name from omapdss to omap_display as the
driver takes care of panel information.
Board files that have dss registeration are updated.
3430sdp, am3517evm, cm-t35, devkit8000, igep0020,
omap3evm, omap3pandora, omap3stalker, rx-51

Signed-off-by: Senthilvadivu Guruswamy 
---
 arch/arm/mach-omap2/board-3430sdp.c  |   25 -
 arch/arm/mach-omap2/board-am3517evm.c|   14 +-
 arch/arm/mach-omap2/board-cm-t35.c   |   22 +-
 arch/arm/mach-omap2/board-devkit8000.c   |   12 ++--
 arch/arm/mach-omap2/board-igep0020.c |   20 +++-
 arch/arm/mach-omap2/board-omap3beagle.c  |   14 +++---
 arch/arm/mach-omap2/board-omap3evm.c |   22 --
 arch/arm/mach-omap2/board-omap3pandora.c |   16 
 arch/arm/mach-omap2/board-omap3stalker.c |   16 +++-
 arch/arm/mach-omap2/board-rx51-peripherals.c |9 +
 arch/arm/mach-omap2/board-rx51-video.c   |   15 +--
 11 files changed, 31 insertions(+), 154 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c 
b/arch/arm/mach-omap2/board-3430sdp.c
index 4e3742c..7ff747e 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -301,22 +301,8 @@ static struct omap_dss_board_info sdp3430_dss_data = {
.default_device = &sdp3430_lcd_device,
 };
 
-static struct platform_device sdp3430_dss_device = {
-   .name   = "omapdss",
-   .id = -1,
-   .dev= {
-   .platform_data = &sdp3430_dss_data,
-   },
-};
-
-static struct regulator_consumer_supply sdp3430_vdda_dac_supply = {
-   .supply = "vdda_dac",
-   .dev= &sdp3430_dss_device.dev,
-};
-
-static struct platform_device *sdp3430_devices[] __initdata = {
-   &sdp3430_dss_device,
-};
+static struct regulator_consumer_supply sdp3430_vdda_dac_supply =
+   REGULATOR_SUPPLY("vdda_dac", "omap_display");
 
 static struct omap_board_config_kernel sdp3430_config[] __initdata = {
 };
@@ -540,10 +526,7 @@ static struct regulator_init_data sdp3430_vdac = {
 
 /* VPLL2 for digital video outputs */
 static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
-   {
-   .supply = "vdds_dsi",
-   .dev= &sdp3430_dss_device.dev,
-   }
+   REGULATOR_SUPPLY("vdds_dsi", "omap_display"),
 };
 
 static struct regulator_init_data sdp3430_vpll2 = {
@@ -797,7 +780,7 @@ static void __init omap_3430sdp_init(void)
 {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap3430_i2c_init();
-   platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
+   omap_display_init(&sdp3430_dss_data);
if (omap_rev() > OMAP3430_REV_ES1_0)
ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;
else
diff --git a/arch/arm/mach-omap2/board-am3517evm.c 
b/arch/arm/mach-omap2/board-am3517evm.c
index 0739950..19a8be7 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -367,23 +367,12 @@ static struct omap_dss_board_info am3517_evm_dss_data = {
.default_device = &am3517_evm_lcd_device,
 };
 
-static struct platform_device am3517_evm_dss_device = {
-   .name   = "omapdss",
-   .id = -1,
-   .dev= {
-   .platform_data  = &am3517_evm_dss_data,
-   },
-};
-
 /*
  * Board initialization
  */
 static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
 };
 
-static struct platform_device *am3517_evm_devices[] __initdata = {
-   &am3517_evm_dss_device,
-};
 
 static void __init am3517_evm_init_irq(void)
 {
@@ -487,8 +476,7 @@ static void __init am3517_evm_init(void)
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 
am3517_evm_i2c_init();
-   platform_add_devices(am3517_evm_devices,
-   ARRAY_SIZE(am3517_evm_devices));
+   omap_display_init(&am3517_evm_dss_data);
 
omap_serial_init();
 
diff --git a/arch/arm/mach-omap2/board-cm-t35.c 
b/arch/arm/mach-omap2/board-cm-t35.c
index 63f764e..fac5fe1 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -390,14 +390,6 @@ static struct omap_dss_board_info cm_t35_dss_data = {
.default_device = &cm_t35_dvi_device,
 };
 
-static struct platform_device cm_t35_dss_device = {
-   .name   = "omapdss",
-   .id = -1,
-   .dev= {
-   .platform_data = &cm_t35_dss_data,
-   },
-};
-
 static struct omap2_mcspi_device_config tdo24m_mcspi_config = {
.turbo_mode = 0,
.single_channel = 1,/* 0: slave, 1: master */
@@ -457,7 +449,7 @@ st