Separate out 3430 LCD panel support from 2430 file
[pandora-kernel.git] / arch / arm / mach-omap2 / board-3430sdp.c
index fc5ca4e..7a216cc 100644 (file)
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/i2c/twl4030.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/mach/flash.h>
 
-#include <asm/arch/twl4030.h>
 #include <asm/arch/mcspi.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/board.h>
+#include <asm/arch/usb-musb.h>
+#include <asm/arch/usb-ehci.h>
+#include <asm/arch/hsmmc.h>
 #include <asm/arch/common.h>
 #include <asm/arch/keypad.h>
 #include <asm/arch/dma.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 
-#define        SDP3430_FLASH_CS        0
 #define        SDP3430_SMC91X_CS       3
 
 #define ENABLE_VAUX3_DEDICATED 0x03
 #define ENABLE_VAUX3_DEV_GRP   0x20
 
-static struct mtd_partition sdp3430_partitions[] = {
-       /* bootloader (U-Boot, etc) in first sector */
-       {
-                 .name         = "bootloader",
-                 .offset               = 0,
-                 .size         = SZ_256K,
-                 .mask_flags   = MTD_WRITEABLE, /* force read-only */
-       },
-       /* bootloader params in the next sector */
-       {
-                 .name         = "params",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = SZ_128K,
-                 .mask_flags   = 0,
-       },
-       /* kernel */
-       {
-                 .name         = "kernel",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = SZ_2M,
-                 .mask_flags   = 0
-       },
-       /* file system */
-       {
-                 .name         = "filesystem",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = MTDPART_SIZ_FULL,
-                 .mask_flags   = 0
-       }
-};
-
-static struct flash_platform_data sdp3430_flash_data = {
-       .map_name       = "cfi_probe",
-       .width          = 2,
-       .parts          = sdp3430_partitions,
-       .nr_parts       = ARRAY_SIZE(sdp3430_partitions),
-};
-
-static struct resource sdp3430_flash_resource = {
-       .start          = FLASH_BASE,
-       .end            = FLASH_BASE + SZ_64M - 1,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device sdp3430_flash_device = {
-       .name           = "omapflash",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &sdp3430_flash_data,
-       },
-       .num_resources  = 1,
-       .resource       = &sdp3430_flash_resource,
-};
 
 static struct resource sdp3430_smc91x_resources[] = {
        [0] = {
                .start  = OMAP34XX_ETHR_START,
                .end    = OMAP34XX_ETHR_START + SZ_4K,
-               .flags          = IORESOURCE_MEM,
+               .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start          = OMAP_GPIO_IRQ(OMAP34XX_ETHR_GPIO_IRQ),
+               .start  = 0,
                .end    = 0,
-               .flags          = IORESOURCE_IRQ,
+               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
        },
 };
 
@@ -174,6 +120,8 @@ static struct platform_device sdp3430_kp_device = {
        },
 };
 
+static int ts_gpio;
+
 /**
  * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq
  *
@@ -181,20 +129,20 @@ static struct platform_device sdp3430_kp_device = {
  */
 static void ads7846_dev_init(void)
 {
-       if (omap_request_gpio(TS_GPIO) < 0) {
+       if (omap_request_gpio(ts_gpio) < 0) {
                printk(KERN_ERR "can't get ads746 pen down GPIO\n");
                return;
        }
 
-       omap_set_gpio_direction(TS_GPIO, 1);
+       omap_set_gpio_direction(ts_gpio, 1);
 
-       omap_set_gpio_debounce(TS_GPIO, 1);
-       omap_set_gpio_debounce_time(TS_GPIO, 0xa);
+       omap_set_gpio_debounce(ts_gpio, 1);
+       omap_set_gpio_debounce_time(ts_gpio, 0xa);
 }
 
 static int ads7846_get_pendown_state(void)
 {
-       return !omap_get_gpio_datain(TS_GPIO);
+       return !omap_get_gpio_datain(ts_gpio);
 }
 
 /*
@@ -250,19 +198,18 @@ static struct spi_board_info sdp3430_spi_board_info[] __initdata = {
                .chip_select            = 0,
                .max_speed_hz           = 1500000,
                .controller_data        = &tsc2046_mcspi_config,
-               .irq                    = OMAP_GPIO_IRQ(TS_GPIO),
+               .irq                    = 0,
                .platform_data          = &tsc2046_config,
        },
 };
 
 static struct platform_device sdp3430_lcd_device = {
-       .name           = "sdp2430_lcd",
+       .name           = "sdp3430_lcd",
        .id             = -1,
 };
 
 static struct platform_device *sdp3430_devices[] __initdata = {
        &sdp3430_smc91x_device,
-       &sdp3430_flash_device,
        &sdp3430_kp_device,
        &sdp3430_lcd_device,
 };
@@ -271,8 +218,9 @@ static inline void __init sdp3430_init_smc91x(void)
 {
        int eth_cs;
        unsigned long cs_mem_base;
+       int eth_gpio = 0;
 
-       eth_cs  = SDP3430_SMC91X_CS;
+       eth_cs = SDP3430_SMC91X_CS;
 
        if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
                printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
@@ -283,12 +231,19 @@ static inline void __init sdp3430_init_smc91x(void)
        sdp3430_smc91x_resources[0].end   = cs_mem_base + 0xf;
        udelay(100);
 
-       if (omap_request_gpio(OMAP34XX_ETHR_GPIO_IRQ) < 0) {
+       if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0))
+               eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV2;
+       else
+               eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV1;
+
+       sdp3430_smc91x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
+
+       if (omap_request_gpio(eth_gpio) < 0) {
                printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
-                       OMAP34XX_ETHR_GPIO_IRQ);
+                       eth_gpio);
                return;
        }
-       omap_set_gpio_direction(OMAP34XX_ETHR_GPIO_IRQ, 1);
+       omap_set_gpio_direction(eth_gpio, 1);
 }
 
 static void __init omap_3430sdp_init_irq(void)
@@ -307,9 +262,17 @@ static struct omap_lcd_config sdp3430_lcd_config __initdata = {
        .ctrl_name      = "internal",
 };
 
+static struct omap_mmc_config sdp3430_mmc_config __initdata = {
+       .mmc [0] = {
+               .enabled        = 1,
+               .wire4          = 1,
+       },
+};
+
 static struct omap_board_config_kernel sdp3430_config[] __initdata = {
        { OMAP_TAG_UART,        &sdp3430_uart_config },
        {OMAP_TAG_LCD,          &sdp3430_lcd_config},
+       {OMAP_TAG_MMC,          &sdp3430_mmc_config },
 };
 
 static int __init omap3430_i2c_init(void)
@@ -320,16 +283,26 @@ static int __init omap3430_i2c_init(void)
        return 0;
 }
 
+extern void __init sdp3430_flash_init(void);
+
 static void __init omap_3430sdp_init(void)
 {
        platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
        omap_board_config = sdp3430_config;
        omap_board_config_size = ARRAY_SIZE(sdp3430_config);
+       if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0))
+               ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV2;
+       else
+               ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV1;
+       sdp3430_spi_board_info[0].irq = OMAP_GPIO_IRQ(ts_gpio);
        spi_register_board_info(sdp3430_spi_board_info,
                                ARRAY_SIZE(sdp3430_spi_board_info));
        ads7846_dev_init();
+       sdp3430_flash_init();
        omap_serial_init();
-       sdp3430_usb_init();
+       usb_musb_init();
+       usb_ehci_init();
+       hsmmc_init();
 }
 
 static void __init omap_3430sdp_map_io(void)