diff options
author | Colin Ian King <colin.king@canonical.com> | 2016-10-24 07:00:21 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-11-07 18:21:53 -0500 |
commit | 4ae46efcff19445afbf49fe7038de6020f37fefe (patch) | |
tree | e979c7897cfabf00f537e93ee9e905ea85ba5ccf | |
parent | 271a3024db1f32ca34f504178fade6ef95cd6c9b (diff) |
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>
-rw-r--r-- | arch/arm/mach-omap2/prm3xxx.c | 3 |
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) | |||
319 | if (has_uart4) { | 319 | if (has_uart4) { |
320 | en_uart4_mask = OMAP3630_EN_UART4_MASK; | 320 | en_uart4_mask = OMAP3630_EN_UART4_MASK; |
321 | grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK; | 321 | grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK; |
322 | } else { | ||
323 | en_uart4_mask = 0; | ||
324 | grpsel_uart4_mask = 0; | ||
322 | } | 325 | } |
323 | 326 | ||
324 | /* Enable wakeups in PER */ | 327 | /* Enable wakeups in PER */ |