diff options
author | Benoit Cousson <b-cousson@ti.com> | 2012-09-23 19:28:21 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:28:21 -0400 |
commit | 33c976ec446f8be2d86b612efbb82ea31aff2254 (patch) | |
tree | 67538354f203ca18b2ba9c848f77625c85bb094a | |
parent | 8f993a01978ce61ac2312eafbe1c7b348e5b0f5a (diff) |
ARM: OMAP4: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries
ocp2scp_usb_phy was missing the address space data and thus
the sysconfig was not populated either.
The usb_host_hs address space was wrong.
Fix both of them and add the missing sysconfig entry.
Reported-by: Kishon Vijay Abraham <kishon@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 0d9f1fe0534e..01f18b5d2329 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
@@ -2526,8 +2526,19 @@ static struct omap_hwmod omap44xx_ocmc_ram_hwmod = { | |||
2526 | * protocol | 2526 | * protocol |
2527 | */ | 2527 | */ |
2528 | 2528 | ||
2529 | static struct omap_hwmod_class_sysconfig omap44xx_ocp2scp_sysc = { | ||
2530 | .rev_offs = 0x0000, | ||
2531 | .sysc_offs = 0x0010, | ||
2532 | .syss_offs = 0x0014, | ||
2533 | .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE | | ||
2534 | SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), | ||
2535 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | ||
2536 | .sysc_fields = &omap_hwmod_sysc_type1, | ||
2537 | }; | ||
2538 | |||
2529 | static struct omap_hwmod_class omap44xx_ocp2scp_hwmod_class = { | 2539 | static struct omap_hwmod_class omap44xx_ocp2scp_hwmod_class = { |
2530 | .name = "ocp2scp", | 2540 | .name = "ocp2scp", |
2541 | .sysc = &omap44xx_ocp2scp_sysc, | ||
2531 | }; | 2542 | }; |
2532 | 2543 | ||
2533 | /* ocp2scp_usb_phy */ | 2544 | /* ocp2scp_usb_phy */ |
@@ -5311,11 +5322,21 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ocmc_ram = { | |||
5311 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 5322 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
5312 | }; | 5323 | }; |
5313 | 5324 | ||
5325 | static struct omap_hwmod_addr_space omap44xx_ocp2scp_usb_phy_addrs[] = { | ||
5326 | { | ||
5327 | .pa_start = 0x4a0ad000, | ||
5328 | .pa_end = 0x4a0ad01f, | ||
5329 | .flags = ADDR_TYPE_RT | ||
5330 | }, | ||
5331 | { } | ||
5332 | }; | ||
5333 | |||
5314 | /* l4_cfg -> ocp2scp_usb_phy */ | 5334 | /* l4_cfg -> ocp2scp_usb_phy */ |
5315 | static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp2scp_usb_phy = { | 5335 | static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp2scp_usb_phy = { |
5316 | .master = &omap44xx_l4_cfg_hwmod, | 5336 | .master = &omap44xx_l4_cfg_hwmod, |
5317 | .slave = &omap44xx_ocp2scp_usb_phy_hwmod, | 5337 | .slave = &omap44xx_ocp2scp_usb_phy_hwmod, |
5318 | .clk = "l4_div_ck", | 5338 | .clk = "l4_div_ck", |
5339 | .addr = omap44xx_ocp2scp_usb_phy_addrs, | ||
5319 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 5340 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
5320 | }; | 5341 | }; |
5321 | 5342 | ||
@@ -5935,7 +5956,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_hs = { | |||
5935 | static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = { | 5956 | static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = { |
5936 | { | 5957 | { |
5937 | .pa_start = 0x4a0ab000, | 5958 | .pa_start = 0x4a0ab000, |
5938 | .pa_end = 0x4a0ab003, | 5959 | .pa_end = 0x4a0ab7ff, |
5939 | .flags = ADDR_TYPE_RT | 5960 | .flags = ADDR_TYPE_RT |
5940 | }, | 5961 | }, |
5941 | { } | 5962 | { } |