3 files changed, 52 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index b0c7402248f7..1b223076ceb7 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -39,7 +39,7 @@ static struct platform_device *sdp4430_devices[] __initdata = {
 };
 
 static struct omap_uart_config sdp4430_uart_config __initdata = {
-        .enabled_uarts  = (1 << 0) | (1 << 1) | (1 << 2),
+        .enabled_uarts  = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
 };
 
 static struct omap_lcd_config sdp4430_lcd_config __initdata = {
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 0447d26d454b..a846aa1ebb4d 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -173,6 +173,42 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
 #define OMAP34XX_MCBSP_PDATA_SZ         0
 #endif
 
+static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
+        {
+                .phys_base      = OMAP44XX_MCBSP1_BASE,
+                .dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,
+                .dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,
+                .rx_irq         = INT_24XX_MCBSP1_IRQ_RX,
+                .tx_irq         = INT_24XX_MCBSP1_IRQ_TX,
+                .ops            = &omap2_mcbsp_ops,
+        },
+        {
+                .phys_base      = OMAP44XX_MCBSP2_BASE,
+                .dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,
+                .dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,
+                .rx_irq         = INT_24XX_MCBSP2_IRQ_RX,
+                .tx_irq         = INT_24XX_MCBSP2_IRQ_TX,
+                .ops            = &omap2_mcbsp_ops,
+        },
+        {
+                .phys_base      = OMAP44XX_MCBSP3_BASE,
+                .dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,
+                .dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,
+                .rx_irq         = INT_24XX_MCBSP3_IRQ_RX,
+                .tx_irq         = INT_24XX_MCBSP3_IRQ_TX,
+                .ops            = &omap2_mcbsp_ops,
+        },
+        {
+                .phys_base      = OMAP44XX_MCBSP4_BASE,
+                .dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,
+                .dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,
+                .rx_irq         = INT_24XX_MCBSP4_IRQ_RX,
+                .tx_irq         = INT_24XX_MCBSP4_IRQ_TX,
+                .ops            = &omap2_mcbsp_ops,
+        },
+};
+#define OMAP44XX_MCBSP_PDATA_SZ         ARRAY_SIZE(omap44xx_mcbsp_pdata)
+
 static int __init omap2_mcbsp_init(void)
 {
         if (cpu_is_omap2420())
@@ -181,6 +217,8 @@ static int __init omap2_mcbsp_init(void)
                 omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ;
         if (cpu_is_omap34xx())
                 omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;
+        if (cpu_is_omap44xx())
+                omap_mcbsp_count = OMAP44XX_MCBSP_PDATA_SZ;
 
         mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),
                                                                 GFP_KERNEL);
@@ -196,6 +234,9 @@ static int __init omap2_mcbsp_init(void)
         if (cpu_is_omap34xx())
                 omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata,
                                                 OMAP34XX_MCBSP_PDATA_SZ);
+        if (cpu_is_omap44xx())
+                omap_mcbsp_register_board_cfg(omap44xx_mcbsp_pdata,
+                                                OMAP44XX_MCBSP_PDATA_SZ);
 
         return omap_mcbsp_init();
 }
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index a7421a50410b..ce22344b94e7 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -109,6 +109,16 @@ static struct plat_serial8250_port serial_platform_data2[] = {
                 .regshift       = 2,
                 .uartclk        = OMAP24XX_BASE_BAUD * 16,
         }, {
+#ifdef CONFIG_ARCH_OMAP4
+                .membase        = IO_ADDRESS(OMAP_UART4_BASE),
+                .mapbase        = OMAP_UART4_BASE,
+                .irq            = 70,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = OMAP24XX_BASE_BAUD * 16,
+        }, {
+#endif
                 .flags          = 0
         }
 };