diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 162 | 
1 files changed, 25 insertions, 137 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index cc178b573fe..6bac4bb14df 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -151,7 +151,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {  static struct omap_hwmod omap3xxx_l3_main_hwmod = {  	.name		= "l3_main",  	.class		= &l3_hwmod_class, -	.mpu_irqs       = omap3xxx_l3_main_irqs, +	.mpu_irqs	= omap3xxx_l3_main_irqs,  	.masters	= omap3xxx_l3_main_masters,  	.masters_cnt	= ARRAY_SIZE(omap3xxx_l3_main_masters),  	.slaves		= omap3xxx_l3_main_slaves, @@ -572,10 +572,6 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = {  /* timer1 */  static struct omap_hwmod omap3xxx_timer1_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer1_mpu_irqs[] = { -	{ .irq = 37, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer1_addrs[] = {  	{ @@ -603,7 +599,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer1_slaves[] = {  /* timer1 hwmod */  static struct omap_hwmod omap3xxx_timer1_hwmod = {  	.name		= "timer1", -	.mpu_irqs	= omap3xxx_timer1_mpu_irqs, +	.mpu_irqs	= omap2_timer1_mpu_irqs,  	.main_clk	= "gpt1_fck",  	.prcm		= {  		.omap2 = { @@ -622,10 +618,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = {  /* timer2 */  static struct omap_hwmod omap3xxx_timer2_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer2_mpu_irqs[] = { -	{ .irq = 38, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer2_addrs[] = {  	{ @@ -653,7 +645,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer2_slaves[] = {  /* timer2 hwmod */  static struct omap_hwmod omap3xxx_timer2_hwmod = {  	.name		= "timer2", -	.mpu_irqs	= omap3xxx_timer2_mpu_irqs, +	.mpu_irqs	= omap2_timer2_mpu_irqs,  	.main_clk	= "gpt2_fck",  	.prcm		= {  		.omap2 = { @@ -672,10 +664,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {  /* timer3 */  static struct omap_hwmod omap3xxx_timer3_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer3_mpu_irqs[] = { -	{ .irq = 39, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer3_addrs[] = {  	{ @@ -703,7 +691,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer3_slaves[] = {  /* timer3 hwmod */  static struct omap_hwmod omap3xxx_timer3_hwmod = {  	.name		= "timer3", -	.mpu_irqs	= omap3xxx_timer3_mpu_irqs, +	.mpu_irqs	= omap2_timer3_mpu_irqs,  	.main_clk	= "gpt3_fck",  	.prcm		= {  		.omap2 = { @@ -722,10 +710,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {  /* timer4 */  static struct omap_hwmod omap3xxx_timer4_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer4_mpu_irqs[] = { -	{ .irq = 40, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer4_addrs[] = {  	{ @@ -753,7 +737,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer4_slaves[] = {  /* timer4 hwmod */  static struct omap_hwmod omap3xxx_timer4_hwmod = {  	.name		= "timer4", -	.mpu_irqs	= omap3xxx_timer4_mpu_irqs, +	.mpu_irqs	= omap2_timer4_mpu_irqs,  	.main_clk	= "gpt4_fck",  	.prcm		= {  		.omap2 = { @@ -772,10 +756,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {  /* timer5 */  static struct omap_hwmod omap3xxx_timer5_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer5_mpu_irqs[] = { -	{ .irq = 41, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer5_addrs[] = {  	{ @@ -803,7 +783,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer5_slaves[] = {  /* timer5 hwmod */  static struct omap_hwmod omap3xxx_timer5_hwmod = {  	.name		= "timer5", -	.mpu_irqs	= omap3xxx_timer5_mpu_irqs, +	.mpu_irqs	= omap2_timer5_mpu_irqs,  	.main_clk	= "gpt5_fck",  	.prcm		= {  		.omap2 = { @@ -822,10 +802,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {  /* timer6 */  static struct omap_hwmod omap3xxx_timer6_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer6_mpu_irqs[] = { -	{ .irq = 42, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer6_addrs[] = {  	{ @@ -853,7 +829,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer6_slaves[] = {  /* timer6 hwmod */  static struct omap_hwmod omap3xxx_timer6_hwmod = {  	.name		= "timer6", -	.mpu_irqs	= omap3xxx_timer6_mpu_irqs, +	.mpu_irqs	= omap2_timer6_mpu_irqs,  	.main_clk	= "gpt6_fck",  	.prcm		= {  		.omap2 = { @@ -872,10 +848,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {  /* timer7 */  static struct omap_hwmod omap3xxx_timer7_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer7_mpu_irqs[] = { -	{ .irq = 43, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer7_addrs[] = {  	{ @@ -903,7 +875,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer7_slaves[] = {  /* timer7 hwmod */  static struct omap_hwmod omap3xxx_timer7_hwmod = {  	.name		= "timer7", -	.mpu_irqs	= omap3xxx_timer7_mpu_irqs, +	.mpu_irqs	= omap2_timer7_mpu_irqs,  	.main_clk	= "gpt7_fck",  	.prcm		= {  		.omap2 = { @@ -922,10 +894,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {  /* timer8 */  static struct omap_hwmod omap3xxx_timer8_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer8_mpu_irqs[] = { -	{ .irq = 44, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer8_addrs[] = {  	{ @@ -953,7 +921,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer8_slaves[] = {  /* timer8 hwmod */  static struct omap_hwmod omap3xxx_timer8_hwmod = {  	.name		= "timer8", -	.mpu_irqs	= omap3xxx_timer8_mpu_irqs, +	.mpu_irqs	= omap2_timer8_mpu_irqs,  	.main_clk	= "gpt8_fck",  	.prcm		= {  		.omap2 = { @@ -972,10 +940,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = {  /* timer9 */  static struct omap_hwmod omap3xxx_timer9_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer9_mpu_irqs[] = { -	{ .irq = 45, }, -	{ .irq = -1 } -};  static struct omap_hwmod_addr_space omap3xxx_timer9_addrs[] = {  	{ @@ -1003,7 +967,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer9_slaves[] = {  /* timer9 hwmod */  static struct omap_hwmod omap3xxx_timer9_hwmod = {  	.name		= "timer9", -	.mpu_irqs	= omap3xxx_timer9_mpu_irqs, +	.mpu_irqs	= omap2_timer9_mpu_irqs,  	.main_clk	= "gpt9_fck",  	.prcm		= {  		.omap2 = { @@ -1022,10 +986,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = {  /* timer10 */  static struct omap_hwmod omap3xxx_timer10_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer10_mpu_irqs[] = { -	{ .irq = 46, }, -	{ .irq = -1 } -};  /* l4_core -> timer10 */  static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer10 = { @@ -1044,7 +1004,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer10_slaves[] = {  /* timer10 hwmod */  static struct omap_hwmod omap3xxx_timer10_hwmod = {  	.name		= "timer10", -	.mpu_irqs	= omap3xxx_timer10_mpu_irqs, +	.mpu_irqs	= omap2_timer10_mpu_irqs,  	.main_clk	= "gpt10_fck",  	.prcm		= {  		.omap2 = { @@ -1063,10 +1023,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = {  /* timer11 */  static struct omap_hwmod omap3xxx_timer11_hwmod; -static struct omap_hwmod_irq_info omap3xxx_timer11_mpu_irqs[] = { -	{ .irq = 47, }, -	{ .irq = -1 } -};  /* l4_core -> timer11 */  static struct omap_hwmod_ocp_if omap3xxx_l4_core__timer11 = { @@ -1085,7 +1041,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_timer11_slaves[] = {  /* timer11 hwmod */  static struct omap_hwmod omap3xxx_timer11_hwmod = {  	.name		= "timer11", -	.mpu_irqs	= omap3xxx_timer11_mpu_irqs, +	.mpu_irqs	= omap2_timer11_mpu_irqs,  	.main_clk	= "gpt11_fck",  	.prcm		= {  		.omap2 = { @@ -1254,11 +1210,6 @@ static struct omap_hwmod_class uart_class = {  /* UART1 */ -static struct omap_hwmod_irq_info uart1_mpu_irqs[] = { -	{ .irq = INT_24XX_UART1_IRQ, }, -	{ .irq = -1 } -}; -  static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {  	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART1_TX, },  	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART1_RX, }, @@ -1270,7 +1221,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {  static struct omap_hwmod omap3xxx_uart1_hwmod = {  	.name		= "uart1", -	.mpu_irqs	= uart1_mpu_irqs, +	.mpu_irqs	= omap2_uart1_mpu_irqs,  	.sdma_reqs	= uart1_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(uart1_sdma_reqs),  	.main_clk	= "uart1_fck", @@ -1291,11 +1242,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {  /* UART2 */ -static struct omap_hwmod_irq_info uart2_mpu_irqs[] = { -	{ .irq = INT_24XX_UART2_IRQ, }, -	{ .irq = -1 } -}; -  static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {  	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART2_TX, },  	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART2_RX, }, @@ -1307,7 +1253,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {  static struct omap_hwmod omap3xxx_uart2_hwmod = {  	.name		= "uart2", -	.mpu_irqs	= uart2_mpu_irqs, +	.mpu_irqs	= omap2_uart2_mpu_irqs,  	.sdma_reqs	= uart2_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(uart2_sdma_reqs),  	.main_clk	= "uart2_fck", @@ -1328,11 +1274,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {  /* UART3 */ -static struct omap_hwmod_irq_info uart3_mpu_irqs[] = { -	{ .irq = INT_24XX_UART3_IRQ, }, -	{ .irq = -1 } -}; -  static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {  	{ .name = "tx",	.dma_req = OMAP24XX_DMA_UART3_TX, },  	{ .name = "rx",	.dma_req = OMAP24XX_DMA_UART3_RX, }, @@ -1344,7 +1285,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {  static struct omap_hwmod omap3xxx_uart3_hwmod = {  	.name		= "uart3", -	.mpu_irqs	= uart3_mpu_irqs, +	.mpu_irqs	= omap2_uart3_mpu_irqs,  	.sdma_reqs	= uart3_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(uart3_sdma_reqs),  	.main_clk	= "uart3_fck", @@ -1555,11 +1496,6 @@ static struct omap_hwmod_class omap3xxx_dispc_hwmod_class = {  	.sysc = &omap3xxx_dispc_sysc,  }; -static struct omap_hwmod_irq_info omap3xxx_dispc_irqs[] = { -	{ .irq = 25 }, -	{ .irq = -1 } -}; -  /* l4_core -> dss_dispc */  static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {  	.master		= &omap3xxx_l4_core_hwmod, @@ -1584,7 +1520,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dss_dispc_slaves[] = {  static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {  	.name		= "dss_dispc",  	.class		= &omap3xxx_dispc_hwmod_class, -	.mpu_irqs	= omap3xxx_dispc_irqs, +	.mpu_irqs	= omap2_dispc_irqs,  	.main_clk	= "dss1_alwon_fck",  	.prcm		= {  		.omap2 = { @@ -1781,11 +1717,6 @@ static struct omap_i2c_dev_attr i2c1_dev_attr = {  	.fifo_depth	= 8, /* bytes */  }; -static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = { -	{ .irq = INT_24XX_I2C1_IRQ, }, -	{ .irq = -1 } -}; -  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 }, @@ -1797,7 +1728,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {  static struct omap_hwmod omap3xxx_i2c1_hwmod = {  	.name		= "i2c1", -	.mpu_irqs	= i2c1_mpu_irqs, +	.mpu_irqs	= omap2_i2c1_mpu_irqs,  	.sdma_reqs	= i2c1_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(i2c1_sdma_reqs),  	.main_clk	= "i2c1_fck", @@ -1823,11 +1754,6 @@ static struct omap_i2c_dev_attr i2c2_dev_attr = {  	.fifo_depth	= 8, /* bytes */  }; -static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = { -	{ .irq = INT_24XX_I2C2_IRQ, }, -	{ .irq = -1 } -}; -  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 }, @@ -1839,7 +1765,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {  static struct omap_hwmod omap3xxx_i2c2_hwmod = {  	.name		= "i2c2", -	.mpu_irqs	= i2c2_mpu_irqs, +	.mpu_irqs	= omap2_i2c2_mpu_irqs,  	.sdma_reqs	= i2c2_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(i2c2_sdma_reqs),  	.main_clk	= "i2c2_fck", @@ -2032,11 +1958,6 @@ static struct omap_gpio_dev_attr gpio_dev_attr = {  };  /* gpio1 */ -static struct omap_hwmod_irq_info omap3xxx_gpio1_irqs[] = { -	{ .irq = 29 }, /* INT_34XX_GPIO_BANK1 */ -	{ .irq = -1 } -}; -  static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {  	{ .role = "dbclk", .clk = "gpio1_dbck", },  }; @@ -2048,7 +1969,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio1_slaves[] = {  static struct omap_hwmod omap3xxx_gpio1_hwmod = {  	.name		= "gpio1",  	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET, -	.mpu_irqs	= omap3xxx_gpio1_irqs, +	.mpu_irqs	= omap2_gpio1_irqs,  	.main_clk	= "gpio1_ick",  	.opt_clks	= gpio1_opt_clks,  	.opt_clks_cnt	= ARRAY_SIZE(gpio1_opt_clks), @@ -2069,11 +1990,6 @@ static struct omap_hwmod omap3xxx_gpio1_hwmod = {  };  /* gpio2 */ -static struct omap_hwmod_irq_info omap3xxx_gpio2_irqs[] = { -	{ .irq = 30 }, /* INT_34XX_GPIO_BANK2 */ -	{ .irq = -1 } -}; -  static struct omap_hwmod_opt_clk gpio2_opt_clks[] = {  	{ .role = "dbclk", .clk = "gpio2_dbck", },  }; @@ -2085,7 +2001,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio2_slaves[] = {  static struct omap_hwmod omap3xxx_gpio2_hwmod = {  	.name		= "gpio2",  	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET, -	.mpu_irqs	= omap3xxx_gpio2_irqs, +	.mpu_irqs	= omap2_gpio2_irqs,  	.main_clk	= "gpio2_ick",  	.opt_clks	= gpio2_opt_clks,  	.opt_clks_cnt	= ARRAY_SIZE(gpio2_opt_clks), @@ -2106,11 +2022,6 @@ static struct omap_hwmod omap3xxx_gpio2_hwmod = {  };  /* gpio3 */ -static struct omap_hwmod_irq_info omap3xxx_gpio3_irqs[] = { -	{ .irq = 31 }, /* INT_34XX_GPIO_BANK3 */ -	{ .irq = -1 } -}; -  static struct omap_hwmod_opt_clk gpio3_opt_clks[] = {  	{ .role = "dbclk", .clk = "gpio3_dbck", },  }; @@ -2122,7 +2033,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio3_slaves[] = {  static struct omap_hwmod omap3xxx_gpio3_hwmod = {  	.name		= "gpio3",  	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET, -	.mpu_irqs	= omap3xxx_gpio3_irqs, +	.mpu_irqs	= omap2_gpio3_irqs,  	.main_clk	= "gpio3_ick",  	.opt_clks	= gpio3_opt_clks,  	.opt_clks_cnt	= ARRAY_SIZE(gpio3_opt_clks), @@ -2143,11 +2054,6 @@ static struct omap_hwmod omap3xxx_gpio3_hwmod = {  };  /* gpio4 */ -static struct omap_hwmod_irq_info omap3xxx_gpio4_irqs[] = { -	{ .irq = 32 }, /* INT_34XX_GPIO_BANK4 */ -	{ .irq = -1 } -}; -  static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {  	{ .role = "dbclk", .clk = "gpio4_dbck", },  }; @@ -2159,7 +2065,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_gpio4_slaves[] = {  static struct omap_hwmod omap3xxx_gpio4_hwmod = {  	.name		= "gpio4",  	.flags		= HWMOD_CONTROL_OPT_CLKS_IN_RESET, -	.mpu_irqs	= omap3xxx_gpio4_irqs, +	.mpu_irqs	= omap2_gpio4_irqs,  	.main_clk	= "gpio4_ick",  	.opt_clks	= gpio4_opt_clks,  	.opt_clks_cnt	= ARRAY_SIZE(gpio4_opt_clks), @@ -2287,14 +2193,6 @@ static struct omap_hwmod_class omap3xxx_dma_hwmod_class = {  };  /* dma_system */ -static struct omap_hwmod_irq_info omap3xxx_dma_system_irqs[] = { -	{ .name = "0", .irq = 12 }, /* INT_24XX_SDMA_IRQ0 */ -	{ .name = "1", .irq = 13 }, /* INT_24XX_SDMA_IRQ1 */ -	{ .name = "2", .irq = 14 }, /* INT_24XX_SDMA_IRQ2 */ -	{ .name = "3", .irq = 15 }, /* INT_24XX_SDMA_IRQ3 */ -	{ .irq = -1 } -}; -  static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {  	{  		.pa_start	= 0x48056000, @@ -2326,7 +2224,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dma_system_slaves[] = {  static struct omap_hwmod omap3xxx_dma_system_hwmod = {  	.name		= "dma",  	.class		= &omap3xxx_dma_hwmod_class, -	.mpu_irqs	= omap3xxx_dma_system_irqs, +	.mpu_irqs	= omap2_dma_system_irqs,  	.main_clk	= "core_l3_ick",  	.prcm = {  		.omap2 = { @@ -3044,11 +2942,6 @@ static struct omap_hwmod_class omap34xx_mcspi_class = {  };  /* mcspi1 */ -static struct omap_hwmod_irq_info omap34xx_mcspi1_mpu_irqs[] = { -	{ .name = "irq", .irq = 65 }, -	{ .irq = -1 } -}; -  static struct omap_hwmod_dma_info omap34xx_mcspi1_sdma_reqs[] = {  	{ .name = "tx0", .dma_req = 35 },  	{ .name = "rx0", .dma_req = 36 }, @@ -3070,7 +2963,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {  static struct omap_hwmod omap34xx_mcspi1 = {  	.name		= "mcspi1", -	.mpu_irqs	= omap34xx_mcspi1_mpu_irqs, +	.mpu_irqs	= omap2_mcspi1_mpu_irqs,  	.sdma_reqs	= omap34xx_mcspi1_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(omap34xx_mcspi1_sdma_reqs),  	.main_clk	= "mcspi1_fck", @@ -3091,11 +2984,6 @@ static struct omap_hwmod omap34xx_mcspi1 = {  };  /* mcspi2 */ -static struct omap_hwmod_irq_info omap34xx_mcspi2_mpu_irqs[] = { -	{ .name = "irq", .irq = 66 }, -	{ .irq = -1 } -}; -  static struct omap_hwmod_dma_info omap34xx_mcspi2_sdma_reqs[] = {  	{ .name = "tx0", .dma_req = 43 },  	{ .name = "rx0", .dma_req = 44 }, @@ -3113,7 +3001,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {  static struct omap_hwmod omap34xx_mcspi2 = {  	.name		= "mcspi2", -	.mpu_irqs	= omap34xx_mcspi2_mpu_irqs, +	.mpu_irqs	= omap2_mcspi2_mpu_irqs,  	.sdma_reqs	= omap34xx_mcspi2_sdma_reqs,  	.sdma_reqs_cnt	= ARRAY_SIZE(omap34xx_mcspi2_sdma_reqs),  	.main_clk	= "mcspi2_fck",  |