diff options
| author | Paul Walmsley <paul@pwsan.com> | 2010-05-18 20:40:23 -0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-05-20 14:31:05 -0400 |
| commit | 275f675c24a16ea45cc78bc03ff73fd06be8bffb (patch) | |
| tree | 732345d38b5fd067ee81c027ebd9542a87f27cca /arch | |
| parent | 2fd0f75cb3413105ed10041c719346ccb710fbc6 (diff) | |
OMAP3: PM: PM_MPUGRPSEL writes should use GRPSEL macros, not EN macros
Writes 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 <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Jouni Högander <jouni.hogander@nokia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index b2c299d9f428..2e967716cc3f 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
| @@ -901,8 +901,9 @@ static void __init prcm_setup_regs(void) | |||
| 901 | OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK, | 901 | OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK, |
| 902 | WKUP_MOD, PM_WKEN); | 902 | WKUP_MOD, PM_WKEN); |
| 903 | /* No need to write EN_IO, that is always enabled */ | 903 | /* No need to write EN_IO, that is always enabled */ |
| 904 | prm_write_mod_reg(OMAP3430_EN_GPIO1_MASK | OMAP3430_EN_GPT1_MASK | | 904 | prm_write_mod_reg(OMAP3430_GRPSEL_GPIO1_MASK | |
| 905 | OMAP3430_EN_GPT12_MASK, | 905 | OMAP3430_GRPSEL_GPT1_MASK | |
| 906 | OMAP3430_GRPSEL_GPT12_MASK, | ||
| 906 | WKUP_MOD, OMAP3430_PM_MPUGRPSEL); | 907 | WKUP_MOD, OMAP3430_PM_MPUGRPSEL); |
| 907 | /* For some reason IO doesn't generate wakeup event even if | 908 | /* For some reason IO doesn't generate wakeup event even if |
| 908 | * it is selected to mpu wakeup goup */ | 909 | * it is selected to mpu wakeup goup */ |
| @@ -921,11 +922,15 @@ static void __init prcm_setup_regs(void) | |||
| 921 | OMAP3430_EN_MCBSP4_MASK, | 922 | OMAP3430_EN_MCBSP4_MASK, |
| 922 | OMAP3430_PER_MOD, PM_WKEN); | 923 | OMAP3430_PER_MOD, PM_WKEN); |
| 923 | /* and allow them to wake up MPU */ | 924 | /* and allow them to wake up MPU */ |
| 924 | prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK | OMAP3430_EN_GPIO3_MASK | | 925 | prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK | |
| 925 | OMAP3430_GRPSEL_GPIO4_MASK | OMAP3430_EN_GPIO5_MASK | | 926 | OMAP3430_GRPSEL_GPIO3_MASK | |
| 926 | OMAP3430_GRPSEL_GPIO6_MASK | OMAP3430_EN_UART3_MASK | | 927 | OMAP3430_GRPSEL_GPIO4_MASK | |
| 927 | OMAP3430_EN_MCBSP2_MASK | OMAP3430_EN_MCBSP3_MASK | | 928 | OMAP3430_GRPSEL_GPIO5_MASK | |
| 928 | OMAP3430_EN_MCBSP4_MASK, | 929 | OMAP3430_GRPSEL_GPIO6_MASK | |
| 930 | OMAP3430_GRPSEL_UART3_MASK | | ||
| 931 | OMAP3430_GRPSEL_MCBSP2_MASK | | ||
| 932 | OMAP3430_GRPSEL_MCBSP3_MASK | | ||
| 933 | OMAP3430_GRPSEL_MCBSP4_MASK, | ||
| 929 | OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); | 934 | OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL); |
| 930 | 935 | ||
| 931 | /* Don't attach IVA interrupts */ | 936 | /* Don't attach IVA interrupts */ |