diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420_data.c | 281 | 
1 files changed, 21 insertions, 260 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 75c57d35bcc..b01b66a85f2 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -212,85 +212,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = {   * interfaces   */ -/* L3 -> L4_CORE interface */ -static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = { -	.master	= &omap2xxx_l3_main_hwmod, -	.slave	= &omap2xxx_l4_core_hwmod, -	.user	= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* MPU -> L3 interface */ -static struct omap_hwmod_ocp_if omap2420_mpu__l3_main = { -	.master = &omap2xxx_mpu_hwmod, -	.slave	= &omap2xxx_l3_main_hwmod, -	.user	= OCP_USER_MPU, -}; - -/* DSS -> l3 */ -static struct omap_hwmod_ocp_if omap2420_dss__l3 = { -	.master		= &omap2xxx_dss_core_hwmod, -	.slave		= &omap2xxx_l3_main_hwmod, -	.fw = { -		.omap2 = { -			.l3_perm_bit  = OMAP2_L3_CORE_FW_CONNID_DSS, -			.flags	= OMAP_FIREWALL_L3, -		} -	}, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4 core -> mcspi1 interface */ -static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi1 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_mcspi1_hwmod, -	.clk		= "mcspi1_ick", -	.addr		= omap2_mcspi1_addr_space, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4 core -> mcspi2 interface */ -static struct omap_hwmod_ocp_if omap2420_l4_core__mcspi2 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_mcspi2_hwmod, -	.clk		= "mcspi2_ick", -	.addr		= omap2_mcspi2_addr_space, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* L4_CORE -> L4_WKUP interface */ -static struct omap_hwmod_ocp_if omap2420_l4_core__l4_wkup = { -	.master	= &omap2xxx_l4_core_hwmod, -	.slave	= &omap2xxx_l4_wkup_hwmod, -	.user	= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* L4 CORE -> UART1 interface */ -static struct omap_hwmod_ocp_if omap2_l4_core__uart1 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_uart1_hwmod, -	.clk		= "uart1_ick", -	.addr		= omap2xxx_uart1_addr_space, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* L4 CORE -> UART2 interface */ -static struct omap_hwmod_ocp_if omap2_l4_core__uart2 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_uart2_hwmod, -	.clk		= "uart2_ick", -	.addr		= omap2xxx_uart2_addr_space, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* L4 PER -> UART3 interface */ -static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_uart3_hwmod, -	.clk		= "uart3_ick", -	.addr		= omap2xxx_uart3_addr_space, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; -  /* L4 CORE -> I2C1 interface */  static struct omap_hwmod_ocp_if omap2420_l4_core__i2c1 = {  	.master		= &omap2xxx_l4_core_hwmod, @@ -335,105 +256,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__timer1 = {  	.user		= OCP_USER_MPU | OCP_USER_SDMA,  }; -/* l4_core -> timer2 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer2 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer2_hwmod, -	.clk		= "gpt2_ick", -	.addr		= omap2xxx_timer2_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer3 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer3 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer3_hwmod, -	.clk		= "gpt3_ick", -	.addr		= omap2xxx_timer3_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer4 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer4 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer4_hwmod, -	.clk		= "gpt4_ick", -	.addr		= omap2xxx_timer4_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer5 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer5 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer5_hwmod, -	.clk		= "gpt5_ick", -	.addr		= omap2xxx_timer5_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer6 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer6 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer6_hwmod, -	.clk		= "gpt6_ick", -	.addr		= omap2xxx_timer6_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer7 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer7 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer7_hwmod, -	.clk		= "gpt7_ick", -	.addr		= omap2xxx_timer7_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer8 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer8 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer8_hwmod, -	.clk		= "gpt8_ick", -	.addr		= omap2xxx_timer8_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer9 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer9 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer9_hwmod, -	.clk		= "gpt9_ick", -	.addr		= omap2xxx_timer9_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer10 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer10 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer10_hwmod, -	.clk		= "gpt10_ick", -	.addr		= omap2_timer10_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer11 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer11 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer11_hwmod, -	.clk		= "gpt11_ick", -	.addr		= omap2_timer11_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> timer12 */ -static struct omap_hwmod_ocp_if omap2420_l4_core__timer12 = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_timer12_hwmod, -	.clk		= "gpt12_ick", -	.addr		= omap2xxx_timer12_addrs, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; -  /* l4_wkup -> wd_timer2 */  static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = {  	{ @@ -452,67 +274,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = {  	.user		= OCP_USER_MPU | OCP_USER_SDMA,  }; -/* l4_core -> dss */ -static struct omap_hwmod_ocp_if omap2420_l4_core__dss = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_dss_core_hwmod, -	.clk		= "dss_ick", -	.addr		= omap2_dss_addrs, -	.fw = { -		.omap2 = { -			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, -			.flags	= OMAP_FIREWALL_L4, -		} -	}, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> dss_dispc */ -static struct omap_hwmod_ocp_if omap2420_l4_core__dss_dispc = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_dss_dispc_hwmod, -	.clk		= "dss_ick", -	.addr		= omap2_dss_dispc_addrs, -	.fw = { -		.omap2 = { -			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION, -			.flags	= OMAP_FIREWALL_L4, -		} -	}, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> dss_rfbi */ -static struct omap_hwmod_ocp_if omap2420_l4_core__dss_rfbi = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_dss_rfbi_hwmod, -	.clk		= "dss_ick", -	.addr		= omap2_dss_rfbi_addrs, -	.fw = { -		.omap2 = { -			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION, -			.flags	= OMAP_FIREWALL_L4, -		} -	}, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* l4_core -> dss_venc */ -static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = { -	.master		= &omap2xxx_l4_core_hwmod, -	.slave		= &omap2xxx_dss_venc_hwmod, -	.clk		= "dss_ick", -	.addr		= omap2_dss_venc_addrs, -	.fw = { -		.omap2 = { -			.l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_VENC_REGION, -			.flags	= OMAP_FIREWALL_L4, -		} -	}, -	.flags		= OCPIF_SWSUP_IDLE, -	.user		= OCP_USER_MPU | OCP_USER_SDMA, -}; -  /* l4_wkup -> gpio1 */  static struct omap_hwmod_addr_space omap2420_gpio1_addr_space[] = {  	{ @@ -629,12 +390,12 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = {  };  static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = { -	&omap2420_l3_main__l4_core, -	&omap2420_mpu__l3_main, -	&omap2420_dss__l3, -	&omap2420_l4_core__mcspi1, -	&omap2420_l4_core__mcspi2, -	&omap2420_l4_core__l4_wkup, +	&omap2xxx_l3_main__l4_core, +	&omap2xxx_mpu__l3_main, +	&omap2xxx_dss__l3, +	&omap2xxx_l4_core__mcspi1, +	&omap2xxx_l4_core__mcspi2, +	&omap2xxx_l4_core__l4_wkup,  	&omap2_l4_core__uart1,  	&omap2_l4_core__uart2,  	&omap2_l4_core__uart3, @@ -642,22 +403,22 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {  	&omap2420_l4_core__i2c2,  	&omap2420_l3__iva,  	&omap2420_l4_wkup__timer1, -	&omap2420_l4_core__timer2, -	&omap2420_l4_core__timer3, -	&omap2420_l4_core__timer4, -	&omap2420_l4_core__timer5, -	&omap2420_l4_core__timer6, -	&omap2420_l4_core__timer7, -	&omap2420_l4_core__timer8, -	&omap2420_l4_core__timer9, -	&omap2420_l4_core__timer10, -	&omap2420_l4_core__timer11, -	&omap2420_l4_core__timer12, +	&omap2xxx_l4_core__timer2, +	&omap2xxx_l4_core__timer3, +	&omap2xxx_l4_core__timer4, +	&omap2xxx_l4_core__timer5, +	&omap2xxx_l4_core__timer6, +	&omap2xxx_l4_core__timer7, +	&omap2xxx_l4_core__timer8, +	&omap2xxx_l4_core__timer9, +	&omap2xxx_l4_core__timer10, +	&omap2xxx_l4_core__timer11, +	&omap2xxx_l4_core__timer12,  	&omap2420_l4_wkup__wd_timer2, -	&omap2420_l4_core__dss, -	&omap2420_l4_core__dss_dispc, -	&omap2420_l4_core__dss_rfbi, -	&omap2420_l4_core__dss_venc, +	&omap2xxx_l4_core__dss, +	&omap2xxx_l4_core__dss_dispc, +	&omap2xxx_l4_core__dss_rfbi, +	&omap2xxx_l4_core__dss_venc,  	&omap2420_l4_wkup__gpio1,  	&omap2420_l4_wkup__gpio2,  	&omap2420_l4_wkup__gpio3,  |