Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[pandora-kernel.git] / arch / arm / mach-omap2 / board-3430sdp.c

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 2e38e5b..e7d629b 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -45,7 +45,8 @@
 
 #include "mux.h"
 #include "sdram-qimonda-hyb18m512160af-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
+#include "pm.h"
 
 #define CONFIG_DISABLE_HFCLK 1
 
@@ -57,6 +58,24 @@
 
 #define TWL4030_MSECURE_GPIO 22
 
+/* FIXME: These values need to be updated based on more profiling on 3430sdp*/
+static struct cpuidle_params omap3_cpuidle_params_table[] = {
+       /* C1 */
+       {1, 2, 2, 5},
+       /* C2 */
+       {1, 10, 10, 30},
+       /* C3 */
+       {1, 50, 50, 300},
+       /* C4 */
+       {1, 1500, 1800, 4000},
+       /* C5 */
+       {1, 2500, 7500, 12000},
+       /* C6 */
+       {1, 3000, 8500, 15000},
+       /* C7 */
+       {1, 10000, 30000, 300000},
+};
+
 static int board_keymap[] = {
        KEY(0, 0, KEY_LEFT),
        KEY(0, 1, KEY_RIGHT),
@@ -131,6 +150,7 @@ static int ads7846_get_pendown_state(void)
 static struct ads7846_platform_data tsc2046_config __initdata = {
        .get_pendown_state      = ads7846_get_pendown_state,
        .keep_vref_on           = 1,
+       .wakeup                         = true,
 };
 
 
@@ -307,6 +327,7 @@ static void __init omap_3430sdp_init_irq(void)
 {
        omap_board_config = sdp3430_config;
        omap_board_config_size = ARRAY_SIZE(sdp3430_config);
+       omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
        omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
        omap_init_irq();
        omap_gpio_init();
@@ -328,7 +349,7 @@ static struct twl4030_bci_platform_data sdp3430_bci_data = {
        .tblsize                = ARRAY_SIZE(sdp3430_batt_table),
 };
 
-static struct twl4030_hsmmc_info mmc[] = {
+static struct omap2_hsmmc_info mmc[] = {
        {
                .mmc            = 1,
                /* 8 bits (default) requires S6.3 == ON,
@@ -365,7 +386,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
         */
        mmc[0].gpio_cd = gpio + 0;
        mmc[1].gpio_cd = gpio + 1;
-       twl4030_mmc_init(mmc);
+       omap2_hsmmc_init(mmc);
 
        /* link regulators to MMC adapters ... we "know" the
         * regulators will be set up only *after* we return.
@@ -521,10 +542,6 @@ static struct regulator_init_data sdp3430_vdac = {
 
 /* VPLL2 for digital video outputs */
 static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
-       {
-               .supply         = "vdvi",
-               .dev            = &sdp3430_lcd_device.dev,
-       },
        {
                .supply         = "vdds_dsi",
                .dev            = &sdp3430_dss_device.dev,
@@ -632,7 +649,7 @@ static void enable_board_wakeup_source(void)
                OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);
 }
 
-static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 
        .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
        .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
@@ -760,6 +777,12 @@ static struct flash_partitions sdp_flash_partitions[] = {
        },
 };
 
+static struct omap_musb_board_data musb_board_data = {
+       .interface_type         = MUSB_INTERFACE_ULPI,
+       .mode                   = MUSB_OTG,
+       .power                  = 100,
+};
+
 static void __init omap_3430sdp_init(void)
 {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -774,7 +797,7 @@ static void __init omap_3430sdp_init(void)
                                ARRAY_SIZE(sdp3430_spi_board_info));
        ads7846_dev_init();
        omap_serial_init();
-       usb_musb_init();
+       usb_musb_init(&musb_board_data);
        board_smc91x_init();
        sdp_flash_init(sdp_flash_partitions);
        sdp3430_display_init();