diff options
author | Paul Walmsley <paul@pwsan.com> | 2011-03-11 00:43:05 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-03-11 00:43:05 -0500 |
commit | 2d403fe03070b541cc93cfa915f6e6c592cf231c (patch) | |
tree | 530e0bf3a99a9aa93e0113a916fb7a547605ad2e /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
parent | 21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 (diff) | |
parent | cc1226e7635011c7dd1e786770ed51ee751800f2 (diff) |
Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 2e275cbcd65..17b4fb8c347 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -1240,7 +1240,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_wd_timer_sysc = { | |||
1240 | .syss_offs = 0x0014, | 1240 | .syss_offs = 0x0014, |
1241 | .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | | 1241 | .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | |
1242 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | | 1242 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | |
1243 | SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY), | 1243 | SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY | |
1244 | SYSS_HAS_RESET_STATUS), | ||
1244 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | 1245 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), |
1245 | .sysc_fields = &omap_hwmod_sysc_type1, | 1246 | .sysc_fields = &omap_hwmod_sysc_type1, |
1246 | }; | 1247 | }; |
@@ -1252,7 +1253,7 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = { | |||
1252 | .syss_offs = 0x10, | 1253 | .syss_offs = 0x10, |
1253 | .sysc_flags = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE | | 1254 | .sysc_flags = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE | |
1254 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | | 1255 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | |
1255 | SYSC_HAS_AUTOIDLE), | 1256 | SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS), |
1256 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | 1257 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), |
1257 | .sysc_fields = &omap_hwmod_sysc_type1, | 1258 | .sysc_fields = &omap_hwmod_sysc_type1, |
1258 | }; | 1259 | }; |
@@ -1299,7 +1300,7 @@ static struct omap_hwmod_class_sysconfig uart_sysc = { | |||
1299 | .syss_offs = 0x58, | 1300 | .syss_offs = 0x58, |
1300 | .sysc_flags = (SYSC_HAS_SIDLEMODE | | 1301 | .sysc_flags = (SYSC_HAS_SIDLEMODE | |
1301 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | | 1302 | SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | |
1302 | SYSC_HAS_AUTOIDLE), | 1303 | SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS), |
1303 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | 1304 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), |
1304 | .sysc_fields = &omap_hwmod_sysc_type1, | 1305 | .sysc_fields = &omap_hwmod_sysc_type1, |
1305 | }; | 1306 | }; |
@@ -2105,7 +2106,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_gpio_sysc = { | |||
2105 | .sysc_offs = 0x0010, | 2106 | .sysc_offs = 0x0010, |
2106 | .syss_offs = 0x0014, | 2107 | .syss_offs = 0x0014, |
2107 | .sysc_flags = (SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE | | 2108 | .sysc_flags = (SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE | |
2108 | SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE), | 2109 | SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE | |
2110 | SYSS_HAS_RESET_STATUS), | ||
2109 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | 2111 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), |
2110 | .sysc_fields = &omap_hwmod_sysc_type1, | 2112 | .sysc_fields = &omap_hwmod_sysc_type1, |
2111 | }; | 2113 | }; |
@@ -2359,7 +2361,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_dma_sysc = { | |||
2359 | .syss_offs = 0x0028, | 2361 | .syss_offs = 0x0028, |
2360 | .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET | | 2362 | .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET | |
2361 | SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY | | 2363 | SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY | |
2362 | SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE), | 2364 | SYSC_HAS_EMUFREE | SYSC_HAS_AUTOIDLE | |
2365 | SYSS_HAS_RESET_STATUS), | ||
2363 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | | 2366 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | |
2364 | MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), | 2367 | MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), |
2365 | .sysc_fields = &omap_hwmod_sysc_type1, | 2368 | .sysc_fields = &omap_hwmod_sysc_type1, |