diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 59 |
1 files changed, 52 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 66b8da2e689..49061295475 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
@@ -292,13 +292,7 @@ static struct omap_hwmod omap44xx_ocp_wp_noc_hwmod = { | |||
292 | * - They still need to be validated with the driver | 292 | * - They still need to be validated with the driver |
293 | * properly adapted to omap_hwmod / omap_device | 293 | * properly adapted to omap_hwmod / omap_device |
294 | * | 294 | * |
295 | * debugss | 295 | * usim |
296 | * efuse_ctrl_cust | ||
297 | * efuse_ctrl_std | ||
298 | * mpu_c0 | ||
299 | * mpu_c1 | ||
300 | * usb_phy_cm | ||
301 | * usim | ||
302 | */ | 296 | */ |
303 | 297 | ||
304 | /* | 298 | /* |
@@ -479,6 +473,29 @@ static struct omap_hwmod omap44xx_ctrl_module_pad_wkup_hwmod = { | |||
479 | }; | 473 | }; |
480 | 474 | ||
481 | /* | 475 | /* |
476 | * 'debugss' class | ||
477 | * debug and emulation sub system | ||
478 | */ | ||
479 | |||
480 | static struct omap_hwmod_class omap44xx_debugss_hwmod_class = { | ||
481 | .name = "debugss", | ||
482 | }; | ||
483 | |||
484 | /* debugss */ | ||
485 | static struct omap_hwmod omap44xx_debugss_hwmod = { | ||
486 | .name = "debugss", | ||
487 | .class = &omap44xx_debugss_hwmod_class, | ||
488 | .clkdm_name = "emu_sys_clkdm", | ||
489 | .main_clk = "trace_clk_div_ck", | ||
490 | .prcm = { | ||
491 | .omap4 = { | ||
492 | .clkctrl_offs = OMAP4_CM_EMU_DEBUGSS_CLKCTRL_OFFSET, | ||
493 | .context_offs = OMAP4_RM_EMU_DEBUGSS_CONTEXT_OFFSET, | ||
494 | }, | ||
495 | }, | ||
496 | }; | ||
497 | |||
498 | /* | ||
482 | * 'dma' class | 499 | * 'dma' class |
483 | * dma controller for data exchange between memory to memory (i.e. internal or | 500 | * dma controller for data exchange between memory to memory (i.e. internal or |
484 | * external memory) and gp peripherals to memory or memory to gp peripherals | 501 | * external memory) and gp peripherals to memory or memory to gp peripherals |
@@ -3750,6 +3767,14 @@ static struct omap_hwmod_ocp_if omap44xx_c2c_target_fw__l3_main_2 = { | |||
3750 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 3767 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
3751 | }; | 3768 | }; |
3752 | 3769 | ||
3770 | /* debugss -> l3_main_2 */ | ||
3771 | static struct omap_hwmod_ocp_if omap44xx_debugss__l3_main_2 = { | ||
3772 | .master = &omap44xx_debugss_hwmod, | ||
3773 | .slave = &omap44xx_l3_main_2_hwmod, | ||
3774 | .clk = "dbgclk_mux_ck", | ||
3775 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
3776 | }; | ||
3777 | |||
3753 | /* dma_system -> l3_main_2 */ | 3778 | /* dma_system -> l3_main_2 */ |
3754 | static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { | 3779 | static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { |
3755 | .master = &omap44xx_dma_system_hwmod, | 3780 | .master = &omap44xx_dma_system_hwmod, |
@@ -4106,6 +4131,24 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__ctrl_module_pad_wkup = { | |||
4106 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 4131 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
4107 | }; | 4132 | }; |
4108 | 4133 | ||
4134 | static struct omap_hwmod_addr_space omap44xx_debugss_addrs[] = { | ||
4135 | { | ||
4136 | .pa_start = 0x54160000, | ||
4137 | .pa_end = 0x54167fff, | ||
4138 | .flags = ADDR_TYPE_RT | ||
4139 | }, | ||
4140 | { } | ||
4141 | }; | ||
4142 | |||
4143 | /* l3_instr -> debugss */ | ||
4144 | static struct omap_hwmod_ocp_if omap44xx_l3_instr__debugss = { | ||
4145 | .master = &omap44xx_l3_instr_hwmod, | ||
4146 | .slave = &omap44xx_debugss_hwmod, | ||
4147 | .clk = "l3_div_ck", | ||
4148 | .addr = omap44xx_debugss_addrs, | ||
4149 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
4150 | }; | ||
4151 | |||
4109 | static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = { | 4152 | static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = { |
4110 | { | 4153 | { |
4111 | .pa_start = 0x4a056000, | 4154 | .pa_start = 0x4a056000, |
@@ -5955,6 +5998,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { | |||
5955 | &omap44xx_mmc2__l3_main_1, | 5998 | &omap44xx_mmc2__l3_main_1, |
5956 | &omap44xx_mpu__l3_main_1, | 5999 | &omap44xx_mpu__l3_main_1, |
5957 | &omap44xx_c2c_target_fw__l3_main_2, | 6000 | &omap44xx_c2c_target_fw__l3_main_2, |
6001 | &omap44xx_debugss__l3_main_2, | ||
5958 | &omap44xx_dma_system__l3_main_2, | 6002 | &omap44xx_dma_system__l3_main_2, |
5959 | &omap44xx_fdif__l3_main_2, | 6003 | &omap44xx_fdif__l3_main_2, |
5960 | &omap44xx_gpu__l3_main_2, | 6004 | &omap44xx_gpu__l3_main_2, |
@@ -5987,6 +6031,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { | |||
5987 | &omap44xx_l4_cfg__ctrl_module_pad_core, | 6031 | &omap44xx_l4_cfg__ctrl_module_pad_core, |
5988 | &omap44xx_l4_wkup__ctrl_module_wkup, | 6032 | &omap44xx_l4_wkup__ctrl_module_wkup, |
5989 | &omap44xx_l4_wkup__ctrl_module_pad_wkup, | 6033 | &omap44xx_l4_wkup__ctrl_module_pad_wkup, |
6034 | &omap44xx_l3_instr__debugss, | ||
5990 | &omap44xx_l4_cfg__dma_system, | 6035 | &omap44xx_l4_cfg__dma_system, |
5991 | &omap44xx_l4_abe__dmic, | 6036 | &omap44xx_l4_abe__dmic, |
5992 | &omap44xx_l4_abe__dmic_dma, | 6037 | &omap44xx_l4_abe__dmic_dma, |