1 files changed, 25 insertions, 7 deletions

diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 40a3666ea632..d7e0d219726a 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -30,6 +30,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
+#include <linux/delay.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
@@ -66,6 +67,11 @@ static const int visstrim_m10_pins[] __initconst = {
         PD15_AOUT_FEC_COL,
         PD16_AIN_FEC_TX_ER,
         PF23_AIN_FEC_TX_EN,
+        /* SSI1 */
+        PC20_PF_SSI1_FS,
+        PC21_PF_SSI1_RXD,
+        PC22_PF_SSI1_TXD,
+        PC23_PF_SSI1_CLK,
         /* SDHC1 */
         PE18_PF_SD1_D0,
         PE19_PF_SD1_D1,
@@ -204,20 +210,30 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = {
                 I2C_BOARD_INFO("pca9555", 0x20),
                 .platform_data = &visstrim_m10_pca9555_pdata,
         },
+        {
+                I2C_BOARD_INFO("tlv320aic32x4", 0x18),
+        }
 };
 
 /* USB OTG */
 static int otg_phy_init(struct platform_device *pdev)
 {
         gpio_set_value(OTG_PHY_CS_GPIO, 0);
-        return 0;
+
+        mdelay(10);
+
+        return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);
 }
 
 static const struct mxc_usbh_platform_data
 visstrim_m10_usbotg_pdata __initconst = {
         .init = otg_phy_init,
         .portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
-        .flags  = MXC_EHCI_POWER_PINS_ENABLED,
+};
+
+/* SSI */
+static const struct imx_ssi_platform_data visstrim_m10_ssi_pdata __initconst = {
+        .flags                  = IMX_SSI_DMA | IMX_SSI_SYN,
 };
 
 static void __init visstrim_m10_board_init(void)
@@ -229,6 +245,7 @@ static void __init visstrim_m10_board_init(void)
         if (ret)
                 pr_err("Failed to setup pins (%d)\n", ret);
 
+        imx27_add_imx_ssi(0, &visstrim_m10_ssi_pdata);
         imx27_add_imx_uart0(&uart_pdata);
 
         i2c_register_board_info(0, visstrim_m10_i2c_devices,
@@ -251,9 +268,10 @@ static struct sys_timer visstrim_m10_timer = {
 };
 
 MACHINE_START(IMX27_VISSTRIM_M10, "Vista Silicon Visstrim_M10")
-        .boot_params    = MX27_PHYS_OFFSET + 0x100,
-        .map_io         = mx27_map_io,
-        .init_irq       = mx27_init_irq,
-        .init_machine   = visstrim_m10_board_init,
-        .timer          = &visstrim_m10_timer,
+        .boot_params = MX27_PHYS_OFFSET + 0x100,
+        .map_io = mx27_map_io,
+        .init_early = imx27_init_early,
+        .init_irq = mx27_init_irq,
+        .timer = &visstrim_m10_timer,
+        .init_machine = visstrim_m10_board_init,
 MACHINE_END