1 files changed, 60 insertions, 160 deletions

diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index bcd01d278c65..0c108a212ea2 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -26,6 +26,7 @@
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -38,13 +39,12 @@
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/usb.h>
-#include <plat/timer-gp.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include <plat/mcspi.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
 #include <linux/i2c/at24.h>
@@ -52,52 +52,29 @@
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "mux.h"
 #include "hsmmc.h"
+#include "timer-gp.h"
+#include "common-board-devices.h"
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#include <plat/gpmc-smsc911x.h>
+
 #define OMAP3STALKER_ETHR_START 0x2c000000
 #define OMAP3STALKER_ETHR_SIZE  1024
 #define OMAP3STALKER_ETHR_GPIO_IRQ      19
 #define OMAP3STALKER_SMC911X_CS 5
 
-static struct resource omap3stalker_smsc911x_resources[] = {
-        [0] = {
-               .start   = OMAP3STALKER_ETHR_START,
-               .end     =
-               (OMAP3STALKER_ETHR_START + OMAP3STALKER_ETHR_SIZE - 1),
-               .flags   = IORESOURCE_MEM,
-        },
-        [1] = {
-               .start   = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
-               .end     = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
-               .flags   = (IORESOURCE_IRQ | IRQF_TRIGGER_LOW),
-        },
-};
-
-static struct smsc911x_platform_config smsc911x_config = {
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
+        .cs             = OMAP3STALKER_SMC911X_CS,
+        .gpio_irq       = OMAP3STALKER_ETHR_GPIO_IRQ,
+        .gpio_reset     = -EINVAL,
         .flags          = (SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS),
 };
 
-static struct platform_device omap3stalker_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(omap3stalker_smsc911x_resources),
-        .resource       = &omap3stalker_smsc911x_resources[0],
-        .dev            = {
-                .platform_data  = &smsc911x_config,
-        },
-};
-
 static inline void __init omap3stalker_init_eth(void)
 {
-        int eth_cs;
         struct clk *l3ck;
         unsigned int rate;
 
-        eth_cs = OMAP3STALKER_SMC911X_CS;
-
         l3ck = clk_get(NULL, "l3_ck");
         if (IS_ERR(l3ck))
                 rate = 100000000;
@@ -105,16 +82,7 @@ static inline void __init omap3stalker_init_eth(void)
                 rate = clk_get_rate(l3ck);
 
         omap_mux_init_gpio(19, OMAP_PIN_INPUT_PULLUP);
-        if (gpio_request(OMAP3STALKER_ETHR_GPIO_IRQ, "SMC911x irq") < 0) {
-                printk(KERN_ERR
-                       "Failed to request GPIO%d for smc911x IRQ\n",
-                       OMAP3STALKER_ETHR_GPIO_IRQ);
-                return;
-        }
-
-        gpio_direction_input(OMAP3STALKER_ETHR_GPIO_IRQ);
-
-        platform_device_register(&omap3stalker_smsc911x_device);
+        gpmc_smsc911x_init(&smsc911x_cfg);
 }
 
 #else
@@ -159,13 +127,18 @@ static void omap3_stalker_disable_lcd(struct omap_dss_device *dssdev)
         lcd_enabled = 0;
 }
 
+static struct panel_generic_dpi_data lcd_panel = {
+        .name                   = "generic",
+        .platform_enable        = omap3_stalker_enable_lcd,
+        .platform_disable       = omap3_stalker_disable_lcd,
+};
+
 static struct omap_dss_device omap3_stalker_lcd_device = {
         .name                   = "lcd",
-        .driver_name            = "generic_panel",
+        .driver_name            = "generic_dpi_panel",
+        .data                   = &lcd_panel,
         .phy.dpi.data_lines     = 24,
         .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .platform_enable        = omap3_stalker_enable_lcd,
-        .platform_disable       = omap3_stalker_disable_lcd,
 };
 
 static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev)
@@ -207,13 +180,18 @@ static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev)
         dvi_enabled = 0;
 }
 
+static struct panel_generic_dpi_data dvi_panel = {
+        .name                   = "generic",
+        .platform_enable        = omap3_stalker_enable_dvi,
+        .platform_disable       = omap3_stalker_disable_dvi,
+};
+
 static struct omap_dss_device omap3_stalker_dvi_device = {
         .name                   = "dvi",
-        .driver_name            = "generic_panel",
         .type                   = OMAP_DISPLAY_TYPE_DPI,
+        .driver_name            = "generic_dpi_panel",
+        .data                   = &dvi_panel,
         .phy.dpi.data_lines     = 24,
-        .platform_enable        = omap3_stalker_enable_dvi,
-        .platform_disable       = omap3_stalker_disable_dvi,
 };
 
 static struct omap_dss_device *omap3_stalker_dss_devices[] = {
@@ -228,14 +206,6 @@ static struct omap_dss_board_info omap3_stalker_dss_data = {
         .default_device = &omap3_stalker_dvi_device,
 };
 
-static struct platform_device omap3_stalker_dss_device = {
-        .name   = "omapdss",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &omap3_stalker_dss_data,
-        },
-};
-
 static struct regulator_consumer_supply omap3stalker_vmmc1_supply = {
         .supply         = "vmmc",
 };
@@ -275,7 +245,7 @@ static struct regulator_init_data omap3stalker_vsim = {
 static struct omap2_hsmmc_info mmc[] = {
         {
          .mmc           = 1,
-         .wires         = 4,
+         .caps          = MMC_CAP_4_BIT_DATA,
          .gpio_cd       = -EINVAL,
          .gpio_wp       = 23,
          },
@@ -361,12 +331,11 @@ omap3stalker_twl_gpio_setup(struct device *dev,
          */
 
         /* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
-        gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
-        gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+        gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
+                         "EN_LCD_BKL");
 
         /* gpio + 7 == DVI Enable */
-        gpio_request(gpio + 7, "EN_DVI");
-        gpio_direction_output(gpio + 7, 0);
+        gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");
 
         /* TWL4030_GPIO_MAX + 1 == ledB (out, mmc0) */
         gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -389,7 +358,7 @@ static struct twl4030_usb_data omap3stalker_usb_data = {
         .usb_mode       = T2_USB_MODE_ULPI,
 };
 
-static int board_keymap[] = {
+static uint32_t board_keymap[] = {
         KEY(0, 0, KEY_LEFT),
         KEY(0, 1, KEY_DOWN),
         KEY(0, 2, KEY_ENTER),
@@ -427,19 +396,15 @@ static struct twl4030_madc_platform_data omap3stalker_madc_data = {
         .irq_line       = 1,
 };
 
-static struct twl4030_codec_audio_data omap3stalker_audio_data = {
-        .audio_mclk     = 26000000,
-};
+static struct twl4030_codec_audio_data omap3stalker_audio_data;
 
 static struct twl4030_codec_data omap3stalker_codec_data = {
         .audio_mclk     = 26000000,
         .audio          = &omap3stalker_audio_data,
 };
 
-static struct regulator_consumer_supply omap3_stalker_vdda_dac_supply = {
-        .supply         = "vdda_dac",
-        .dev            = &omap3_stalker_dss_device.dev,
-};
+static struct regulator_consumer_supply omap3_stalker_vdda_dac_supply =
+        REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");
 
 /* VDAC for DSS driving S-Video */
 static struct regulator_init_data omap3_stalker_vdac = {
@@ -457,9 +422,9 @@ static struct regulator_init_data omap3_stalker_vdac = {
 };
 
 /* VPLL2 for digital video outputs */
-static struct regulator_consumer_supply omap3_stalker_vpll2_supply = {
-        .supply         = "vdds_dsi",
-        .dev            = &omap3_stalker_lcd_device.dev,
+static struct regulator_consumer_supply omap3_stalker_vpll2_supplies[] = {
+        REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
+        REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
 };
 
 static struct regulator_init_data omap3_stalker_vpll2 = {
@@ -473,8 +438,8 @@ static struct regulator_init_data omap3_stalker_vpll2 = {
                 .valid_ops_mask         = REGULATOR_CHANGE_MODE
                 | REGULATOR_CHANGE_STATUS,
         },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &omap3_stalker_vpll2_supply,
+        .num_consumer_supplies  = ARRAY_SIZE(omap3_stalker_vpll2_supplies),
+        .consumer_supplies      = omap3_stalker_vpll2_supplies,
 };
 
 static struct twl4030_platform_data omap3stalker_twldata = {
@@ -489,15 +454,8 @@ static struct twl4030_platform_data omap3stalker_twldata = {
         .codec          = &omap3stalker_codec_data,
         .vdac           = &omap3_stalker_vdac,
         .vpll2          = &omap3_stalker_vpll2,
-};
-
-static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo[] = {
-        {
-         I2C_BOARD_INFO("twl4030", 0x48),
-         .flags         = I2C_CLIENT_WAKE,
-         .irq           = INT_34XX_SYS_NIRQ,
-         .platform_data = &omap3stalker_twldata,
-         },
+        .vmmc1          = &omap3stalker_vmmc1,
+        .vsim           = &omap3stalker_vsim,
 };
 
 static struct at24_platform_data fram_info = {
@@ -516,15 +474,7 @@ static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo3[] = {
 
 static int __init omap3_stalker_i2c_init(void)
 {
-        /*
-         * REVISIT: These entries can be set in omap3evm_twl_data
-         * after a merge with MFD tree
-         */
-        omap3stalker_twldata.vmmc1 = &omap3stalker_vmmc1;
-        omap3stalker_twldata.vsim = &omap3stalker_vsim;
-
-        omap_register_i2c_bus(1, 2600, omap3stalker_i2c_boardinfo,
-                              ARRAY_SIZE(omap3stalker_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &omap3stalker_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, omap3stalker_i2c_boardinfo3,
                               ARRAY_SIZE(omap3stalker_i2c_boardinfo3));
@@ -532,74 +482,32 @@ static int __init omap3_stalker_i2c_init(void)
 }
 
 #define OMAP3_STALKER_TS_GPIO   175
-static void ads7846_dev_init(void)
-{
-        if (gpio_request(OMAP3_STALKER_TS_GPIO, "ADS7846 pendown") < 0)
-                printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
 
-        gpio_direction_input(OMAP3_STALKER_TS_GPIO);
-        gpio_set_debounce(OMAP3_STALKER_TS_GPIO, 310);
-}
+static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
+};
 
-static int ads7846_get_pendown_state(void)
+static void __init omap3_stalker_init_early(void)
 {
-        return !gpio_get_value(OMAP3_STALKER_TS_GPIO);
+        omap2_init_common_infrastructure();
+        omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
 }
 
-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,
-        .settle_delay_usecs     = 150,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode             = 0,
-        .single_channel         = 1,    /* 0: slave, 1: master */
-};
-
-struct spi_board_info omap3stalker_spi_board_info[] = {
-        [0] = {
-               .modalias        = "ads7846",
-               .bus_num         = 1,
-               .chip_select     = 0,
-               .max_speed_hz    = 1500000,
-               .controller_data = &ads7846_mcspi_config,
-               .irq             = OMAP_GPIO_IRQ(OMAP3_STALKER_TS_GPIO),
-               .platform_data   = &ads7846_config,
-        },
-};
-
-static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
-};
-
 static void __init omap3_stalker_init_irq(void)
 {
-        omap_board_config = omap3_stalker_config;
-        omap_board_config_size = ARRAY_SIZE(omap3_stalker_config);
-        omap2_init_common_hw(mt46h32m32lf6_sdrc_params, NULL);
         omap_init_irq();
 #ifdef CONFIG_OMAP_32K_TIMER
         omap2_gp_clockevent_set_gptimer(12);
 #endif
-        omap_gpio_init();
 }
 
 static struct platform_device *omap3_stalker_devices[] __initdata = {
-        &omap3_stalker_dss_device,
         &keys_gpio,
 };
 
-static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-        .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-        .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-        .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+static struct usbhs_omap_board_data usbhs_bdata __initconst = {
+        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
+        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
+        .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
 
         .phy_reset = true,
         .reset_gpio_port[0] = -EINVAL,
@@ -615,32 +523,25 @@ static struct omap_board_mux board_mux[] __initdata = {
                   OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
         {.reg_offset = OMAP_MUX_TERMINATOR},
 };
-#else
-#define board_mux       NULL
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type = MUSB_INTERFACE_ULPI,
-        .mode           = MUSB_OTG,
-        .power          = 100,
-};
-
 static void __init omap3_stalker_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
+        omap_board_config = omap3_stalker_config;
+        omap_board_config_size = ARRAY_SIZE(omap3_stalker_config);
 
         omap3_stalker_i2c_init();
 
         platform_add_devices(omap3_stalker_devices,
                              ARRAY_SIZE(omap3_stalker_devices));
 
-        spi_register_board_info(omap3stalker_spi_board_info,
-                                ARRAY_SIZE(omap3stalker_spi_board_info));
+        omap_display_init(&omap3_stalker_dss_data);
 
         omap_serial_init();
-        usb_musb_init(&musb_board_data);
-        usb_ehci_init(&ehci_pdata);
-        ads7846_dev_init();
+        usb_musb_init(NULL);
+        usbhs_init(&usbhs_bdata);
+        omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL);
 
         omap_mux_init_gpio(21, OMAP_PIN_OUTPUT);
         omap_mux_init_gpio(18, OMAP_PIN_INPUT_PULLUP);
@@ -654,10 +555,9 @@ static void __init omap3_stalker_init(void)
 
 MACHINE_START(SBC3530, "OMAP3 STALKER")
         /* Maintainer: Jason Lam -lzg@ema-tech.com */
-        .phys_io                = 0x48000000,
-        .io_pg_offst            = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params            = 0x80000100,
         .map_io                 = omap3_map_io,
+        .init_early             = omap3_stalker_init_early,
         .init_irq               = omap3_stalker_init_irq,
         .init_machine           = omap3_stalker_init,
         .timer                  = &omap_timer,