[PATCH] ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask

From	Colin King <colin.king@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH] ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask
Date	2016-10-24 13:10 +0200
Message-ID	<svLiG-6PQ-37@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Colin Ian King <colin.king@canonical.com>

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>
---
 arch/arm/mach-omap2/prm3xxx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 62680aa..718981b 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 */
-- 
2.9.3

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask Colin King <colin.king@canonical.com> - 2016-10-24 13:10 +0200

csiph-web