diff options
| author | Paul Walmsley <paul@pwsan.com> | 2009-01-28 14:18:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:37 -0500 |
| commit | da0747d4faf55320f0f6cbcd8525e2a8e4619925 (patch) | |
| tree | b3fce6c33df8f555d9adbe00d679e48f9f4a81c0 | |
| parent | 027d8ded5d1c142eb120caff7a395c0637467ac9 (diff) | |
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-omap2/cm-regbits-24xx.h | 80 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/cm-regbits-34xx.h | 96 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/prcm-common.h | 198 |
3 files changed, 257 insertions, 117 deletions
diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h index 1098ecfab861..297a2fe634ea 100644 --- a/arch/arm/mach-omap2/cm-regbits-24xx.h +++ b/arch/arm/mach-omap2/cm-regbits-24xx.h | |||
| @@ -110,35 +110,56 @@ | |||
| 110 | #define OMAP24XX_EN_DES (1 << 0) | 110 | #define OMAP24XX_EN_DES (1 << 0) |
| 111 | 111 | ||
| 112 | /* CM_IDLEST1_CORE specific bits */ | 112 | /* CM_IDLEST1_CORE specific bits */ |
| 113 | #define OMAP24XX_ST_MAILBOXES (1 << 30) | 113 | #define OMAP24XX_ST_MAILBOXES_SHIFT 30 |
| 114 | #define OMAP24XX_ST_WDT4 (1 << 29) | 114 | #define OMAP24XX_ST_MAILBOXES_MASK (1 << 30) |
| 115 | #define OMAP2420_ST_WDT3 (1 << 28) | 115 | #define OMAP24XX_ST_WDT4_SHIFT 29 |
| 116 | #define OMAP24XX_ST_MSPRO (1 << 27) | 116 | #define OMAP24XX_ST_WDT4_MASK (1 << 29) |
| 117 | #define OMAP24XX_ST_FAC (1 << 25) | 117 | #define OMAP2420_ST_WDT3_SHIFT 28 |
| 118 | #define OMAP2420_ST_EAC (1 << 24) | 118 | #define OMAP2420_ST_WDT3_MASK (1 << 28) |
| 119 | #define OMAP24XX_ST_HDQ (1 << 23) | 119 | #define OMAP24XX_ST_MSPRO_SHIFT 27 |
| 120 | #define OMAP24XX_ST_I2C2 (1 << 20) | 120 | #define OMAP24XX_ST_MSPRO_MASK (1 << 27) |
| 121 | #define OMAP24XX_ST_I2C1 (1 << 19) | 121 | #define OMAP24XX_ST_FAC_SHIFT 25 |
| 122 | #define OMAP24XX_ST_MCBSP2 (1 << 16) | 122 | #define OMAP24XX_ST_FAC_MASK (1 << 25) |
| 123 | #define OMAP24XX_ST_MCBSP1 (1 << 15) | 123 | #define OMAP2420_ST_EAC_SHIFT 24 |
| 124 | #define OMAP24XX_ST_DSS (1 << 0) | 124 | #define OMAP2420_ST_EAC_MASK (1 << 24) |
| 125 | #define OMAP24XX_ST_HDQ_SHIFT 23 | ||
| 126 | #define OMAP24XX_ST_HDQ_MASK (1 << 23) | ||
| 127 | #define OMAP2420_ST_I2C2_SHIFT 20 | ||
| 128 | #define OMAP2420_ST_I2C2_MASK (1 << 20) | ||
| 129 | #define OMAP2420_ST_I2C1_SHIFT 19 | ||
| 130 | #define OMAP2420_ST_I2C1_MASK (1 << 19) | ||
| 131 | #define OMAP24XX_ST_MCBSP2_SHIFT 16 | ||
| 132 | #define OMAP24XX_ST_MCBSP2_MASK (1 << 16) | ||
| 133 | #define OMAP24XX_ST_MCBSP1_SHIFT 15 | ||
| 134 | #define OMAP24XX_ST_MCBSP1_MASK (1 << 15) | ||
| 135 | #define OMAP24XX_ST_DSS_SHIFT 0 | ||
| 136 | #define OMAP24XX_ST_DSS_MASK (1 << 0) | ||
| 125 | 137 | ||
| 126 | /* CM_IDLEST2_CORE */ | 138 | /* CM_IDLEST2_CORE */ |
| 127 | #define OMAP2430_ST_MCBSP5 (1 << 5) | 139 | #define OMAP2430_ST_MCBSP5_SHIFT 5 |
| 128 | #define OMAP2430_ST_MCBSP4 (1 << 4) | 140 | #define OMAP2430_ST_MCBSP5_MASK (1 << 5) |
| 129 | #define OMAP2430_ST_MCBSP3 (1 << 3) | 141 | #define OMAP2430_ST_MCBSP4_SHIFT 4 |
| 130 | #define OMAP24XX_ST_SSI (1 << 1) | 142 | #define OMAP2430_ST_MCBSP4_MASK (1 << 4) |
| 143 | #define OMAP2430_ST_MCBSP3_SHIFT 3 | ||
| 144 | #define OMAP2430_ST_MCBSP3_MASK (1 << 3) | ||
| 145 | #define OMAP24XX_ST_SSI_SHIFT 1 | ||
| 146 | #define OMAP24XX_ST_SSI_MASK (1 << 1) | ||
| 131 | 147 | ||
| 132 | /* CM_IDLEST3_CORE */ | 148 | /* CM_IDLEST3_CORE */ |
| 133 | /* 2430 only */ | 149 | /* 2430 only */ |
| 134 | #define OMAP2430_ST_SDRC (1 << 2) | 150 | #define OMAP2430_ST_SDRC_MASK (1 << 2) |
| 135 | 151 | ||
| 136 | /* CM_IDLEST4_CORE */ | 152 | /* CM_IDLEST4_CORE */ |
| 137 | #define OMAP24XX_ST_PKA (1 << 4) | 153 | #define OMAP24XX_ST_PKA_SHIFT 4 |
| 138 | #define OMAP24XX_ST_AES (1 << 3) | 154 | #define OMAP24XX_ST_PKA_MASK (1 << 4) |
| 139 | #define OMAP24XX_ST_RNG (1 << 2) | 155 | #define OMAP24XX_ST_AES_SHIFT 3 |
| 140 | #define OMAP24XX_ST_SHA (1 << 1) | 156 | #define OMAP24XX_ST_AES_MASK (1 << 3) |
| 141 | #define OMAP24XX_ST_DES (1 << 0) | 157 | #define OMAP24XX_ST_RNG_SHIFT 2 |
| 158 | #define OMAP24XX_ST_RNG_MASK (1 << 2) | ||
| 159 | #define OMAP24XX_ST_SHA_SHIFT 1 | ||
| 160 | #define OMAP24XX_ST_SHA_MASK (1 << 1) | ||
| 161 | #define OMAP24XX_ST_DES_SHIFT 0 | ||
| 162 | #define OMAP24XX_ST_DES_MASK (1 << 0) | ||
| 142 | 163 | ||
| 143 | /* CM_AUTOIDLE1_CORE */ | 164 | /* CM_AUTOIDLE1_CORE */ |
| 144 | #define OMAP24XX_AUTO_CAM (1 << 31) | 165 | #define OMAP24XX_AUTO_CAM (1 << 31) |
| @@ -275,11 +296,16 @@ | |||
| 275 | #define OMAP24XX_EN_32KSYNC (1 << 1) | 296 | #define OMAP24XX_EN_32KSYNC (1 << 1) |
| 276 | 297 | ||
| 277 | /* CM_IDLEST_WKUP specific bits */ | 298 | /* CM_IDLEST_WKUP specific bits */ |
| 278 | #define OMAP2430_ST_ICR (1 << 6) | 299 | #define OMAP2430_ST_ICR_SHIFT 6 |
| 279 | #define OMAP24XX_ST_OMAPCTRL (1 << 5) | 300 | #define OMAP2430_ST_ICR_MASK (1 << 6) |
| 280 | #define OMAP24XX_ST_WDT1 (1 << 4) | 301 | #define OMAP24XX_ST_OMAPCTRL_SHIFT 5 |
| 281 | #define OMAP24XX_ST_MPU_WDT (1 << 3) | 302 | #define OMAP24XX_ST_OMAPCTRL_MASK (1 << 5) |
| 282 | #define OMAP24XX_ST_32KSYNC (1 << 1) | 303 | #define OMAP24XX_ST_WDT1_SHIFT 4 |
| 304 | #define OMAP24XX_ST_WDT1_MASK (1 << 4) | ||
| 305 | #define OMAP24XX_ST_MPU_WDT_SHIFT 3 | ||
| 306 | #define OMAP24XX_ST_MPU_WDT_MASK (1 << 3) | ||
| 307 | #define OMAP24XX_ST_32KSYNC_SHIFT 1 | ||
| 308 | #define OMAP24XX_ST_32KSYNC_MASK (1 << 1) | ||
| 283 | 309 | ||
| 284 | /* CM_AUTOIDLE_WKUP */ | 310 | /* CM_AUTOIDLE_WKUP */ |
| 285 | #define OMAP24XX_AUTO_OMAPCTRL (1 << 5) | 311 | #define OMAP24XX_AUTO_OMAPCTRL (1 << 5) |
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h index 844356cc75bd..6f3f5a36aae6 100644 --- a/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/arch/arm/mach-omap2/cm-regbits-34xx.h | |||
| @@ -183,29 +183,52 @@ | |||
| 183 | #define OMAP3430ES2_EN_CPEFUSE_MASK (1 << 0) | 183 | #define OMAP3430ES2_EN_CPEFUSE_MASK (1 << 0) |
| 184 | 184 | ||
| 185 | /* CM_IDLEST1_CORE specific bits */ | 185 | /* CM_IDLEST1_CORE specific bits */ |
| 186 | #define OMAP3430_ST_ICR (1 << 29) | 186 | #define OMAP3430ES2_ST_MMC3_SHIFT 30 |
| 187 | #define OMAP3430_ST_AES2 (1 << 28) | 187 | #define OMAP3430ES2_ST_MMC3_MASK (1 << 30) |
| 188 | #define OMAP3430_ST_SHA12 (1 << 27) | 188 | #define OMAP3430_ST_ICR_SHIFT 29 |
| 189 | #define OMAP3430_ST_DES2 (1 << 26) | 189 | #define OMAP3430_ST_ICR_MASK (1 << 29) |
| 190 | #define OMAP3430_ST_MSPRO (1 << 23) | 190 | #define OMAP3430_ST_AES2_SHIFT 28 |
| 191 | #define OMAP3430_ST_HDQ (1 << 22) | 191 | #define OMAP3430_ST_AES2_MASK (1 << 28) |
| 192 | #define OMAP3430ES1_ST_FAC (1 << 8) | 192 | #define OMAP3430_ST_SHA12_SHIFT 27 |
| 193 | #define OMAP3430ES1_ST_MAILBOXES (1 << 7) | 193 | #define OMAP3430_ST_SHA12_MASK (1 << 27) |
| 194 | #define OMAP3430_ST_OMAPCTRL (1 << 6) | 194 | #define OMAP3430_ST_DES2_SHIFT 26 |
| 195 | #define OMAP3430_ST_SDMA (1 << 2) | 195 | #define OMAP3430_ST_DES2_MASK (1 << 26) |
| 196 | #define OMAP3430_ST_SDRC (1 << 1) | 196 | #define OMAP3430_ST_MSPRO_SHIFT 23 |
| 197 | #define OMAP3430_ST_SSI (1 << 0) | 197 | #define OMAP3430_ST_MSPRO_MASK (1 << 23) |
| 198 | #define OMAP3430_ST_HDQ_SHIFT 22 | ||
| 199 | #define OMAP3430_ST_HDQ_MASK (1 << 22) | ||
| 200 | #define OMAP3430ES1_ST_FAC_SHIFT 8 | ||
| 201 | #define OMAP3430ES1_ST_FAC_MASK (1 << 8) | ||
| 202 | #define OMAP3430ES2_ST_SSI_IDLE_SHIFT 8 | ||
| 203 | #define OMAP3430ES2_ST_SSI_IDLE_MASK (1 << 8) | ||
| 204 | #define OMAP3430_ST_MAILBOXES_SHIFT 7 | ||
| 205 | #define OMAP3430_ST_MAILBOXES_MASK (1 << 7) | ||
| 206 | #define OMAP3430_ST_OMAPCTRL_SHIFT 6 | ||
| 207 | #define OMAP3430_ST_OMAPCTRL_MASK (1 << 6) | ||
| 208 | #define OMAP3430_ST_SDMA_SHIFT 2 | ||
| 209 | #define OMAP3430_ST_SDMA_MASK (1 << 2) | ||
| 210 | #define OMAP3430_ST_SDRC_SHIFT 1 | ||
| 211 | #define OMAP3430_ST_SDRC_MASK (1 << 1) | ||
| 212 | #define OMAP3430_ST_SSI_STDBY_SHIFT 0 | ||
| 213 | #define OMAP3430_ST_SSI_STDBY_MASK (1 << 0) | ||
| 198 | 214 | ||
| 199 | /* CM_IDLEST2_CORE */ | 215 | /* CM_IDLEST2_CORE */ |
| 200 | #define OMAP3430_ST_PKA (1 << 4) | 216 | #define OMAP3430_ST_PKA_SHIFT 4 |
| 201 | #define OMAP3430_ST_AES1 (1 << 3) | 217 | #define OMAP3430_ST_PKA_MASK (1 << 4) |
| 202 | #define OMAP3430_ST_RNG (1 << 2) | 218 | #define OMAP3430_ST_AES1_SHIFT 3 |
| 203 | #define OMAP3430_ST_SHA11 (1 << 1) | 219 | #define OMAP3430_ST_AES1_MASK (1 << 3) |
| 204 | #define OMAP3430_ST_DES1 (1 << 0) | 220 | #define OMAP3430_ST_RNG_SHIFT 2 |
| 221 | #define OMAP3430_ST_RNG_MASK (1 << 2) | ||
| 222 | #define OMAP3430_ST_SHA11_SHIFT 1 | ||
| 223 | #define OMAP3430_ST_SHA11_MASK (1 << 1) | ||
| 224 | #define OMAP3430_ST_DES1_SHIFT 0 | ||
| 225 | #define OMAP3430_ST_DES1_MASK (1 << 0) | ||
| 205 | 226 | ||
| 206 | /* CM_IDLEST3_CORE */ | 227 | /* CM_IDLEST3_CORE */ |
| 207 | #define OMAP3430ES2_ST_USBTLL_SHIFT 2 | 228 | #define OMAP3430ES2_ST_USBTLL_SHIFT 2 |
| 208 | #define OMAP3430ES2_ST_USBTLL_MASK (1 << 2) | 229 | #define OMAP3430ES2_ST_USBTLL_MASK (1 << 2) |
| 230 | #define OMAP3430ES2_ST_CPEFUSE_SHIFT 0 | ||
| 231 | #define OMAP3430ES2_ST_CPEFUSE_MASK (1 << 0) | ||
| 209 | 232 | ||
| 210 | /* CM_AUTOIDLE1_CORE */ | 233 | /* CM_AUTOIDLE1_CORE */ |
| 211 | #define OMAP3430ES2_AUTO_MMC3 (1 << 30) | 234 | #define OMAP3430ES2_AUTO_MMC3 (1 << 30) |
| @@ -360,6 +383,7 @@ | |||
| 360 | 383 | ||
| 361 | /* CM_FCLKEN_WKUP specific bits */ | 384 | /* CM_FCLKEN_WKUP specific bits */ |
| 362 | #define OMAP3430ES2_EN_USIMOCP_SHIFT 9 | 385 | #define OMAP3430ES2_EN_USIMOCP_SHIFT 9 |
| 386 | #define OMAP3430ES2_EN_USIMOCP_MASK (1 << 9) | ||
| 363 | 387 | ||
| 364 | /* CM_ICLKEN_WKUP specific bits */ | 388 | /* CM_ICLKEN_WKUP specific bits */ |
| 365 | #define OMAP3430_EN_WDT1 (1 << 4) | 389 | #define OMAP3430_EN_WDT1 (1 << 4) |
| @@ -368,11 +392,18 @@ | |||
| 368 | #define OMAP3430_EN_32KSYNC_SHIFT 2 | 392 | #define OMAP3430_EN_32KSYNC_SHIFT 2 |
| 369 | 393 | ||
| 370 | /* CM_IDLEST_WKUP specific bits */ | 394 | /* CM_IDLEST_WKUP specific bits */ |
| 371 | #define OMAP3430_ST_WDT2 (1 << 5) | 395 | #define OMAP3430ES2_ST_USIMOCP_SHIFT 9 |
| 372 | #define OMAP3430_ST_WDT1 (1 << 4) | 396 | #define OMAP3430ES2_ST_USIMOCP_MASK (1 << 9) |
| 373 | #define OMAP3430_ST_32KSYNC (1 << 2) | 397 | #define OMAP3430_ST_WDT2_SHIFT 5 |
| 398 | #define OMAP3430_ST_WDT2_MASK (1 << 5) | ||
| 399 | #define OMAP3430_ST_WDT1_SHIFT 4 | ||
| 400 | #define OMAP3430_ST_WDT1_MASK (1 << 4) | ||
| 401 | #define OMAP3430_ST_32KSYNC_SHIFT 2 | ||
| 402 | #define OMAP3430_ST_32KSYNC_MASK (1 << 2) | ||
| 374 | 403 | ||
| 375 | /* CM_AUTOIDLE_WKUP */ | 404 | /* CM_AUTOIDLE_WKUP */ |
| 405 | #define OMAP3430ES2_AUTO_USIMOCP (1 << 9) | ||
| 406 | #define OMAP3430ES2_AUTO_USIMOCP_SHIFT 9 | ||
| 376 | #define OMAP3430_AUTO_WDT2 (1 << 5) | 407 | #define OMAP3430_AUTO_WDT2 (1 << 5) |
| 377 | #define OMAP3430_AUTO_WDT2_SHIFT 5 | 408 | #define OMAP3430_AUTO_WDT2_SHIFT 5 |
| 378 | #define OMAP3430_AUTO_WDT1 (1 << 4) | 409 | #define OMAP3430_AUTO_WDT1 (1 << 4) |
| @@ -437,6 +468,8 @@ | |||
| 437 | #define OMAP3430_ST_CORE_CLK_MASK (1 << 0) | 468 | #define OMAP3430_ST_CORE_CLK_MASK (1 << 0) |
| 438 | 469 | ||
| 439 | /* CM_IDLEST2_CKGEN */ | 470 | /* CM_IDLEST2_CKGEN */ |
| 471 | #define OMAP3430ES2_ST_USIM_CLK_SHIFT 2 | ||
| 472 | #define OMAP3430ES2_ST_USIM_CLK_MASK (1 << 2) | ||
| 440 | #define OMAP3430ES2_ST_120M_CLK_SHIFT 1 | 473 | #define OMAP3430ES2_ST_120M_CLK_SHIFT 1 |
| 441 | #define OMAP3430ES2_ST_120M_CLK_MASK (1 << 1) | 474 | #define OMAP3430ES2_ST_120M_CLK_MASK (1 << 1) |
| 442 | #define OMAP3430ES2_ST_PERIPH2_CLK_SHIFT 0 | 475 | #define OMAP3430ES2_ST_PERIPH2_CLK_SHIFT 0 |
| @@ -508,7 +541,12 @@ | |||
| 508 | #define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0 | 541 | #define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0 |
| 509 | 542 | ||
| 510 | /* CM_IDLEST_DSS */ | 543 | /* CM_IDLEST_DSS */ |
| 511 | #define OMAP3430_ST_DSS (1 << 0) | 544 | #define OMAP3430ES2_ST_DSS_IDLE_SHIFT 1 |
| 545 | #define OMAP3430ES2_ST_DSS_IDLE_MASK (1 << 1) | ||
| 546 | #define OMAP3430ES2_ST_DSS_STDBY_SHIFT 0 | ||
| 547 | #define OMAP3430ES2_ST_DSS_STDBY_MASK (1 << 0) | ||
| 548 | #define OMAP3430ES1_ST_DSS_SHIFT 0 | ||
| 549 | #define OMAP3430ES1_ST_DSS_MASK (1 << 0) | ||
| 512 | 550 | ||
| 513 | /* CM_AUTOIDLE_DSS */ | 551 | /* CM_AUTOIDLE_DSS */ |
| 514 | #define OMAP3430_AUTO_DSS (1 << 0) | 552 | #define OMAP3430_AUTO_DSS (1 << 0) |
| @@ -562,10 +600,14 @@ | |||
| 562 | /* CM_ICLKEN_PER specific bits */ | 600 | /* CM_ICLKEN_PER specific bits */ |
| 563 | 601 | ||
| 564 | /* CM_IDLEST_PER */ | 602 | /* CM_IDLEST_PER */ |
| 565 | #define OMAP3430_ST_WDT3 (1 << 12) | 603 | #define OMAP3430_ST_WDT3_SHIFT 12 |
| 566 | #define OMAP3430_ST_MCBSP4 (1 << 2) | 604 | #define OMAP3430_ST_WDT3_MASK (1 << 12) |
| 567 | #define OMAP3430_ST_MCBSP3 (1 << 1) | 605 | #define OMAP3430_ST_MCBSP4_SHIFT 2 |
| 568 | #define OMAP3430_ST_MCBSP2 (1 << 0) | 606 | #define OMAP3430_ST_MCBSP4_MASK (1 << 2) |
| 607 | #define OMAP3430_ST_MCBSP3_SHIFT 1 | ||
| 608 | #define OMAP3430_ST_MCBSP3_MASK (1 << 1) | ||
| 609 | #define OMAP3430_ST_MCBSP2_SHIFT 0 | ||
| 610 | #define OMAP3430_ST_MCBSP2_MASK (1 << 0) | ||
| 569 | 611 | ||
| 570 | /* CM_AUTOIDLE_PER */ | 612 | /* CM_AUTOIDLE_PER */ |
| 571 | #define OMAP3430_AUTO_GPIO6 (1 << 17) | 613 | #define OMAP3430_AUTO_GPIO6 (1 << 17) |
| @@ -693,6 +735,10 @@ | |||
| 693 | #define OMAP3430ES2_EN_USBHOST_MASK (1 << 0) | 735 | #define OMAP3430ES2_EN_USBHOST_MASK (1 << 0) |
| 694 | 736 | ||
| 695 | /* CM_IDLEST_USBHOST */ | 737 | /* CM_IDLEST_USBHOST */ |
| 738 | #define OMAP3430ES2_ST_USBHOST_IDLE_SHIFT 1 | ||
| 739 | #define OMAP3430ES2_ST_USBHOST_IDLE_MASK (1 << 1) | ||
| 740 | #define OMAP3430ES2_ST_USBHOST_STDBY_SHIFT 0 | ||
| 741 | #define OMAP3430ES2_ST_USBHOST_STDBY_MASK (1 << 0) | ||
| 696 | 742 | ||
| 697 | /* CM_AUTOIDLE_USBHOST */ | 743 | /* CM_AUTOIDLE_USBHOST */ |
| 698 | #define OMAP3430ES2_AUTO_USBHOST_SHIFT 0 | 744 | #define OMAP3430ES2_AUTO_USBHOST_SHIFT 0 |
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index 4a32822ff3fc..812d50ee495d 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h | |||
| @@ -113,33 +113,58 @@ | |||
| 113 | #define OMAP2430_EN_USBHS (1 << 6) | 113 | #define OMAP2430_EN_USBHS (1 << 6) |
| 114 | 114 | ||
| 115 | /* CM_IDLEST1_CORE, PM_WKST1_CORE shared bits */ | 115 | /* CM_IDLEST1_CORE, PM_WKST1_CORE shared bits */ |
| 116 | #define OMAP2420_ST_MMC (1 << 26) | 116 | #define OMAP2420_ST_MMC_SHIFT 26 |
| 117 | #define OMAP24XX_ST_UART2 (1 << 22) | 117 | #define OMAP2420_ST_MMC_MASK (1 << 26) |
| 118 | #define OMAP24XX_ST_UART1 (1 << 21) | 118 | #define OMAP24XX_ST_UART2_SHIFT 22 |
| 119 | #define OMAP24XX_ST_MCSPI2 (1 << 18) | 119 | #define OMAP24XX_ST_UART2_MASK (1 << 22) |
| 120 | #define OMAP24XX_ST_MCSPI1 (1 << 17) | 120 | #define OMAP24XX_ST_UART1_SHIFT 21 |
| 121 | #define OMAP24XX_ST_GPT12 (1 << 14) | 121 | #define OMAP24XX_ST_UART1_MASK (1 << 21) |
| 122 | #define OMAP24XX_ST_GPT11 (1 << 13) | 122 | #define OMAP24XX_ST_MCSPI2_SHIFT 18 |
| 123 | #define OMAP24XX_ST_GPT10 (1 << 12) | 123 | #define OMAP24XX_ST_MCSPI2_MASK (1 << 18) |
| 124 | #define OMAP24XX_ST_GPT9 (1 << 11) | 124 | #define OMAP24XX_ST_MCSPI1_SHIFT 17 |
| 125 | #define OMAP24XX_ST_GPT8 (1 << 10) | 125 | #define OMAP24XX_ST_MCSPI1_MASK (1 << 17) |
| 126 | #define OMAP24XX_ST_GPT7 (1 << 9) | 126 | #define OMAP24XX_ST_GPT12_SHIFT 14 |
| 127 | #define OMAP24XX_ST_GPT6 (1 << 8) | 127 | #define OMAP24XX_ST_GPT12_MASK (1 << 14) |
| 128 | #define OMAP24XX_ST_GPT5 (1 << 7) | 128 | #define OMAP24XX_ST_GPT11_SHIFT 13 |
| 129 | #define OMAP24XX_ST_GPT4 (1 << 6) | 129 | #define OMAP24XX_ST_GPT11_MASK (1 << 13) |
| 130 | #define OMAP24XX_ST_GPT3 (1 << 5) | 130 | #define OMAP24XX_ST_GPT10_SHIFT 12 |
| 131 | #define OMAP24XX_ST_GPT2 (1 << 4) | 131 | #define OMAP24XX_ST_GPT10_MASK (1 << 12) |
| 132 | #define OMAP2420_ST_VLYNQ (1 << 3) | 132 | #define OMAP24XX_ST_GPT9_SHIFT 11 |
| 133 | #define OMAP24XX_ST_GPT9_MASK (1 << 11) | ||
| 134 | #define OMAP24XX_ST_GPT8_SHIFT 10 | ||
| 135 | #define OMAP24XX_ST_GPT8_MASK (1 << 10) | ||
| 136 | #define OMAP24XX_ST_GPT7_SHIFT 9 | ||
| 137 | #define OMAP24XX_ST_GPT7_MASK (1 << 9) | ||
| 138 | #define OMAP24XX_ST_GPT6_SHIFT 8 | ||
| 139 | #define OMAP24XX_ST_GPT6_MASK (1 << 8) | ||
| 140 | #define OMAP24XX_ST_GPT5_SHIFT 7 | ||
| 141 | #define OMAP24XX_ST_GPT5_MASK (1 << 7) | ||
| 142 | #define OMAP24XX_ST_GPT4_SHIFT 6 | ||
| 143 | #define OMAP24XX_ST_GPT4_MASK (1 << 6) | ||
| 144 | #define OMAP24XX_ST_GPT3_SHIFT 5 | ||
| 145 | #define OMAP24XX_ST_GPT3_MASK (1 << 5) | ||
| 146 | #define OMAP24XX_ST_GPT2_SHIFT 4 | ||
| 147 | #define OMAP24XX_ST_GPT2_MASK (1 << 4) | ||
| 148 | #define OMAP2420_ST_VLYNQ_SHIFT 3 | ||
| 149 | #define OMAP2420_ST_VLYNQ_MASK (1 << 3) | ||
| 133 | 150 | ||
| 134 | /* CM_IDLEST2_CORE, PM_WKST2_CORE shared bits */ | 151 | /* CM_IDLEST2_CORE, PM_WKST2_CORE shared bits */ |
| 135 | #define OMAP2430_ST_MDM_INTC (1 << 11) | 152 | #define OMAP2430_ST_MDM_INTC_SHIFT 11 |
| 136 | #define OMAP2430_ST_GPIO5 (1 << 10) | 153 | #define OMAP2430_ST_MDM_INTC_MASK (1 << 11) |
| 137 | #define OMAP2430_ST_MCSPI3 (1 << 9) | 154 | #define OMAP2430_ST_GPIO5_SHIFT 10 |
| 138 | #define OMAP2430_ST_MMCHS2 (1 << 8) | 155 | #define OMAP2430_ST_GPIO5_MASK (1 << 10) |
| 139 | #define OMAP2430_ST_MMCHS1 (1 << 7) | 156 | #define OMAP2430_ST_MCSPI3_SHIFT 9 |
| 140 | #define OMAP2430_ST_USBHS (1 << 6) | 157 | #define OMAP2430_ST_MCSPI3_MASK (1 << 9) |
| 141 | #define OMAP24XX_ST_UART3 (1 << 2) | 158 | #define OMAP2430_ST_MMCHS2_SHIFT 8 |
| 142 | #define OMAP24XX_ST_USB (1 << 0) | 159 | #define OMAP2430_ST_MMCHS2_MASK (1 << 8) |
| 160 | #define OMAP2430_ST_MMCHS1_SHIFT 7 | ||
| 161 | #define OMAP2430_ST_MMCHS1_MASK (1 << 7) | ||
| 162 | #define OMAP2430_ST_USBHS_SHIFT 6 | ||
| 163 | #define OMAP2430_ST_USBHS_MASK (1 << 6) | ||
| 164 | #define OMAP24XX_ST_UART3_SHIFT 2 | ||
| 165 | #define OMAP24XX_ST_UART3_MASK (1 << 2) | ||
| 166 | #define OMAP24XX_ST_USB_SHIFT 0 | ||
| 167 | #define OMAP24XX_ST_USB_MASK (1 << 0) | ||
| 143 | 168 | ||
| 144 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ | 169 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ |
| 145 | #define OMAP24XX_EN_GPIOS_SHIFT 2 | 170 | #define OMAP24XX_EN_GPIOS_SHIFT 2 |
| @@ -148,11 +173,13 @@ | |||
| 148 | #define OMAP24XX_EN_GPT1 (1 << 0) | 173 | #define OMAP24XX_EN_GPT1 (1 << 0) |
| 149 | 174 | ||
| 150 | /* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */ | 175 | /* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */ |
| 151 | #define OMAP24XX_ST_GPIOS (1 << 2) | 176 | #define OMAP24XX_ST_GPIOS_SHIFT (1 << 2) |
| 152 | #define OMAP24XX_ST_GPT1 (1 << 0) | 177 | #define OMAP24XX_ST_GPIOS_MASK 2 |
| 178 | #define OMAP24XX_ST_GPT1_SHIFT (1 << 0) | ||
| 179 | #define OMAP24XX_ST_GPT1_MASK 0 | ||
| 153 | 180 | ||
| 154 | /* CM_IDLEST_MDM and PM_WKST_MDM shared bits */ | 181 | /* CM_IDLEST_MDM and PM_WKST_MDM shared bits */ |
| 155 | #define OMAP2430_ST_MDM (1 << 0) | 182 | #define OMAP2430_ST_MDM_SHIFT (1 << 0) |
| 156 | 183 | ||
| 157 | 184 | ||
| 158 | /* 3430 register bits shared between CM & PRM registers */ | 185 | /* 3430 register bits shared between CM & PRM registers */ |
| @@ -205,24 +232,46 @@ | |||
| 205 | #define OMAP3430_EN_HSOTGUSB_SHIFT 4 | 232 | #define OMAP3430_EN_HSOTGUSB_SHIFT 4 |
| 206 | 233 | ||
| 207 | /* PM_WKST1_CORE, CM_IDLEST1_CORE shared bits */ | 234 | /* PM_WKST1_CORE, CM_IDLEST1_CORE shared bits */ |
| 208 | #define OMAP3430_ST_MMC2 (1 << 25) | 235 | #define OMAP3430_ST_MMC2_SHIFT 25 |
| 209 | #define OMAP3430_ST_MMC1 (1 << 24) | 236 | #define OMAP3430_ST_MMC2_MASK (1 << 25) |
| 210 | #define OMAP3430_ST_MCSPI4 (1 << 21) | 237 | #define OMAP3430_ST_MMC1_SHIFT 24 |
| 211 | #define OMAP3430_ST_MCSPI3 (1 << 20) | 238 | #define OMAP3430_ST_MMC1_MASK (1 << 24) |
| 212 | #define OMAP3430_ST_MCSPI2 (1 << 19) | 239 | #define OMAP3430_ST_MCSPI4_SHIFT 21 |
| 213 | #define OMAP3430_ST_MCSPI1 (1 << 18) | 240 | #define OMAP3430_ST_MCSPI4_MASK (1 << 21) |
| 214 | #define OMAP3430_ST_I2C3 (1 << 17) | 241 | #define OMAP3430_ST_MCSPI3_SHIFT 20 |
| 215 | #define OMAP3430_ST_I2C2 (1 << 16) | 242 | #define OMAP3430_ST_MCSPI3_MASK (1 << 20) |
| 216 | #define OMAP3430_ST_I2C1 (1 << 15) | 243 | #define OMAP3430_ST_MCSPI2_SHIFT 19 |
| 217 | #define OMAP3430_ST_UART2 (1 << 14) | 244 | #define OMAP3430_ST_MCSPI2_MASK (1 << 19) |
| 218 | #define OMAP3430_ST_UART1 (1 << 13) | 245 | #define OMAP3430_ST_MCSPI1_SHIFT 18 |
| 219 | #define OMAP3430_ST_GPT11 (1 << 12) | 246 | #define OMAP3430_ST_MCSPI1_MASK (1 << 18) |
| 220 | #define OMAP3430_ST_GPT10 (1 << 11) | 247 | #define OMAP3430_ST_I2C3_SHIFT 17 |
| 221 | #define OMAP3430_ST_MCBSP5 (1 << 10) | 248 | #define OMAP3430_ST_I2C3_MASK (1 << 17) |
| 222 | #define OMAP3430_ST_MCBSP1 (1 << 9) | 249 | #define OMAP3430_ST_I2C2_SHIFT 16 |
| 223 | #define OMAP3430_ST_FSHOSTUSB (1 << 5) | 250 | #define OMAP3430_ST_I2C2_MASK (1 << 16) |
| 224 | #define OMAP3430_ST_HSOTGUSB (1 << 4) | 251 | #define OMAP3430_ST_I2C1_SHIFT 15 |
| 225 | #define OMAP3430_ST_D2D (1 << 3) | 252 | #define OMAP3430_ST_I2C1_MASK (1 << 15) |
| 253 | #define OMAP3430_ST_UART2_SHIFT 14 | ||
| 254 | #define OMAP3430_ST_UART2_MASK (1 << 14) | ||
| 255 | #define OMAP3430_ST_UART1_SHIFT 13 | ||
| 256 | #define OMAP3430_ST_UART1_MASK (1 << 13) | ||
| 257 | #define OMAP3430_ST_GPT11_SHIFT 12 | ||
| 258 | #define OMAP3430_ST_GPT11_MASK (1 << 12) | ||
| 259 | #define OMAP3430_ST_GPT10_SHIFT 11 | ||
| 260 | #define OMAP3430_ST_GPT10_MASK (1 << 11) | ||
| 261 | #define OMAP3430_ST_MCBSP5_SHIFT 10 | ||
| 262 | #define OMAP3430_ST_MCBSP5_MASK (1 << 10) | ||
| 263 | #define OMAP3430_ST_MCBSP1_SHIFT 9 | ||
| 264 | #define OMAP3430_ST_MCBSP1_MASK (1 << 9) | ||
| 265 | #define OMAP3430ES1_ST_FSHOSTUSB_SHIFT 5 | ||
| 266 | #define OMAP3430ES1_ST_FSHOSTUSB_MASK (1 << 5) | ||
| 267 | #define OMAP3430ES1_ST_HSOTGUSB_SHIFT 4 | ||
| 268 | #define OMAP3430ES1_ST_HSOTGUSB_MASK (1 << 4) | ||
| 269 | #define OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT 5 | ||
| 270 | #define OMAP3430ES2_ST_HSOTGUSB_IDLE_MASK (1 << 5) | ||
| 271 | #define OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT 4 | ||
| 272 | #define OMAP3430ES2_ST_HSOTGUSB_STDBY_MASK (1 << 4) | ||
| 273 | #define OMAP3430_ST_D2D_SHIFT 3 | ||
| 274 | #define OMAP3430_ST_D2D_MASK (1 << 3) | ||
| 226 | 275 | ||
| 227 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ | 276 | /* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ |
| 228 | #define OMAP3430_EN_GPIO1 (1 << 3) | 277 | #define OMAP3430_EN_GPIO1 (1 << 3) |
| @@ -241,11 +290,16 @@ | |||
| 241 | #define OMAP3430_EN_GPT12_SHIFT 1 | 290 | #define OMAP3430_EN_GPT12_SHIFT 1 |
| 242 | 291 | ||
| 243 | /* CM_IDLEST_WKUP, PM_WKST_WKUP shared bits */ | 292 | /* CM_IDLEST_WKUP, PM_WKST_WKUP shared bits */ |
| 244 | #define OMAP3430_ST_SR2 (1 << 7) | 293 | #define OMAP3430_ST_SR2_SHIFT 7 |
| 245 | #define OMAP3430_ST_SR1 (1 << 6) | 294 | #define OMAP3430_ST_SR2_MASK (1 << 7) |
| 246 | #define OMAP3430_ST_GPIO1 (1 << 3) | 295 | #define OMAP3430_ST_SR1_SHIFT 6 |
| 247 | #define OMAP3430_ST_GPT12 (1 << 1) | 296 | #define OMAP3430_ST_SR1_MASK (1 << 6) |
| 248 | #define OMAP3430_ST_GPT1 (1 << 0) | 297 | #define OMAP3430_ST_GPIO1_SHIFT 3 |
| 298 | #define OMAP3430_ST_GPIO1_MASK (1 << 3) | ||
| 299 | #define OMAP3430_ST_GPT12_SHIFT 1 | ||
| 300 | #define OMAP3430_ST_GPT12_MASK (1 << 1) | ||
| 301 | #define OMAP3430_ST_GPT1_SHIFT 0 | ||
| 302 | #define OMAP3430_ST_GPT1_MASK (1 << 0) | ||
| 249 | 303 | ||
| 250 | /* | 304 | /* |
| 251 | * CM_SLEEPDEP_GFX, CM_SLEEPDEP_DSS, CM_SLEEPDEP_CAM, | 305 | * CM_SLEEPDEP_GFX, CM_SLEEPDEP_DSS, CM_SLEEPDEP_CAM, |
| @@ -296,20 +350,34 @@ | |||
| 296 | #define OMAP3430_EN_MCBSP2_SHIFT 0 | 350 | #define OMAP3430_EN_MCBSP2_SHIFT 0 |
| 297 | 351 | ||
| 298 | /* CM_IDLEST_PER, PM_WKST_PER shared bits */ | 352 | /* CM_IDLEST_PER, PM_WKST_PER shared bits */ |
| 299 | #define OMAP3430_ST_GPIO6 (1 << 17) | 353 | #define OMAP3430_ST_GPIO6_SHIFT 17 |
| 300 | #define OMAP3430_ST_GPIO5 (1 << 16) | 354 | #define OMAP3430_ST_GPIO6_MASK (1 << 17) |
| 301 | #define OMAP3430_ST_GPIO4 (1 << 15) | 355 | #define OMAP3430_ST_GPIO5_SHIFT 16 |
| 302 | #define OMAP3430_ST_GPIO3 (1 << 14) | 356 | #define OMAP3430_ST_GPIO5_MASK (1 << 16) |
| 303 | #define OMAP3430_ST_GPIO2 (1 << 13) | 357 | #define OMAP3430_ST_GPIO4_SHIFT 15 |
| 304 | #define OMAP3430_ST_UART3 (1 << 11) | 358 | #define OMAP3430_ST_GPIO4_MASK (1 << 15) |
| 305 | #define OMAP3430_ST_GPT9 (1 << 10) | 359 | #define OMAP3430_ST_GPIO3_SHIFT 14 |
| 306 | #define OMAP3430_ST_GPT8 (1 << 9) | 360 | #define OMAP3430_ST_GPIO3_MASK (1 << 14) |
| 307 | #define OMAP3430_ST_GPT7 (1 << 8) | 361 | #define OMAP3430_ST_GPIO2_SHIFT 13 |
| 308 | #define OMAP3430_ST_GPT6 (1 << 7) | 362 | #define OMAP3430_ST_GPIO2_MASK (1 << 13) |
| 309 | #define OMAP3430_ST_GPT5 (1 << 6) | 363 | #define OMAP3430_ST_UART3_SHIFT 11 |
| 310 | #define OMAP3430_ST_GPT4 (1 << 5) | 364 | #define OMAP3430_ST_UART3_MASK (1 << 11) |
| 311 | #define OMAP3430_ST_GPT3 (1 << 4) | 365 | #define OMAP3430_ST_GPT9_SHIFT 10 |
| 312 | #define OMAP3430_ST_GPT2 (1 << 3) | 366 | #define OMAP3430_ST_GPT9_MASK (1 << 10) |
| 367 | #define OMAP3430_ST_GPT8_SHIFT 9 | ||
| 368 | #define OMAP3430_ST_GPT8_MASK (1 << 9) | ||
| 369 | #define OMAP3430_ST_GPT7_SHIFT 8 | ||
| 370 | #define OMAP3430_ST_GPT7_MASK (1 << 8) | ||
| 371 | #define OMAP3430_ST_GPT6_SHIFT 7 | ||
| 372 | #define OMAP3430_ST_GPT6_MASK (1 << 7) | ||
| 373 | #define OMAP3430_ST_GPT5_SHIFT 6 | ||
| 374 | #define OMAP3430_ST_GPT5_MASK (1 << 6) | ||
| 375 | #define OMAP3430_ST_GPT4_SHIFT 5 | ||
| 376 | #define OMAP3430_ST_GPT4_MASK (1 << 5) | ||
| 377 | #define OMAP3430_ST_GPT3_SHIFT 4 | ||
| 378 | #define OMAP3430_ST_GPT3_MASK (1 << 4) | ||
| 379 | #define OMAP3430_ST_GPT2_SHIFT 3 | ||
| 380 | #define OMAP3430_ST_GPT2_MASK (1 << 3) | ||
| 313 | 381 | ||
| 314 | /* CM_SLEEPDEP_PER, PM_WKDEP_IVA2, PM_WKDEP_MPU, PM_WKDEP_PER shared bits */ | 382 | /* CM_SLEEPDEP_PER, PM_WKDEP_IVA2, PM_WKDEP_MPU, PM_WKDEP_PER shared bits */ |
| 315 | #define OMAP3430_EN_CORE_SHIFT 0 | 383 | #define OMAP3430_EN_CORE_SHIFT 0 |