diff mbox

ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask

Message ID 20161024110021.10259-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Colin King Oct. 24, 2016, 11 a.m. UTC 
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(+)

Comments

Tony Lindgren Nov. 7, 2016, 11:23 p.m. UTC | #1 
* Colin King <colin.king@canonical.com> [161024 04:01]:
> 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.

Thanks applying into omap-for-v4.9/fixes.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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 */