1 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 73157eef2590..60c817e63c3b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -831,6 +831,7 @@ static struct omap_hwmod_class uart_class = {
 static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
         { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
         { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
@@ -841,7 +842,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = {
         .name           = "uart1",
         .mpu_irqs       = omap2_uart1_mpu_irqs,
         .sdma_reqs      = uart1_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(uart1_sdma_reqs),
         .main_clk       = "uart1_fck",
         .prcm           = {
                 .omap2 = {
@@ -863,6 +863,7 @@ static struct omap_hwmod omap2420_uart1_hwmod = {
 static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
         { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
         { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
@@ -873,7 +874,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = {
         .name           = "uart2",
         .mpu_irqs       = omap2_uart2_mpu_irqs,
         .sdma_reqs      = uart2_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(uart2_sdma_reqs),
         .main_clk       = "uart2_fck",
         .prcm           = {
                 .omap2 = {
@@ -895,6 +895,7 @@ static struct omap_hwmod omap2420_uart2_hwmod = {
 static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
         { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
         { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
@@ -905,7 +906,6 @@ static struct omap_hwmod omap2420_uart3_hwmod = {
         .name           = "uart3",
         .mpu_irqs       = omap2_uart3_mpu_irqs,
         .sdma_reqs      = uart3_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(uart3_sdma_reqs),
         .main_clk       = "uart3_fck",
         .prcm           = {
                 .omap2 = {
@@ -942,6 +942,7 @@ static struct omap_hwmod_class omap2420_dss_hwmod_class = {
 
 static struct omap_hwmod_dma_info omap2420_dss_sdma_chs[] = {
         { .name = "dispc", .dma_req = 5 },
+        { .dma_req = -1 }
 };
 
 /* dss */
@@ -980,7 +981,6 @@ static struct omap_hwmod omap2420_dss_core_hwmod = {
         .class          = &omap2420_dss_hwmod_class,
         .main_clk       = "dss1_fck", /* instead of dss_fck */
         .sdma_reqs      = omap2420_dss_sdma_chs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(omap2420_dss_sdma_chs),
         .prcm           = {
                 .omap2 = {
                         .prcm_reg_id = 1,
@@ -1186,6 +1186,7 @@ static struct omap_i2c_dev_attr i2c_dev_attr;
 static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
         { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
         { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
@@ -1196,7 +1197,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
         .name           = "i2c1",
         .mpu_irqs       = omap2_i2c1_mpu_irqs,
         .sdma_reqs      = i2c1_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(i2c1_sdma_reqs),
         .main_clk       = "i2c1_fck",
         .prcm           = {
                 .omap2 = {
@@ -1220,6 +1220,7 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
 static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
         { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
         { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
@@ -1230,7 +1231,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = {
         .name           = "i2c2",
         .mpu_irqs       = omap2_i2c2_mpu_irqs,
         .sdma_reqs      = i2c2_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(i2c2_sdma_reqs),
         .main_clk       = "i2c2_fck",
         .prcm           = {
                 .omap2 = {
@@ -1611,6 +1611,7 @@ static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = {
         { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */
         { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */
         { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = {
@@ -1625,7 +1626,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = {
         .name           = "mcspi1_hwmod",
         .mpu_irqs       = omap2_mcspi1_mpu_irqs,
         .sdma_reqs      = omap2420_mcspi1_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(omap2420_mcspi1_sdma_reqs),
         .main_clk       = "mcspi1_fck",
         .prcm           = {
                 .omap2 = {
@@ -1649,6 +1649,7 @@ static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = {
         { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
         { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */
         { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */
+        { .dma_req = -1 }
 };
 
 static struct omap_hwmod_ocp_if *omap2420_mcspi2_slaves[] = {
@@ -1663,7 +1664,6 @@ static struct omap_hwmod omap2420_mcspi2_hwmod = {
         .name           = "mcspi2_hwmod",
         .mpu_irqs       = omap2_mcspi2_mpu_irqs,
         .sdma_reqs      = omap2420_mcspi2_sdma_reqs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(omap2420_mcspi2_sdma_reqs),
         .main_clk       = "mcspi2_fck",
         .prcm           = {
                 .omap2 = {
@@ -1700,6 +1700,7 @@ static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = {
 static struct omap_hwmod_dma_info omap2420_mcbsp1_sdma_chs[] = {
         { .name = "rx", .dma_req = 32 },
         { .name = "tx", .dma_req = 31 },
+        { .dma_req = -1 }
 };
 
 /* l4_core -> mcbsp1 */
@@ -1721,7 +1722,6 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = {
         .class          = &omap2420_mcbsp_hwmod_class,
         .mpu_irqs       = omap2420_mcbsp1_irqs,
         .sdma_reqs      = omap2420_mcbsp1_sdma_chs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(omap2420_mcbsp1_sdma_chs),
         .main_clk       = "mcbsp1_fck",
         .prcm           = {
                 .omap2 = {
@@ -1747,6 +1747,7 @@ static struct omap_hwmod_irq_info omap2420_mcbsp2_irqs[] = {
 static struct omap_hwmod_dma_info omap2420_mcbsp2_sdma_chs[] = {
         { .name = "rx", .dma_req = 34 },
         { .name = "tx", .dma_req = 33 },
+        { .dma_req = -1 }
 };
 
 /* l4_core -> mcbsp2 */
@@ -1768,7 +1769,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = {
         .class          = &omap2420_mcbsp_hwmod_class,
         .mpu_irqs       = omap2420_mcbsp2_irqs,
         .sdma_reqs      = omap2420_mcbsp2_sdma_chs,
-        .sdma_reqs_cnt  = ARRAY_SIZE(omap2420_mcbsp2_sdma_chs),
         .main_clk       = "mcbsp2_fck",
         .prcm           = {
                 .omap2 = {