summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-10-24 13:00:21 +0200
committerTony Lindgren <tony@atomide.com>2016-11-08 00:21:53 +0100
commit4ae46efcff19445afbf49fe7038de6020f37fefe (patch)
treee979c7897cfabf00f537e93ee9e905ea85ba5ccf /arch
parentARM: dts: omap3: Fix memory node in Torpedo board (diff)
downloadlinux-4ae46efcff19445afbf49fe7038de6020f37fefe.tar.xz
linux-4ae46efcff19445afbf49fe7038de6020f37fefe.zip
ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask
In the case where has_uart4 is false, en_uart4_mask and grpsel_uart4_mask are not initialized and so any garbage value is being logically or'd into the write of PM_WKEN and OMAP3430_PM_MPUGRPSEL. Fix this by initializing these masks to zero. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/prm3xxx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 62680aad2126..718981bb80cd 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -319,6 +319,9 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
if (has_uart4) {
en_uart4_mask = OMAP3630_EN_UART4_MASK;
grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK;
+ } else {
+ en_uart4_mask = 0;
+ grpsel_uart4_mask = 0;
}
/* Enable wakeups in PER */