ARM: OMAP: H2 lcd updates for SPI framework

This is an updated patch to fix lcd for H2 board. It uses platform_data
field to pass spi_device to lcd driver.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 014118bbecfb87a056de9712b780b7c10cdf6e0e..07940545bbf1251bf14996a46b5ae408a79e732c 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -308,6 +308,17 @@ struct {
 #define TSC2101_MUX_MCLK_ON    R10_1610_MCLK_ON
 #define TSC2101_MUX_MCLK_OFF   R10_1610_MCLK_OFF
 
+static void h2_lcd_dev_init(struct spi_device *tsc2101)
+{
+       /* The LCD is connected to the GPIO pins of the TSC2101, so
+        * we have to tie them here. We can also register the LCD driver
+        * first only here, where we know that the TSC driver is ready.
+        */
+
+       h2_lcd_device.dev.platform_data = tsc2101;
+       platform_device_register(&h2_lcd_device);
+}
+
 static int h2_tsc2101_init(struct spi_device *spi)
 {
        int r;
@@ -331,6 +342,8 @@ static int h2_tsc2101_init(struct spi_device *spi)
        omap_cfg_reg(TSC2101_MUX_MCLK_OFF);
        omap_cfg_reg(N15_1610_UWIRE_CS1);
 
+       h2_lcd_dev_init(spi);
+
        return 0;
 err:
        clk_put(h2_tsc2101.mclk);
@@ -413,7 +426,6 @@ static struct platform_device *h2_devices[] __initdata = {
        &h2_smc91x_device,
        &h2_irda_device,
        &h2_kp_device,
-       &h2_lcd_device,
        &h2_mcbsp1_device,
 };