From: Krunal Bhargav Date: Mon, 16 Sep 2019 08:17:17 +0000 (+0530) Subject: arm: omap: emif-common: Disable interleaving X-Git-Tag: v2020.01-rc1~29^2~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0a37a5e510a6772bb86d3cda8d1a2c14c01a0e2;p=oweals%2Fu-boot.git arm: omap: emif-common: Disable interleaving If ECC is enabled, we need to ensure interleaving is disabled for higher address space. Signed-off-by: Krunal Bhargav Signed-off-by: Lokesh Vutla --- diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index 04bbfd84a2..9bdaa388c9 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -355,6 +355,9 @@ static void dra7_enable_ecc(u32 base, const struct emif_regs *regs) return; if (regs->emif_ecc_ctrl_reg & EMIF_ECC_CTRL_REG_ECC_EN_MASK) { + /* Disable high-order interleaving */ + clrbits_le32(MA_PRIORITY, MA_HIMEM_INTERLEAVE_UN_MASK); + writel(regs->emif_ecc_address_range_1, &emif->emif_ecc_address_range_1); writel(regs->emif_ecc_address_range_2,