From: Tony Lindgren <tony@atomide.com>
Date: Tue, 27 Jul 2021 10:10:33 +0000 (+0300)
Subject: memory: omap-gpmc: Clear GPMC_CS_CONFIG7 register on restore if unused
X-Git-Tag: microblaze-v5.16~143^2~8^2^2~1
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0f78964b523fe9920deae3455324060356ae53d0;p=linux-2.6-microblaze.git

memory: omap-gpmc: Clear GPMC_CS_CONFIG7 register on restore if unused

We want to clear any unused GPMC_CS_CONFIG7 register on restore to
ensure unused chip selects are not enabled.

Cc: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20210727101034.32148-1-tony@atomide.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index f80c2ea39ca4..55752c858f3e 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2595,6 +2595,8 @@ void omap3_gpmc_restore_context(void)
 				gpmc_context.cs_context[i].config6);
 			gpmc_cs_write_reg(i, GPMC_CS_CONFIG7,
 				gpmc_context.cs_context[i].config7);
+		} else {
+			gpmc_cs_write_reg(i, GPMC_CS_CONFIG7, 0);
 		}
 	}
 }