diff options
author | Benoit Cousson <bcousson@baylibre.com> | 2013-10-11 18:29:55 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-10-11 18:37:05 -0400 |
commit | 254f57a92987b6cde6004f58d6b847813dfb9e0e (patch) | |
tree | 1cafd799dc6983b5b56bd6678524f5d17ce76451 | |
parent | ed8436d2b38254d5a8b490c481c54d4fbec9ffc0 (diff) |
ARM: OMAP5: hwmod: add missing ocp2scp hwmod data
Add this hwmod data to allow USB3 to work in OMAP5 boards.
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
[tony@atomide.com: updated to apply against Paul's changes]
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c index 68a78ef1cbf3..9e08d6994a0b 100644 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c | |||
@@ -1181,6 +1181,42 @@ static struct omap_hwmod omap54xx_spinlock_hwmod = { | |||
1181 | }; | 1181 | }; |
1182 | 1182 | ||
1183 | /* | 1183 | /* |
1184 | * 'ocp2scp' class | ||
1185 | * bridge to transform ocp interface protocol to scp (serial control port) | ||
1186 | * protocol | ||
1187 | */ | ||
1188 | |||
1189 | static struct omap_hwmod_class_sysconfig omap54xx_ocp2scp_sysc = { | ||
1190 | .rev_offs = 0x0000, | ||
1191 | .sysc_offs = 0x0010, | ||
1192 | .syss_offs = 0x0014, | ||
1193 | .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE | | ||
1194 | SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), | ||
1195 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | ||
1196 | .sysc_fields = &omap_hwmod_sysc_type1, | ||
1197 | }; | ||
1198 | |||
1199 | static struct omap_hwmod_class omap54xx_ocp2scp_hwmod_class = { | ||
1200 | .name = "ocp2scp", | ||
1201 | .sysc = &omap54xx_ocp2scp_sysc, | ||
1202 | }; | ||
1203 | |||
1204 | /* ocp2scp1 */ | ||
1205 | static struct omap_hwmod omap54xx_ocp2scp1_hwmod = { | ||
1206 | .name = "ocp2scp1", | ||
1207 | .class = &omap54xx_ocp2scp_hwmod_class, | ||
1208 | .clkdm_name = "l3init_clkdm", | ||
1209 | .main_clk = "l4_root_clk_div", | ||
1210 | .prcm = { | ||
1211 | .omap4 = { | ||
1212 | .clkctrl_offs = OMAP54XX_CM_L3INIT_OCP2SCP1_CLKCTRL_OFFSET, | ||
1213 | .context_offs = OMAP54XX_RM_L3INIT_OCP2SCP1_CONTEXT_OFFSET, | ||
1214 | .modulemode = MODULEMODE_HWCTRL, | ||
1215 | }, | ||
1216 | }, | ||
1217 | }; | ||
1218 | |||
1219 | /* | ||
1184 | * 'timer' class | 1220 | * 'timer' class |
1185 | * general purpose timer module with accurate 1ms tick | 1221 | * general purpose timer module with accurate 1ms tick |
1186 | * This class contains several variants: ['timer_1ms', 'timer'] | 1222 | * This class contains several variants: ['timer_1ms', 'timer'] |
@@ -2120,6 +2156,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__spinlock = { | |||
2120 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 2156 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2121 | }; | 2157 | }; |
2122 | 2158 | ||
2159 | /* l4_cfg -> ocp2scp1 */ | ||
2160 | static struct omap_hwmod_ocp_if omap54xx_l4_cfg__ocp2scp1 = { | ||
2161 | .master = &omap54xx_l4_cfg_hwmod, | ||
2162 | .slave = &omap54xx_ocp2scp1_hwmod, | ||
2163 | .clk = "l4_root_clk_div", | ||
2164 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
2165 | }; | ||
2166 | |||
2123 | /* l4_wkup -> timer1 */ | 2167 | /* l4_wkup -> timer1 */ |
2124 | static struct omap_hwmod_ocp_if omap54xx_l4_wkup__timer1 = { | 2168 | static struct omap_hwmod_ocp_if omap54xx_l4_wkup__timer1 = { |
2125 | .master = &omap54xx_l4_wkup_hwmod, | 2169 | .master = &omap54xx_l4_wkup_hwmod, |
@@ -2340,6 +2384,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { | |||
2340 | &omap54xx_l4_per__mmc5, | 2384 | &omap54xx_l4_per__mmc5, |
2341 | &omap54xx_l4_cfg__mpu, | 2385 | &omap54xx_l4_cfg__mpu, |
2342 | &omap54xx_l4_cfg__spinlock, | 2386 | &omap54xx_l4_cfg__spinlock, |
2387 | &omap54xx_l4_cfg__ocp2scp1, | ||
2343 | &omap54xx_l4_wkup__timer1, | 2388 | &omap54xx_l4_wkup__timer1, |
2344 | &omap54xx_l4_per__timer2, | 2389 | &omap54xx_l4_per__timer2, |
2345 | &omap54xx_l4_per__timer3, | 2390 | &omap54xx_l4_per__timer3, |