Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[pandora-kernel.git] / arch / arm / mach-mx5 / board-mx53_smd.c

diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c
index 7970f7a..31e1732 100644 (file)
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/arch/arm/mach-mx5/board-mx53_smd.c
@@ -39,20 +39,19 @@
 #define SMD_FEC_PHY_RST                IMX_GPIO_NR(7, 6)
 
 static iomux_v3_cfg_t mx53_smd_pads[] = {
-       MX53_PAD_CSI0_D10__UART1_TXD,
-       MX53_PAD_CSI0_D11__UART1_RXD,
-       MX53_PAD_ATA_DIOW__UART1_TXD,
-       MX53_PAD_ATA_DMACK__UART1_RXD,
-
-       MX53_PAD_ATA_BUFFER_EN__UART2_RXD,
-       MX53_PAD_ATA_DMARQ__UART2_TXD,
-       MX53_PAD_ATA_DIOR__UART2_RTS,
-       MX53_PAD_ATA_INTRQ__UART2_CTS,
-
-       MX53_PAD_ATA_CS_0__UART3_TXD,
-       MX53_PAD_ATA_CS_1__UART3_RXD,
-       MX53_PAD_ATA_DA_1__UART3_CTS,
-       MX53_PAD_ATA_DA_2__UART3_RTS,
+       MX53_PAD_CSI0_DAT10__UART1_TXD_MUX,
+       MX53_PAD_CSI0_DAT11__UART1_RXD_MUX,
+
+       MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX,
+       MX53_PAD_PATA_DMARQ__UART2_TXD_MUX,
+
+       MX53_PAD_PATA_CS_0__UART3_TXD_MUX,
+       MX53_PAD_PATA_CS_1__UART3_RXD_MUX,
+       MX53_PAD_PATA_DA_1__UART3_CTS,
+       MX53_PAD_PATA_DA_2__UART3_RTS,
+       /* I2C1 */
+       MX53_PAD_CSI0_DAT8__I2C1_SDA,
+       MX53_PAD_CSI0_DAT9__I2C1_SCL,
 };
 
 static const struct imxuart_platform_data mx53_smd_uart_data __initconst = {
@@ -61,8 +60,8 @@ static const struct imxuart_platform_data mx53_smd_uart_data __initconst = {
 
 static inline void mx53_smd_init_uart(void)
 {
-       imx53_add_imx_uart(0, &mx53_smd_uart_data);
-       imx53_add_imx_uart(1, &mx53_smd_uart_data);
+       imx53_add_imx_uart(0, NULL);
+       imx53_add_imx_uart(1, NULL);
        imx53_add_imx_uart(2, &mx53_smd_uart_data);
 }
 
@@ -85,6 +84,10 @@ static struct fec_platform_data mx53_smd_fec_data = {
        .phy = PHY_INTERFACE_MODE_RMII,
 };
 
+static const struct imxi2c_platform_data mx53_smd_i2c_data __initconst = {
+       .bitrate = 100000,
+};
+
 static void __init mx53_smd_board_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(mx53_smd_pads,
@@ -92,6 +95,8 @@ static void __init mx53_smd_board_init(void)
        mx53_smd_init_uart();
        mx53_smd_fec_reset();
        imx53_add_fec(&mx53_smd_fec_data);
+       imx53_add_imx2_wdt(0, NULL);
+       imx53_add_imx_i2c(0, &mx53_smd_i2c_data);
 }
 
 static void __init mx53_smd_timer_init(void)
@@ -105,7 +110,8 @@ static struct sys_timer mx53_smd_timer = {
 
 MACHINE_START(MX53_SMD, "Freescale MX53 SMD Board")
        .map_io = mx53_map_io,
+       .init_early = imx53_init_early,
        .init_irq = mx53_init_irq,
-       .init_machine = mx53_smd_board_init,
        .timer = &mx53_smd_timer,
+       .init_machine = mx53_smd_board_init,
 MACHINE_END