USB: Clean-up USB init code for next merge window

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-omap3pandora.c

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index f4180a011d55b5356f01757a3194b7a0231125ca..b8a78c0c59618fdd7b5ed7144a26d46bdd8b5630 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -25,6 +25,8 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
 #include <linux/i2c/twl4030.h>
 
 #include <linux/mtd/mtd.h>
@@ -41,39 +43,42 @@
 #include <mach/gpio.h>
 #include <mach/gpmc.h>
 #include <mach/hardware.h>
-#include <mach/hsmmc.h>
 #include <mach/nand.h>
-#include <mach/usb-ehci.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
+#include <mach/mcspi.h>
 
 #include "sdram-micron-mt46h32m32lf-6.h"
+#include "mmc-twl4030.h"
 
-#define NAND_BLOCK_SIZE SZ_128K
-#define GPMC_CS0_BASE  0x60
-#define GPMC_CS_SIZE   0x30
+
+#define NAND_BLOCK_SIZE                        SZ_128K
+#define GPMC_CS0_BASE                  0x60
+#define GPMC_CS_SIZE                   0x30
+
+#define OMAP3_PANDORA_TS_GPIO          94
 
 static struct mtd_partition omap3pandora_nand_partitions[] = {
        {
-               .name           = "xloader",
-               .offset         = 0,                    /* Offset = 0x00000 */
-               .size           = 4 * NAND_BLOCK_SIZE,
-               .mask_flags     = MTD_WRITEABLE
+               .name           = "xloader",
+               .offset         = 0,                    /* Offset = 0x00000 */
+               .size           = 4 * NAND_BLOCK_SIZE,
+               .mask_flags     = MTD_WRITEABLE
        }, {
-               .name           = "uboot",
-               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x80000 */
-               .size           = 14 * NAND_BLOCK_SIZE,
+               .name           = "uboot",
+               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x80000 */
+               .size           = 14 * NAND_BLOCK_SIZE,
        }, {
-               .name           = "uboot environment",
-               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x240000 */
-               .size           = 2 * NAND_BLOCK_SIZE,
+               .name           = "uboot environment",
+               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x240000 */
+               .size           = 2 * NAND_BLOCK_SIZE,
        }, {
-               .name           = "linux",
-               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x280000 */
-               .size           = 32 * NAND_BLOCK_SIZE,
+               .name           = "linux",
+               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x280000 */
+               .size           = 32 * NAND_BLOCK_SIZE,
        }, {
-               .name           = "rootfs",
-               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x680000 */
-               .size           = MTDPART_SIZ_FULL,
+               .name           = "rootfs",
+               .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x680000 */
+               .size           = MTDPART_SIZ_FULL,
        },
 };
 
@@ -137,14 +142,45 @@ static void __init omap3pandora_flash_init(void)
        }
 }
 
+static struct twl4030_hsmmc_info omap3pandora_mmc[] = {
+       {
+               .mmc            = 1,
+               .wires          = 4,
+               .gpio_cd        = -EINVAL,
+               .gpio_wp        = 126,
+               .ext_clock      = 0,
+       },
+       {
+               .mmc            = 2,
+               .wires          = 4,
+               .gpio_cd        = -EINVAL,
+               .gpio_wp        = 127,
+               .ext_clock      = 1,
+               .transceiver    = true,
+       },
+       {}      /* Terminator */
+};
+
 static struct omap_uart_config omap3pandora_uart_config __initdata = {
        .enabled_uarts  = (1 << 2), /* UART3 */
 };
 
+static int omap3pandora_twl_gpio_setup(struct device *dev,
+               unsigned gpio, unsigned ngpio)
+{
+       /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */
+       omap3pandora_mmc[0].gpio_cd = gpio + 0;
+       omap3pandora_mmc[1].gpio_cd = gpio + 1;
+       twl4030_mmc_init(omap3pandora_mmc);
+
+       return 0;
+}
+
 static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
        .gpio_base      = OMAP_MAX_GPIO_LINES,
        .irq_base       = TWL4030_GPIO_IRQ_BASE,
        .irq_end        = TWL4030_GPIO_IRQ_END,
+       .setup          = omap3pandora_twl_gpio_setup,
 };
 
 static struct twl4030_usb_data omap3pandora_usb_data = {
@@ -160,7 +196,7 @@ static struct twl4030_platform_data omap3pandora_twldata = {
 
 static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
        {
-               I2C_BOARD_INFO("twl4030", 0x48),
+               I2C_BOARD_INFO("tps65950", 0x48),
                .flags = I2C_CLIENT_WAKE,
                .irq = INT_34XX_SYS_NIRQ,
                .platform_data = &omap3pandora_twldata,
@@ -183,6 +219,55 @@ static void __init omap3pandora_init_irq(void)
        omap_gpio_init();
 }
 
+static void __init omap3pandora_ads7846_init(void)
+{
+       int gpio = OMAP3_PANDORA_TS_GPIO;
+       int ret;
+
+       ret = gpio_request(gpio, "ads7846_pen_down");
+       if (ret < 0) {
+               printk(KERN_ERR "Failed to request GPIO %d for "
+                               "ads7846 pen down IRQ\n", gpio);
+               return;
+       }
+
+       gpio_direction_input(gpio);
+}
+
+static int ads7846_get_pendown_state(void)
+{
+       return !gpio_get_value(OMAP3_PANDORA_TS_GPIO);
+}
+
+static struct ads7846_platform_data ads7846_config = {
+       .x_max                  = 0x0fff,
+       .y_max                  = 0x0fff,
+       .x_plate_ohms           = 180,
+       .pressure_max           = 255,
+       .debounce_max           = 10,
+       .debounce_tol           = 3,
+       .debounce_rep           = 1,
+       .get_pendown_state      = ads7846_get_pendown_state,
+       .keep_vref_on           = 1,
+};
+
+static struct omap2_mcspi_device_config ads7846_mcspi_config = {
+       .turbo_mode     = 0,
+       .single_channel = 1,    /* 0: slave, 1: master */
+};
+
+static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
+       {
+               .modalias               = "ads7846",
+               .bus_num                = 1,
+               .chip_select            = 0,
+               .max_speed_hz           = 1500000,
+               .controller_data        = &ads7846_mcspi_config,
+               .irq                    = OMAP_GPIO_IRQ(OMAP3_PANDORA_TS_GPIO),
+               .platform_data          = &ads7846_config,
+       }
+};
+
 static struct platform_device omap3pandora_lcd_device = {
        .name           = "pandora_lcd",
        .id             = -1,
@@ -204,14 +289,17 @@ static struct platform_device *omap3pandora_devices[] __initdata = {
 static void __init omap3pandora_init(void)
 {
        omap3pandora_i2c_init();
-       platform_add_devices(omap3pandora_devices, ARRAY_SIZE(omap3pandora_devices));
+       platform_add_devices(omap3pandora_devices,
+                       ARRAY_SIZE(omap3pandora_devices));
        omap_board_config = omap3pandora_config;
        omap_board_config_size = ARRAY_SIZE(omap3pandora_config);
        omap_serial_init();
-       hsmmc_init();
+       spi_register_board_info(omap3pandora_spi_board_info,
+                       ARRAY_SIZE(omap3pandora_spi_board_info));
        usb_musb_init();
        usb_ehci_init();
        omap3pandora_flash_init();
+       omap3pandora_ads7846_init();
 }
 
 static void __init omap3pandora_map_io(void)