OMAP2+ PRCM: standardize PRCM macros
Subsystems (6)
Paul Walmsley
maintainercover OMAP2+ PRCM: standardize PRCM macros
Hello,
This series standardizes the OMAP2+ PRCM register macro names to end in _SHIFT for bitshift counts and _MASK for bitmasks. This is already the case for many of the macros, but others were unconverted; this series finally fixes those and their users in mainline.
These patches will cause Kevin some merge pain, which is regrettable, but there seems to be no good time to do this sort of thing.
This series should not result in any functional change.
Note that at this point, this series has been compile-tested only, not boot-tested - that will happen shortly. It's been compile-tested with n8x0_defconfig, omap3_beagle_defconfig, and omap_4430sdp_defconfig.
- Paul
---
Paul Walmsley (4):
OMAP2 PRCM: convert OMAP2 PRCM macros to the _SHIFT/_MASK suffixes OMAP3 PRCM: convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes OMAP2+ PRCM: convert remaining PRCM macros to the _SHIFT/_MASK suffixes
OMAP3: PM: PM_MPUGRPSEL writes should use GRPSEL macros, not EN macros
arch/arm/mach-omap2/clkt2xxx_apll.c | 4 arch/arm/mach-omap2/clock2420_data.c | 4 arch/arm/mach-omap2/clockdomain.c | 4 arch/arm/mach-omap2/cm-regbits-24xx.h | 236 ++++++++++----------- arch/arm/mach-omap2/cm-regbits-34xx.h | 222 ++++++++++---------- arch/arm/mach-omap2/cm.h | 5 arch/arm/mach-omap2/control.c | 7 - arch/arm/mach-omap2/pm24xx.c | 126 ++++++----- arch/arm/mach-omap2/pm34xx.c | 202 +++++++++--------- arch/arm/mach-omap2/powerdomain.c | 26 +- arch/arm/mach-omap2/prcm-common.h | 146 ++++++------- arch/arm/mach-omap2/prcm.c | 4 arch/arm/mach-omap2/prm-regbits-24xx.h | 120 +++++------ arch/arm/mach-omap2/prm-regbits-34xx.h | 360 ++++++++++++++++---------------- arch/arm/mach-omap2/prm.h | 18 +- 15 files changed, 749 insertions(+), 735 deletions(-)
Paul Walmsley
maintainerPATCH 1/4 OMAP2 PRCM: convert OMAP2 PRCM macros to the _SHIFT/_MASK suffixes
Fix all of the remaining OMAP2 PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places.
Signed-off-by Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
--- arch/arm/mach-omap2/clkt2xxx_apll.c | 4 - arch/arm/mach-omap2/clock2420_data.c | 4 - arch/arm/mach-omap2/clockdomain.c | 4 - arch/arm/mach-omap2/cm-regbits-24xx.h | 236 ++++++++++++++++---------------- arch/arm/mach-omap2/pm24xx.c | 107 +++++++-------- arch/arm/mach-omap2/prm-regbits-24xx.h | 120 ++++++++-------- 6 files changed, 238 insertions(+), 237 deletions(-)
arch/arm/mach-omap2/clkt2xxx_apll.c +2 -2
@@ -70,12 +70,12 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask)static int omap2_clk_apll96_enable (struct clk *clk) { -return omap2_clk_apll_enable (clk,OMAP24XX_ST_96M_APLL ); +return omap2_clk_apll_enable (clk,OMAP24XX_ST_96M_APLL_MASK ); }static int omap2_clk_apll54_enable (struct clk *clk) { -return omap2_clk_apll_enable (clk,OMAP24XX_ST_54M_APLL ); +return omap2_clk_apll_enable (clk,OMAP24XX_ST_54M_APLL_MASK ); }/* Stop APLL */
arch/arm/mach-omap2/clock2420_data.c +2 -2
@@ -177,7 +177,7 @@ static struct clk func_54m_ck = { .clkdm_name = "wkup_clkdm", .init = &omap2_init_clksel_parent, .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), - .clksel_mask = OMAP24XX_54M_SOURCE, + .clksel_mask = OMAP24XX_54M_SOURCE_MASK, .clksel = func_54m_clksel, .recalc = &omap2_clksel_recalc, };
@@ -223,7 +223,7 @@ static struct clk func_48m_ck = { .clkdm_name = "wkup_clkdm", .init = &omap2_init_clksel_parent, .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), - .clksel_mask = OMAP24XX_48M_SOURCE, + .clksel_mask = OMAP24XX_48M_SOURCE_MASK, .clksel = func_48m_clksel, .recalc = &omap2_clksel_recalc, .round_rate = &omap2_clksel_round_rate,
arch/arm/mach-omap2/clockdomain.c +2 -2
@@ -809,7 +809,7 @@ int omap2_clkdm_sleep(struct clockdomain *clkdm)if (cpu_is_omap24xx ()) { -cm_set_mod_reg_bits (OMAP24XX_FORCESTATE , +cm_set_mod_reg_bits (OMAP24XX_FORCESTATE_MASK , clkdm->pwrdm.ptr->prcm_offs,OMAP2_PM_PWSTCTRL ); }else if (cpu_is_omap34xx () |cpu_is_omap44xx ()) {
@@ -853,7 +853,7 @@ int omap2_clkdm_wakeup(struct clockdomain *clkdm)if (cpu_is_omap24xx ()) { -cm_clear_mod_reg_bits (OMAP24XX_FORCESTATE , +cm_clear_mod_reg_bits (OMAP24XX_FORCESTATE_MASK , clkdm->pwrdm.ptr->prcm_offs,OMAP2_PM_PWSTCTRL ); }else if (cpu_is_omap34xx () |cpu_is_omap44xx ()) {
arch/arm/mach-omap2/cm-regbits-24xx.h +118 -118
388 lines not on this page · raw message
arch/arm/mach-omap2/pm24xx.c +54 -53
149 lines not on this page · raw message
arch/arm/mach-omap2/prm-regbits-24xx.h +60 -60
249 lines not on this page · raw message
Paul Walmsley
maintainerPATCH 2/4 OMAP3 PRCM: convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes
In reply to Paul WalmsleyFix all of the remaining OMAP3 PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places.
Signed-off-by Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
--- arch/arm/mach-omap2/cm-regbits-34xx.h | 222 ++++++++++---------- arch/arm/mach-omap2/control.c | 7 - arch/arm/mach-omap2/pm34xx.c | 175 ++++++++-------- arch/arm/mach-omap2/powerdomain.c | 24 +- arch/arm/mach-omap2/prm-regbits-34xx.h | 360 ++++++++++++++++---------------- 5 files changed, 397 insertions(+), 391 deletions(-)
arch/arm/mach-omap2/cm-regbits-34xx.h +111 -111
@@ -21,15 +21,15 @@/* CM_FCLKEN1_CORE and CM_ICLKEN1_CORE shared bits */ #define OMAP3430ES2_EN_MMC3_MASK (1 << 30)#define OMAP3430ES2_EN_MMC3_SHIFT 30 -#define OMAP3430_EN_MSPRO (1 << 23) +#define OMAP3430_EN_MSPRO_MASK (1 << 23)#define OMAP3430_EN_MSPRO_SHIFT 23 -#define OMAP3430_EN_HDQ (1 << 22) +#define OMAP3430_EN_HDQ_MASK (1 << 22)#define OMAP3430_EN_HDQ_SHIFT 22 -#define OMAP3430ES1_EN_FSHOSTUSB (1 << 5) +#define OMAP3430ES1_EN_FSHOSTUSB_MASK (1 << 5)#define OMAP3430ES1_EN_FSHOSTUSB_SHIFT 5 -#define OMAP3430ES1_EN_D2D (1 << 3) +#define OMAP3430ES1_EN_D2D_MASK (1 << 3)#define OMAP3430ES1_EN_D2D_SHIFT 3 -#define OMAP3430_EN_SSI (1 << 0) +#define OMAP3430_EN_SSI_MASK (1 << 0)#define OMAP3430_EN_SSI_SHIFT 0/* CM_FCLKEN3_CORE and CM_ICLKEN3_CORE shared bits */
@@ -37,19 +37,19 @@#define OMAP3430ES2_EN_USBTLL_MASK (1 << 2)/* CM_FCLKEN_WKUP and CM_ICLKEN_WKUP shared bits */ -#define OMAP3430_EN_WDT2 (1 << 5) +#define OMAP3430_EN_WDT2_MASK (1 << 5)#define OMAP3430_EN_WDT2_SHIFT 5/* CM_ICLKEN_CAM, CM_FCLKEN_CAM shared bits */ -#define OMAP3430_EN_CAM (1 << 0) +#define OMAP3430_EN_CAM_MASK (1 << 0)#define OMAP3430_EN_CAM_SHIFT 0/* CM_FCLKEN_PER, CM_ICLKEN_PER shared bits */ -#define OMAP3430_EN_WDT3 (1 << 12) +#define OMAP3430_EN_WDT3_MASK (1 << 12)#define OMAP3430_EN_WDT3_SHIFT 12/* CM_CLKSEL2_EMU, CM_CLKSEL3_EMU shared bits */ -#define OMAP3430_OVERRIDE_ENABLE (1 << 19) +#define OMAP3430_OVERRIDE_ENABLE_MASK (1 << 19)/* Bits specific to each register */
@@ -69,7 +69,7 @@#define OMAP3430_EN_IVA2_DPLL_MASK (0x7 << 0)/* CM_IDLEST_IVA2 */ -#define OMAP3430_ST_IVA2 (1 << 0) +#define OMAP3430_ST_IVA2_MASK (1 << 0)/* CM_IDLEST_PLL_IVA2 */ #define OMAP3430_ST_IVA2_CLK_SHIFT 0
@@ -114,7 +114,7 @@#define OMAP3430_EN_MPU_DPLL_MASK (0x7 << 0)/* CM_IDLEST_MPU */ -#define OMAP3430_ST_MPU (1 << 0) +#define OMAP3430_ST_MPU_MASK (1 << 0)/* CM_IDLEST_PLL_MPU */ #define OMAP3430_ST_MPU_CLK_SHIFT 0
@@ -145,50 +145,50 @@#define OMAP3430_CLKACTIVITY_MPU_MASK (1 << 0)/* CM_FCLKEN1_CORE specific bits */ -#define OMAP3430_EN_MODEM (1 << 31) +#define OMAP3430_EN_MODEM_MASK (1 << 31)#define OMAP3430_EN_MODEM_SHIFT 31/* CM_ICLKEN1_CORE specific bits */ -#define OMAP3430_EN_ICR (1 << 29) +#define OMAP3430_EN_ICR_MASK (1 << 29)#define OMAP3430_EN_ICR_SHIFT 29 -#define OMAP3430_EN_AES2 (1 << 28) +#define OMAP3430_EN_AES2_MASK (1 << 28)#define OMAP3430_EN_AES2_SHIFT 28 -#define OMAP3430_EN_SHA12 (1 << 27) +#define OMAP3430_EN_SHA12_MASK (1 << 27)#define OMAP3430_EN_SHA12_SHIFT 27 -#define OMAP3430_EN_DES2 (1 << 26) +#define OMAP3430_EN_DES2_MASK (1 << 26)#define OMAP3430_EN_DES2_SHIFT 26 -#define OMAP3430ES1_EN_FAC (1 << 8) +#define OMAP3430ES1_EN_FAC_MASK (1 << 8)#define OMAP3430ES1_EN_FAC_SHIFT 8 -#define OMAP3430_EN_MAILBOXES (1 << 7) +#define OMAP3430_EN_MAILBOXES_MASK (1 << 7)#define OMAP3430_EN_MAILBOXES_SHIFT 7 -#define OMAP3430_EN_OMAPCTRL (1 << 6) +#define OMAP3430_EN_OMAPCTRL_MASK (1 << 6)#define OMAP3430_EN_OMAPCTRL_SHIFT 6 -#define OMAP3430_EN_SAD2D (1 << 3) +#define OMAP3430_EN_SAD2D_MASK (1 << 3)#define OMAP3430_EN_SAD2D_SHIFT 3 -#define OMAP3430_EN_SDRC (1 << 1) +#define OMAP3430_EN_SDRC_MASK (1 << 1)#define OMAP3430_EN_SDRC_SHIFT 1/* AM35XX specific CM_ICLKEN1_CORE bits */ #define AM35XX_EN_IPSS_MASK (1 << 4)#define AM35XX_EN_IPSS_SHIFT 4 -#define AM35XX_EN_UART4_MASK (1 << 23) +#define AM35XX_EN_UART4_MASK (1 << 23)#define AM35XX_EN_UART4_SHIFT 23/* CM_ICLKEN2_CORE */ -#define OMAP3430_EN_PKA (1 << 4) +#define OMAP3430_EN_PKA_MASK (1 << 4)#define OMAP3430_EN_PKA_SHIFT 4 -#define OMAP3430_EN_AES1 (1 << 3) +#define OMAP3430_EN_AES1_MASK (1 << 3)#define OMAP3430_EN_AES1_SHIFT 3 -#define OMAP3430_EN_RNG (1 << 2) +#define OMAP3430_EN_RNG_MASK (1 << 2)#define OMAP3430_EN_RNG_SHIFT 2 -#define OMAP3430_EN_SHA11 (1 << 1) +#define OMAP3430_EN_SHA11_MASK (1 << 1)#define OMAP3430_EN_SHA11_SHIFT 1 -#define OMAP3430_EN_DES1 (1 << 0) +#define OMAP3430_EN_DES1_MASK (1 << 0)#define OMAP3430_EN_DES1_SHIFT 0/* CM_ICLKEN3_CORE */ #define OMAP3430_EN_MAD2D_SHIFT 3 -#define OMAP3430_EN_MAD2D (1 << 3) +#define OMAP3430_EN_MAD2D_MASK (1 << 3)/* CM_FCLKEN3_CORE specific bits */ #define OMAP3430ES2_EN_TS_SHIFT 1
@@ -249,79 +249,79 @@#define OMAP3430ES2_ST_CPEFUSE_MASK (1 << 0)/* CM_AUTOIDLE1_CORE */ -#define OMAP3430_AUTO_MODEM (1 << 31) +#define OMAP3430_AUTO_MODEM_MASK (1 << 31)#define OMAP3430_AUTO_MODEM_SHIFT 31 -#define OMAP3430ES2_AUTO_MMC3 (1 << 30) +#define OMAP3430ES2_AUTO_MMC3_MASK (1 << 30)#define OMAP3430ES2_AUTO_MMC3_SHIFT 30 -#define OMAP3430ES2_AUTO_ICR (1 << 29) +#define OMAP3430ES2_AUTO_ICR_MASK (1 << 29)#define OMAP3430ES2_AUTO_ICR_SHIFT 29 -#define OMAP3430_AUTO_AES2 (1 << 28) +#define OMAP3430_AUTO_AES2_MASK (1 << 28)#define OMAP3430_AUTO_AES2_SHIFT 28 -#define OMAP3430_AUTO_SHA12 (1 << 27) +#define OMAP3430_AUTO_SHA12_MASK (1 << 27)#define OMAP3430_AUTO_SHA12_SHIFT 27 -#define OMAP3430_AUTO_DES2 (1 << 26) +#define OMAP3430_AUTO_DES2_MASK (1 << 26)#define OMAP3430_AUTO_DES2_SHIFT 26 -#define OMAP3430_AUTO_MMC2 (1 << 25) +#define OMAP3430_AUTO_MMC2_MASK (1 << 25)#define OMAP3430_AUTO_MMC2_SHIFT 25 -#define OMAP3430_AUTO_MMC1 (1 << 24) +#define OMAP3430_AUTO_MMC1_MASK (1 << 24)#define OMAP3430_AUTO_MMC1_SHIFT 24 -#define OMAP3430_AUTO_MSPRO (1 << 23) +#define OMAP3430_AUTO_MSPRO_MASK (1 << 23)#define OMAP3430_AUTO_MSPRO_SHIFT 23 -#define OMAP3430_AUTO_HDQ (1 << 22) +#define OMAP3430_AUTO_HDQ_MASK (1 << 22)#define OMAP3430_AUTO_HDQ_SHIFT 22 -#define OMAP3430_AUTO_MCSPI4 (1 << 21) +#define OMAP3430_AUTO_MCSPI4_MASK (1 << 21)#define OMAP3430_AUTO_MCSPI4_SHIFT 21 -#define OMAP3430_AUTO_MCSPI3 (1 << 20) +#define OMAP3430_AUTO_MCSPI3_MASK (1 << 20)#define OMAP3430_AUTO_MCSPI3_SHIFT 20 -#define OMAP3430_AUTO_MCSPI2 (1 << 19) +#define OMAP3430_AUTO_MCSPI2_MASK (1 << 19)#define OMAP3430_AUTO_MCSPI2_SHIFT 19 -#define OMAP3430_AUTO_MCSPI1 (1 << 18) +#define OMAP3430_AUTO_MCSPI1_MASK (1 << 18)#define OMAP3430_AUTO_MCSPI1_SHIFT 18 -#define OMAP3430_AUTO_I2C3 (1 << 17) +#define OMAP3430_AUTO_I2C3_MASK (1 << 17)#define OMAP3430_AUTO_I2C3_SHIFT 17 -#define OMAP3430_AUTO_I2C2 (1 << 16) +#define OMAP3430_AUTO_I2C2_MASK (1 << 16)#define OMAP3430_AUTO_I2C2_SHIFT 16 -#define OMAP3430_AUTO_I2C1 (1 << 15) +#define OMAP3430_AUTO_I2C1_MASK (1 << 15)#define OMAP3430_AUTO_I2C1_SHIFT 15 -#define OMAP3430_AUTO_UART2 (1 << 14) +#define OMAP3430_AUTO_UART2_MASK (1 << 14)#define OMAP3430_AUTO_UART2_SHIFT 14 -#define OMAP3430_AUTO_UART1 (1 << 13) +#define OMAP3430_AUTO_UART1_MASK (1 << 13)#define OMAP3430_AUTO_UART1_SHIFT 13 -#define OMAP3430_AUTO_GPT11 (1 << 12) +#define OMAP3430_AUTO_GPT11_MASK (1 << 12)#define OMAP3430_AUTO_GPT11_SHIFT 12 -#define OMAP3430_AUTO_GPT10 (1 << 11) +#define OMAP3430_AUTO_GPT10_MASK (1 << 11)#define OMAP3430_AUTO_GPT10_SHIFT 11 -#define OMAP3430_AUTO_MCBSP5 (1 << 10) +#define OMAP3430_AUTO_MCBSP5_MASK (1 << 10)#define OMAP3430_AUTO_MCBSP5_SHIFT 10 -#define OMAP3430_AUTO_MCBSP1 (1 << 9) +#define OMAP3430_AUTO_MCBSP1_MASK (1 << 9)#define OMAP3430_AUTO_MCBSP1_SHIFT 9 -#define OMAP3430ES1_AUTO_FAC (1 << 8) +#define OMAP3430ES1_AUTO_FAC_MASK (1 << 8)#define OMAP3430ES1_AUTO_FAC_SHIFT 8 -#define OMAP3430_AUTO_MAILBOXES (1 << 7) +#define OMAP3430_AUTO_MAILBOXES_MASK (1 << 7)#define OMAP3430_AUTO_MAILBOXES_SHIFT 7 -#define OMAP3430_AUTO_OMAPCTRL (1 << 6) +#define OMAP3430_AUTO_OMAPCTRL_MASK (1 << 6)#define OMAP3430_AUTO_OMAPCTRL_SHIFT 6 -#define OMAP3430ES1_AUTO_FSHOSTUSB (1 << 5) +#define OMAP3430ES1_AUTO_FSHOSTUSB_MASK (1 << 5)#define OMAP3430ES1_AUTO_FSHOSTUSB_SHIFT 5 -#define OMAP3430_AUTO_HSOTGUSB (1 << 4) +#define OMAP3430_AUTO_HSOTGUSB_MASK (1 << 4)#define OMAP3430_AUTO_HSOTGUSB_SHIFT 4 -#define OMAP3430ES1_AUTO_D2D (1 << 3) +#define OMAP3430ES1_AUTO_D2D_MASK (1 << 3)#define OMAP3430ES1_AUTO_D2D_SHIFT 3 -#define OMAP3430_AUTO_SAD2D (1 << 3) +#define OMAP3430_AUTO_SAD2D_MASK (1 << 3)#define OMAP3430_AUTO_SAD2D_SHIFT 3 -#define OMAP3430_AUTO_SSI (1 << 0) +#define OMAP3430_AUTO_SSI_MASK (1 << 0)#define OMAP3430_AUTO_SSI_SHIFT 0/* CM_AUTOIDLE2_CORE */ -#define OMAP3430_AUTO_PKA (1 << 4) +#define OMAP3430_AUTO_PKA_MASK (1 << 4)#define OMAP3430_AUTO_PKA_SHIFT 4 -#define OMAP3430_AUTO_AES1 (1 << 3) +#define OMAP3430_AUTO_AES1_MASK (1 << 3)#define OMAP3430_AUTO_AES1_SHIFT 3 -#define OMAP3430_AUTO_RNG (1 << 2) +#define OMAP3430_AUTO_RNG_MASK (1 << 2)#define OMAP3430_AUTO_RNG_SHIFT 2 -#define OMAP3430_AUTO_SHA11 (1 << 1) +#define OMAP3430_AUTO_SHA11_MASK (1 << 1)#define OMAP3430_AUTO_SHA11_SHIFT 1 -#define OMAP3430_AUTO_DES1 (1 << 0) +#define OMAP3430_AUTO_DES1_MASK (1 << 0)#define OMAP3430_AUTO_DES1_SHIFT 0/* CM_AUTOIDLE3_CORE */
@@ -331,7 +331,7 @@#define OMAP3430ES2_AUTO_USBTLL_SHIFT 2#define OMAP3430ES2_AUTO_USBTLL_MASK (1 << 2)#define OMAP3430_AUTO_MAD2D_SHIFT 3 -#define OMAP3430_AUTO_MAD2D (1 << 3) +#define OMAP3430_AUTO_MAD2D_MASK (1 << 3)/* CM_CLKSEL_CORE */ #define OMAP3430_CLKSEL_SSI_SHIFT 8
@@ -366,9 +366,9 @@#define OMAP3430_CLKACTIVITY_L3_MASK (1 << 0)/* CM_FCLKEN_GFX */ -#define OMAP3430ES1_EN_3D (1 << 2) +#define OMAP3430ES1_EN_3D_MASK (1 << 2)#define OMAP3430ES1_EN_3D_SHIFT 2 -#define OMAP3430ES1_EN_2D (1 << 1) +#define OMAP3430ES1_EN_2D_MASK (1 << 1)#define OMAP3430ES1_EN_2D_SHIFT 1/* CM_ICLKEN_GFX specific bits */
@@ -416,9 +416,9 @@#define OMAP3430ES2_EN_USIMOCP_MASK (1 << 9)/* CM_ICLKEN_WKUP specific bits */ -#define OMAP3430_EN_WDT1 (1 << 4) +#define OMAP3430_EN_WDT1_MASK (1 << 4)#define OMAP3430_EN_WDT1_SHIFT 4 -#define OMAP3430_EN_32KSYNC (1 << 2) +#define OMAP3430_EN_32KSYNC_MASK (1 << 2)#define OMAP3430_EN_32KSYNC_SHIFT 2/* CM_IDLEST_WKUP specific bits */
@@ -432,19 +432,19 @@#define OMAP3430_ST_32KSYNC_MASK (1 << 2)/* CM_AUTOIDLE_WKUP */ -#define OMAP3430ES2_AUTO_USIMOCP (1 << 9) +#define OMAP3430ES2_AUTO_USIMOCP_MASK (1 << 9)#define OMAP3430ES2_AUTO_USIMOCP_SHIFT 9 -#define OMAP3430_AUTO_WDT2 (1 << 5) +#define OMAP3430_AUTO_WDT2_MASK (1 << 5)#define OMAP3430_AUTO_WDT2_SHIFT 5 -#define OMAP3430_AUTO_WDT1 (1 << 4) +#define OMAP3430_AUTO_WDT1_MASK (1 << 4)#define OMAP3430_AUTO_WDT1_SHIFT 4 -#define OMAP3430_AUTO_GPIO1 (1 << 3) +#define OMAP3430_AUTO_GPIO1_MASK (1 << 3)#define OMAP3430_AUTO_GPIO1_SHIFT 3 -#define OMAP3430_AUTO_32KSYNC (1 << 2) +#define OMAP3430_AUTO_32KSYNC_MASK (1 << 2)#define OMAP3430_AUTO_32KSYNC_SHIFT 2 -#define OMAP3430_AUTO_GPT12 (1 << 1) +#define OMAP3430_AUTO_GPT12_MASK (1 << 1)#define OMAP3430_AUTO_GPT12_SHIFT 1 -#define OMAP3430_AUTO_GPT1 (1 << 0) +#define OMAP3430_AUTO_GPT1_MASK (1 << 0)#define OMAP3430_AUTO_GPT1_SHIFT 0/* CM_CLKSEL_WKUP */
@@ -479,7 +479,7 @@#define OMAP3430_EN_CORE_DPLL_MASK (0x7 << 0)/* CM_CLKEN2_PLL */ -#define OMAP3430ES2_EN_PERIPH2_DPLL_LPMODE_SHIFT 10 +#define OMAP3430ES2_EN_PERIPH2_DPLL_LPMODE_SHIFT 10#define OMAP3430ES2_PERIPH2_DPLL_RAMPTIME_MASK (0x3 << 8)#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_SHIFT 4#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_MASK (0xf << 4)
@@ -488,10 +488,10 @@#define OMAP3430ES2_EN_PERIPH2_DPLL_MASK (0x7 << 0)/* CM_IDLEST_CKGEN */ -#define OMAP3430_ST_54M_CLK (1 << 5) -#define OMAP3430_ST_12M_CLK (1 << 4) -#define OMAP3430_ST_48M_CLK (1 << 3) -#define OMAP3430_ST_96M_CLK (1 << 2) +#define OMAP3430_ST_54M_CLK_MASK (1 << 5) +#define OMAP3430_ST_12M_CLK_MASK (1 << 4) +#define OMAP3430_ST_48M_CLK_MASK (1 << 3) +#define OMAP3430_ST_96M_CLK_MASK (1 << 2)#define OMAP3430_ST_PERIPH_CLK_SHIFT 1#define OMAP3430_ST_PERIPH_CLK_MASK (1 << 1)#define OMAP3430_ST_CORE_CLK_SHIFT 0
@@ -558,22 +558,22 @@/* CM_CLKOUT_CTRL */ #define OMAP3430_CLKOUT2_EN_SHIFT 7 -#define OMAP3430_CLKOUT2_EN (1 << 7) +#define OMAP3430_CLKOUT2_EN_MASK (1 << 7)#define OMAP3430_CLKOUT2_DIV_SHIFT 3#define OMAP3430_CLKOUT2_DIV_MASK (0x7 << 3)#define OMAP3430_CLKOUT2SOURCE_SHIFT 0#define OMAP3430_CLKOUT2SOURCE_MASK (0x3 << 0)/* CM_FCLKEN_DSS */ -#define OMAP3430_EN_TV (1 << 2) +#define OMAP3430_EN_TV_MASK (1 << 2)#define OMAP3430_EN_TV_SHIFT 2 -#define OMAP3430_EN_DSS2 (1 << 1) +#define OMAP3430_EN_DSS2_MASK (1 << 1)#define OMAP3430_EN_DSS2_SHIFT 1 -#define OMAP3430_EN_DSS1 (1 << 0) +#define OMAP3430_EN_DSS1_MASK (1 << 0)#define OMAP3430_EN_DSS1_SHIFT 0/* CM_ICLKEN_DSS */ -#define OMAP3430_CM_ICLKEN_DSS_EN_DSS (1 << 0) +#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_MASK (1 << 0)#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0/* CM_IDLEST_DSS */
@@ -585,7 +585,7 @@#define OMAP3430ES1_ST_DSS_MASK (1 << 0)/* CM_AUTOIDLE_DSS */ -#define OMAP3430_AUTO_DSS (1 << 0) +#define OMAP3430_AUTO_DSS_MASK (1 << 0)#define OMAP3430_AUTO_DSS_SHIFT 0/* CM_CLKSEL_DSS */
@@ -607,16 +607,16 @@#define OMAP3430_CLKACTIVITY_DSS_MASK (1 << 0)/* CM_FCLKEN_CAM specific bits */ -#define OMAP3430_EN_CSI2 (1 << 1) +#define OMAP3430_EN_CSI2_MASK (1 << 1)#define OMAP3430_EN_CSI2_SHIFT 1/* CM_ICLKEN_CAM specific bits */ /* CM_IDLEST_CAM */ -#define OMAP3430_ST_CAM (1 << 0) +#define OMAP3430_ST_CAM_MASK (1 << 0)/* CM_AUTOIDLE_CAM */ -#define OMAP3430_AUTO_CAM (1 << 0) +#define OMAP3430_AUTO_CAM_MASK (1 << 0)#define OMAP3430_AUTO_CAM_SHIFT 0/* CM_CLKSEL_CAM */
@@ -649,41 +649,41 @@#define OMAP3430_ST_MCBSP2_MASK (1 << 0)/* CM_AUTOIDLE_PER */ -#define OMAP3430_AUTO_GPIO6 (1 << 17) +#define OMAP3430_AUTO_GPIO6_MASK (1 << 17)#define OMAP3430_AUTO_GPIO6_SHIFT 17 -#define OMAP3430_AUTO_GPIO5 (1 << 16) +#define OMAP3430_AUTO_GPIO5_MASK (1 << 16)#define OMAP3430_AUTO_GPIO5_SHIFT 16 -#define OMAP3430_AUTO_GPIO4 (1 << 15) +#define OMAP3430_AUTO_GPIO4_MASK (1 << 15)#define OMAP3430_AUTO_GPIO4_SHIFT 15 -#define OMAP3430_AUTO_GPIO3 (1 << 14) +#define OMAP3430_AUTO_GPIO3_MASK (1 << 14)#define OMAP3430_AUTO_GPIO3_SHIFT 14 -#define OMAP3430_AUTO_GPIO2 (1 << 13) +#define OMAP3430_AUTO_GPIO2_MASK (1 << 13)#define OMAP3430_AUTO_GPIO2_SHIFT 13 -#define OMAP3430_AUTO_WDT3 (1 << 12) +#define OMAP3430_AUTO_WDT3_MASK (1 << 12)#define OMAP3430_AUTO_WDT3_SHIFT 12 -#define OMAP3430_AUTO_UART3 (1 << 11) +#define OMAP3430_AUTO_UART3_MASK (1 << 11)#define OMAP3430_AUTO_UART3_SHIFT 11 -#define OMAP3430_AUTO_GPT9 (1 << 10) +#define OMAP3430_AUTO_GPT9_MASK (1 << 10)#define OMAP3430_AUTO_GPT9_SHIFT 10 -#define OMAP3430_AUTO_GPT8 (1 << 9) +#define OMAP3430_AUTO_GPT8_MASK (1 << 9)#define OMAP3430_AUTO_GPT8_SHIFT 9 -#define OMAP3430_AUTO_GPT7 (1 << 8) +#define OMAP3430_AUTO_GPT7_MASK (1 << 8)#define OMAP3430_AUTO_GPT7_SHIFT 8 -#define OMAP3430_AUTO_GPT6 (1 << 7) +#define OMAP3430_AUTO_GPT6_MASK (1 << 7)#define OMAP3430_AUTO_GPT6_SHIFT 7 -#define OMAP3430_AUTO_GPT5 (1 << 6) +#define OMAP3430_AUTO_GPT5_MASK (1 << 6)#define OMAP3430_AUTO_GPT5_SHIFT 6 -#define OMAP3430_AUTO_GPT4 (1 << 5) +#define OMAP3430_AUTO_GPT4_MASK (1 << 5)#define OMAP3430_AUTO_GPT4_SHIFT 5 -#define OMAP3430_AUTO_GPT3 (1 << 4) +#define OMAP3430_AUTO_GPT3_MASK (1 << 4)#define OMAP3430_AUTO_GPT3_SHIFT 4 -#define OMAP3430_AUTO_GPT2 (1 << 3) +#define OMAP3430_AUTO_GPT2_MASK (1 << 3)#define OMAP3430_AUTO_GPT2_SHIFT 3 -#define OMAP3430_AUTO_MCBSP4 (1 << 2) +#define OMAP3430_AUTO_MCBSP4_MASK (1 << 2)#define OMAP3430_AUTO_MCBSP4_SHIFT 2 -#define OMAP3430_AUTO_MCBSP3 (1 << 1) +#define OMAP3430_AUTO_MCBSP3_MASK (1 << 1)#define OMAP3430_AUTO_MCBSP3_SHIFT 1 -#define OMAP3430_AUTO_MCBSP2 (1 << 0) +#define OMAP3430_AUTO_MCBSP2_MASK (1 << 0)#define OMAP3430_AUTO_MCBSP2_SHIFT 0/* CM_CLKSEL_PER */
@@ -705,7 +705,7 @@#define OMAP3430_CLKSEL_GPT2_SHIFT 0/* CM_SLEEPDEP_PER specific bits */ -#define OMAP3430_CM_SLEEPDEP_PER_EN_IVA2 (1 << 2) +#define OMAP3430_CM_SLEEPDEP_PER_EN_IVA2_MASK (1 << 2)/* CM_CLKSTCTRL_PER */ #define OMAP3430_CLKTRCTRL_PER_SHIFT 0
@@ -755,10 +755,10 @@#define OMAP3430_PERIPH_DPLL_EMU_DIV_MASK (0x7f << 0)/* CM_POLCTRL */ -#define OMAP3430_CLKOUT2_POL (1 << 0) +#define OMAP3430_CLKOUT2_POL_MASK (1 << 0)/* CM_IDLEST_NEON */ -#define OMAP3430_ST_NEON (1 << 0) +#define OMAP3430_ST_NEON_MASK (1 << 0)/* CM_CLKSTCTRL_NEON */ #define OMAP3430_CLKTRCTRL_NEON_SHIFT 0
arch/arm/mach-omap2/control.c +4 -3
@@ -194,11 +194,12 @@ void omap3_clear_scratchpad_contents(void)u32 offset =0 ; v_addr =OMAP2_L4_IO_ADDRESS (OMAP343X_SCRATCHPAD_ROM );if (prm_read_mod_reg (OMAP3430_GR_MOD ,OMAP3_PRM_RSTST_OFFSET ) & -OMAP3430_GLOBAL_COLD_RST ) { +OMAP3430_GLOBAL_COLD_RST_MASK ) {for ( ; offset <= max_offset; offset +=0x4 )__raw_writel (0x0 , (v_addr + offset)); -prm_set_mod_reg_bits (OMAP3430_GLOBAL_COLD_RST ,OMAP3430_GR_MOD , -OMAP3_PRM_RSTST_OFFSET ); +prm_set_mod_reg_bits (OMAP3430_GLOBAL_COLD_RST_MASK , +OMAP3430_GR_MOD , +OMAP3_PRM_RSTST_OFFSET ); } }
arch/arm/mach-omap2/pm34xx.c +89 -86
293 lines not on this page · raw message
arch/arm/mach-omap2/powerdomain.c +13 -11
@@ -64,10 +64,10 @@ static u16 pwrstst_reg_offs;#define OMAP_MEM4_ONSTATE_MASK OMAP4430_OCP_NRET_BANK_ONSTATE_MASK/* OMAP3 and OMAP4 Memory Retstate Masks (common across all power domains) */ -#define OMAP_MEM0_RETSTATE_MASK OMAP3430_SHAREDL1CACHEFLATRETSTATE -#define OMAP_MEM1_RETSTATE_MASK OMAP3430_L1FLATMEMRETSTATE -#define OMAP_MEM2_RETSTATE_MASK OMAP3430_SHAREDL2CACHEFLATRETSTATE -#define OMAP_MEM3_RETSTATE_MASK OMAP3430_L2FLATMEMRETSTATE +#define OMAP_MEM0_RETSTATE_MASK OMAP3430_SHAREDL1CACHEFLATRETSTATE_MASK +#define OMAP_MEM1_RETSTATE_MASK OMAP3430_L1FLATMEMRETSTATE_MASK +#define OMAP_MEM2_RETSTATE_MASK OMAP3430_SHAREDL2CACHEFLATRETSTATE_MASK +#define OMAP_MEM3_RETSTATE_MASK OMAP3430_L2FLATMEMRETSTATE_MASK#define OMAP_MEM4_RETSTATE_MASK OMAP4430_OCP_NRET_BANK_RETSTATE_MASK/* OMAP3 and OMAP4 Memory Status bits */
@@ -511,6 +511,8 @@ int pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)*/ int pwrdm_set_logic_retst (struct powerdomain *pwrdm,u8 pwrst) { +u32 v; +if (!pwrdm)return -EINVAL ;
@@ -526,9 +528,9 @@ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)* but the type of value returned is the same for each * powerdomain. */ -prm_rmw_mod_reg_bits (OMAP3430_LOGICL1CACHERETSTATE , - (pwrst <<__ffs (OMAP3430_LOGICL1CACHERETSTATE )), - pwrdm->prcm_offs, pwrstctrl_reg_offs); + v = pwrst <<__ffs (OMAP3430_LOGICL1CACHERETSTATE_MASK ); +prm_rmw_mod_reg_bits (OMAP3430_LOGICL1CACHERETSTATE_MASK , v, + pwrdm->prcm_offs, pwrstctrl_reg_offs);return 0 ; }
@@ -676,8 +678,8 @@ int pwrdm_read_logic_pwrst(struct powerdomain *pwrdm)if (!pwrdm)return -EINVAL ; -return prm_read_mod_bits_shift (pwrdm->prcm_offs, - pwrstst_reg_offs,OMAP3430_LOGICSTATEST ); +return prm_read_mod_bits_shift (pwrdm->prcm_offs, pwrstst_reg_offs, +OMAP3430_LOGICSTATEST_MASK ); }/**
@@ -700,7 +702,7 @@ int pwrdm_read_prev_logic_pwrst(struct powerdomain *pwrdm)* powerdomain. */ return prm_read_mod_bits_shift (pwrdm->prcm_offs,OMAP3430_PM_PREPWSTST , -OMAP3430_LASTLOGICSTATEENTERED ); +OMAP3430_LASTLOGICSTATEENTERED_MASK ); }/**
@@ -723,7 +725,7 @@ int pwrdm_read_logic_retst(struct powerdomain *pwrdm)* powerdomain. */ return prm_read_mod_bits_shift (pwrdm->prcm_offs, pwrstctrl_reg_offs, -OMAP3430_LOGICSTATEST ); +OMAP3430_LOGICSTATEST_MASK ); }/**
arch/arm/mach-omap2/prm-regbits-34xx.h +180 -180
552 lines not on this page · raw message
Paul Walmsley
maintainerPATCH 3/4 OMAP2+ PRCM: convert remaining PRCM macros to the _SHIFT/_MASK suffixes
In reply to Paul WalmsleyFix all of the remaining PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places.
Signed-off-by Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
--- arch/arm/mach-omap2/cm.h | 5 + arch/arm/mach-omap2/pm24xx.c | 21 +++-- arch/arm/mach-omap2/pm34xx.c | 30 ++++---- arch/arm/mach-omap2/powerdomain.c | 2 - arch/arm/mach-omap2/prcm-common.h | 146 +++++++++++++++++++------------------ arch/arm/mach-omap2/prcm.c | 4 + arch/arm/mach-omap2/prm.h | 18 ++--- 7 files changed, 114 insertions(+), 112 deletions(-)
arch/arm/mach-omap2/cm.h +3 -2
@@ -134,10 +134,11 @@ static inline u32 cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)/* CM_ICLKEN_GFX */ #define OMAP_EN_GFX_SHIFT 0 -#define OMAP_EN_GFX (1 << 0) +#define OMAP_EN_GFX_MASK (1 << 0)/* CM_IDLEST_GFX */ -#define OMAP_ST_GFX (1 << 0) +#define OMAP_ST_GFX_MASK (1 << 0) +/* CM_IDLEST indicator */ #define OMAP24XX_CM_IDLEST_VAL 0
arch/arm/mach-omap2/pm24xx.c +11 -10
@@ -70,8 +70,8 @@ static int omap2_fclks_active(void) f2 =cm_read_mod_reg (CORE_MOD ,OMAP24XX_CM_FCLKEN2 );/* Ignore UART clocks. These are handled by UART core (serial.c) */ - f1 &= ~(OMAP24XX_EN_UART1 |OMAP24XX_EN_UART2 ); - f2 &= ~OMAP24XX_EN_UART3 ; + f1 &= ~(OMAP24XX_EN_UART1_MASK |OMAP24XX_EN_UART2_MASK ); + f2 &= ~OMAP24XX_EN_UART3_MASK ;if (f1 | f2)return 1 ;
@@ -181,13 +181,13 @@ static int omap2_allow_mpu_retention(void)/* Check for MMC, UART2, UART1, McSPI2, McSPI1 and DSS1. */ l =cm_read_mod_reg (CORE_MOD ,CM_FCLKEN1 ); -if (l & (OMAP2420_EN_MMC |OMAP24XX_EN_UART2 | -OMAP24XX_EN_UART1 |OMAP24XX_EN_MCSPI2 | -OMAP24XX_EN_MCSPI1 |OMAP24XX_EN_DSS1_MASK )) +if (l & (OMAP2420_EN_MMC_MASK |OMAP24XX_EN_UART2_MASK | +OMAP24XX_EN_UART1_MASK |OMAP24XX_EN_MCSPI2_MASK | +OMAP24XX_EN_MCSPI1_MASK |OMAP24XX_EN_DSS1_MASK ))return 0 ;/* Check for UART3. */ l =cm_read_mod_reg (CORE_MOD ,OMAP24XX_CM_FCLKEN2 ); -if (l &OMAP24XX_EN_UART3 ) +if (l &OMAP24XX_EN_UART3_MASK )return 0 ;if (sti_console_enabled)return 0 ;
@@ -215,12 +215,12 @@ static void omap2_enter_mpu_retention(void)/* Try to enter MPU retention */ prm_write_mod_reg ((0x01 <<OMAP_POWERSTATE_SHIFT ) | -OMAP_LOGICRETSTATE , +OMAP_LOGICRETSTATE_MASK ,MPU_MOD ,OMAP2_PM_PWSTCTRL ); }else {/* Block MPU retention */ -prm_write_mod_reg (OMAP_LOGICRETSTATE ,MPU_MOD , +prm_write_mod_reg (OMAP_LOGICRETSTATE_MASK ,MPU_MOD ,OMAP2_PM_PWSTCTRL ); only_idle =1 ; }
@@ -288,7 +288,8 @@ static int omap2_pm_suspend(void)u32 wken_wkup, mir1; wken_wkup =prm_read_mod_reg (WKUP_MOD ,PM_WKEN ); -prm_write_mod_reg (wken_wkup & ~OMAP24XX_EN_GPT1 ,WKUP_MOD ,PM_WKEN ); + wken_wkup &= ~OMAP24XX_EN_GPT1_MASK ; +prm_write_mod_reg (wken_wkup,WKUP_MOD ,PM_WKEN );/* Mask GPT1 */ mir1 =omap_readl (0x480fe0a4 );
@@ -469,7 +470,7 @@ static void __init prcm_setup_regs(void) OMAP24XX_GR_MOD, OMAP2_PRCM_VOLTCTRL_OFFSET);/* Enable wake-up events */ -prm_write_mod_reg (OMAP24XX_EN_GPIOS |OMAP24XX_EN_GPT1 , +prm_write_mod_reg (OMAP24XX_EN_GPIOS_MASK |OMAP24XX_EN_GPT1_MASK ,WKUP_MOD ,PM_WKEN ); }
arch/arm/mach-omap2/pm34xx.c +15 -15
@@ -852,7 +852,7 @@ static void __init prcm_setup_regs(void) CM_AUTOIDLE); } -omap_ctrl_writel (OMAP3430_AUTOIDLE ,OMAP2_CONTROL_SYSCONFIG ); +omap_ctrl_writel (OMAP3430_AUTOIDLE_MASK ,OMAP2_CONTROL_SYSCONFIG );/* * Set all plls to autoidle. This is needed until autoidle is
@@ -882,12 +882,12 @@ static void __init prcm_setup_regs(void) OMAP3_PRM_CLKSRC_CTRL_OFFSET);/* setup wakup source */ -prm_write_mod_reg (OMAP3430_EN_IO_MASK |OMAP3430_EN_GPIO1 | -OMAP3430_EN_GPT1 |OMAP3430_EN_GPT12 , +prm_write_mod_reg (OMAP3430_EN_IO_MASK |OMAP3430_EN_GPIO1_MASK | +OMAP3430_EN_GPT1_MASK |OMAP3430_EN_GPT12_MASK ,WKUP_MOD ,PM_WKEN );/* No need to write EN_IO, that is always enabled */ -prm_write_mod_reg (OMAP3430_EN_GPIO1 |OMAP3430_EN_GPT1 | -OMAP3430_EN_GPT12 , +prm_write_mod_reg (OMAP3430_EN_GPIO1_MASK |OMAP3430_EN_GPT1_MASK | +OMAP3430_EN_GPT12_MASK ,WKUP_MOD ,OMAP3430_PM_MPUGRPSEL );/* For some reason IO doesn't generate wakeup event even if * it is selected to mpu wakeup goup */
@@ -899,18 +899,18 @@ static void __init prcm_setup_regs(void) OMAP3430_DSS_MOD, PM_WKEN);/* Enable wakeups in PER */ -prm_write_mod_reg (OMAP3430_EN_GPIO2 |OMAP3430_EN_GPIO3 | -OMAP3430_EN_GPIO4 |OMAP3430_EN_GPIO5 | -OMAP3430_EN_GPIO6 |OMAP3430_EN_UART3 | -OMAP3430_EN_MCBSP2 |OMAP3430_EN_MCBSP3 | -OMAP3430_EN_MCBSP4 , +prm_write_mod_reg (OMAP3430_EN_GPIO2_MASK |OMAP3430_EN_GPIO3_MASK | +OMAP3430_EN_GPIO4_MASK |OMAP3430_EN_GPIO5_MASK | +OMAP3430_EN_GPIO6_MASK |OMAP3430_EN_UART3_MASK | +OMAP3430_EN_MCBSP2_MASK |OMAP3430_EN_MCBSP3_MASK | +OMAP3430_EN_MCBSP4_MASK ,OMAP3430_PER_MOD ,PM_WKEN );/* and allow them to wake up MPU */ -prm_write_mod_reg (OMAP3430_GRPSEL_GPIO2_MASK |OMAP3430_EN_GPIO3 | -OMAP3430_GRPSEL_GPIO4_MASK |OMAP3430_EN_GPIO5 | -OMAP3430_GRPSEL_GPIO6_MASK |OMAP3430_EN_UART3 | -OMAP3430_EN_MCBSP2 |OMAP3430_EN_MCBSP3 | -OMAP3430_EN_MCBSP4 , +prm_write_mod_reg (OMAP3430_GRPSEL_GPIO2_MASK |OMAP3430_EN_GPIO3_MASK | +OMAP3430_GRPSEL_GPIO4_MASK |OMAP3430_EN_GPIO5_MASK | +OMAP3430_GRPSEL_GPIO6_MASK |OMAP3430_EN_UART3_MASK | +OMAP3430_EN_MCBSP2_MASK |OMAP3430_EN_MCBSP3_MASK | +OMAP3430_EN_MCBSP4_MASK ,OMAP3430_PER_MOD ,OMAP3430_PM_MPUGRPSEL );/* Don't attach IVA interrupts */
arch/arm/mach-omap2/powerdomain.c +1 -1
@@ -1004,7 +1004,7 @@ int pwrdm_wait_transition(struct powerdomain *pwrdm)/* XXX Is this udelay() value meaningful? */ while ((prm_read_mod_reg (pwrdm->prcm_offs, pwrstst_reg_offs) & -OMAP_INTRANSITION ) && +OMAP_INTRANSITION_MASK ) && (c++ <PWRDM_TRANSITION_BAILOUT ))udelay (1 );
arch/arm/mach-omap2/prcm-common.h +73 -73
260 lines not on this page · raw message
arch/arm/mach-omap2/prcm.c +2 -2
@@ -158,10 +158,10 @@ void omap_prcm_arch_reset(char mode, const char *cmd)WARN_ON (1 );if (cpu_is_omap24xx () |cpu_is_omap34xx ()) -prm_set_mod_reg_bits (OMAP_RST_DPLL3 , prcm_offs, +prm_set_mod_reg_bits (OMAP_RST_DPLL3_MASK , prcm_offs,OMAP2_RM_RSTCTRL );if (cpu_is_omap44xx ()) -prm_set_mod_reg_bits (OMAP_RST_DPLL3 , prcm_offs, +prm_set_mod_reg_bits (OMAP_RST_DPLL3_MASK , prcm_offs,OMAP4_RM_RSTCTRL ); }
arch/arm/mach-omap2/prm.h +9 -9
@@ -284,7 +284,7 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)#define OMAP_OFFLOADMODE_MASK (0x3 << 3)#define OMAP_ONLOADMODE_SHIFT 1#define OMAP_ONLOADMODE_MASK (0x3 << 1) -#define OMAP_ENABLE (1 << 0) +#define OMAP_ENABLE_MASK (1 << 0)/* PRM_RSTTIME */ /* Named RM_RSTTIME_WKUP on the 24xx */
@@ -296,8 +296,8 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)/* PRM_RSTCTRL */ /* Named RM_RSTCTRL_WKUP on the 24xx */ /* 2420 calls RST_DPLL3 'RST_DPLL' */ -#define OMAP_RST_DPLL3 (1 << 2) -#define OMAP_RST_GS (1 << 1) +#define OMAP_RST_DPLL3_MASK (1 << 2) +#define OMAP_RST_GS_MASK (1 << 1)/*
@@ -316,7 +316,7 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)* PM_PWSTST_DSS, PM_PWSTST_CAM, PM_PWSTST_PER, PM_PWSTST_EMU, * PM_PWSTST_NEON */ -#define OMAP_INTRANSITION (1 << 20) +#define OMAP_INTRANSITION_MASK (1 << 20)/*
@@ -338,7 +338,7 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)* 3430: RM_RSTST_IVA2, RM_RSTST_MPU, RM_RSTST_GFX, RM_RSTST_DSS, * RM_RSTST_CAM, RM_RSTST_PER, RM_RSTST_NEON */ -#define OMAP_COREDOMAINWKUP_RST (1 << 3) +#define OMAP_COREDOMAINWKUP_RST_MASK (1 << 3)/* * 24XX: RM_RSTST_MPU, RM_RSTST_GFX, RM_RSTST_DSP
@@ -347,7 +347,7 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)* * 3430: RM_RSTST_CORE, RM_RSTST_EMU */ -#define OMAP_DOMAINWKUP_RST (1 << 2) +#define OMAP_DOMAINWKUP_RST_MASK (1 << 2)/* * 24XX: RM_RSTST_MPU, RM_RSTST_WKUP, RM_RSTST_DSP
@@ -357,8 +357,8 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)* * 3430: RM_RSTST_CORE, RM_RSTST_EMU */ -#define OMAP_GLOBALWARM_RST (1 << 1) -#define OMAP_GLOBALCOLD_RST (1 << 0) +#define OMAP_GLOBALWARM_RST_MASK (1 << 1) +#define OMAP_GLOBALCOLD_RST_MASK (1 << 0)/* * 24XX: PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_CORE, PM_WKDEP_DSP
@@ -382,7 +382,7 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)* PM_PWSTCTRL_DSS, PM_PWSTCTRL_CAM, PM_PWSTCTRL_PER, * PM_PWSTCTRL_NEON */ -#define OMAP_LOGICRETSTATE (1 << 2) +#define OMAP_LOGICRETSTATE_MASK (1 << 2)/* * 24XX: PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE, PM_PWSTCTRL_GFX,
Paul Walmsley
maintainerPATCH 4/4 OMAP3: PM: PM_MPUGRPSEL writes should use GRPSEL macros, not EN macros
In reply to Paul WalmsleyWrites to the PM_*GRPSEL registers should use _GRPSEL_ macros, not _EN_ macros, to match the TRM and guard against inadvertent error. This patch should not cause any functional change.
Signed-off-by Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Jouni Högander <[email protected]>
--- arch/arm/mach-omap2/pm34xx.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/pm34xx.c +12 -7
@@ -886,8 +886,9 @@ static void __init prcm_setup_regs(void)OMAP3430_EN_GPT1_MASK |OMAP3430_EN_GPT12_MASK , WKUP_MOD, PM_WKEN);/* No need to write EN_IO, that is always enabled */ -prm_write_mod_reg (OMAP3430_EN_GPIO1_MASK |OMAP3430_EN_GPT1_MASK | -OMAP3430_EN_GPT12_MASK , +prm_write_mod_reg (OMAP3430_GRPSEL_GPIO1_MASK | +OMAP3430_GRPSEL_GPT1_MASK | +OMAP3430_GRPSEL_GPT12_MASK ,WKUP_MOD ,OMAP3430_PM_MPUGRPSEL );/* For some reason IO doesn't generate wakeup event even if * it is selected to mpu wakeup goup */
@@ -906,11 +907,15 @@ static void __init prcm_setup_regs(void)OMAP3430_EN_MCBSP4_MASK , OMAP3430_PER_MOD, PM_WKEN);/* and allow them to wake up MPU */ -prm_write_mod_reg (OMAP3430_GRPSEL_GPIO2_MASK |OMAP3430_EN_GPIO3_MASK | -OMAP3430_GRPSEL_GPIO4_MASK |OMAP3430_EN_GPIO5_MASK | -OMAP3430_GRPSEL_GPIO6_MASK |OMAP3430_EN_UART3_MASK | -OMAP3430_EN_MCBSP2_MASK |OMAP3430_EN_MCBSP3_MASK | -OMAP3430_EN_MCBSP4_MASK , +prm_write_mod_reg (OMAP3430_GRPSEL_GPIO2_MASK | +OMAP3430_GRPSEL_GPIO3_MASK | +OMAP3430_GRPSEL_GPIO4_MASK | +OMAP3430_GRPSEL_GPIO5_MASK | +OMAP3430_GRPSEL_GPIO6_MASK | +OMAP3430_GRPSEL_UART3_MASK | +OMAP3430_GRPSEL_MCBSP2_MASK | +OMAP3430_GRPSEL_MCBSP3_MASK | +OMAP3430_GRPSEL_MCBSP4_MASK ,OMAP3430_PER_MOD ,OMAP3430_PM_MPUGRPSEL );/* Don't attach IVA interrupts */
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Paul Walmsley
This series standardizes the OMAP2+ PRCM register macro names to end in
_SHIFTfor bitshift counts and_MASKfor bitmasks. This is already the case for many of the macros, but others were unconverted; this series finally fixes those and their users in mainline.These patches will cause Kevin some merge pain, which is regrettable, but there seems to be no good time to do this sort of thing.
Merge pain accepted, this is a good cleanup.
That's the price I pay for having out of tree branches.
Kevin