X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fram%2Fstm32_sdram.c;h=3fddf4df9615370c739c9eb18549afc063d4bc0d;hb=abdbefba2a4e9666f798de13b4b88021f23b19f3;hp=ec2edd67dd19cf150d90bcff357c2a0332f78dd5;hpb=2ff1da9453030e02c1e750bd847c9b4dffb8f4a8;p=oweals%2Fu-boot.git

diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index ec2edd67dd..3fddf4df96 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -1,21 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
  * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <init.h>
+#include <log.h>
 #include <ram.h>
 #include <asm/io.h>
+#include <dm/device_compat.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
 
 #define MEM_MODE_MASK	GENMASK(2, 0)
+#define SWP_FMC_OFFSET 10
+#define SWP_FMC_MASK	GENMASK(SWP_FMC_OFFSET+1, SWP_FMC_OFFSET)
 #define NOT_FOUND	0xff
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct stm32_fmc_regs {
 	/* 0x0 */
 	u32 bcr1;	/* NOR/PSRAM Chip select control register 1 */
@@ -259,27 +263,36 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)
 	struct ofnode_phandle_args args;
 	u32 *syscfg_base;
 	u32 mem_remap;
+	u32 swp_fmc;
 	ofnode bank_node;
 	char *bank_name;
 	u8 bank = 0;
 	int ret;
 
-	mem_remap = dev_read_u32_default(dev, "st,mem_remap", NOT_FOUND);
-	if (mem_remap != NOT_FOUND) {
-		ret = dev_read_phandle_with_args(dev, "st,syscfg", NULL, 0, 0,
+	ret = dev_read_phandle_with_args(dev, "st,syscfg", NULL, 0, 0,
 						 &args);
-		if (ret) {
-			debug("%s: can't find syscon device (%d)\n", __func__,
-			      ret);
-			return ret;
-		}
-
+	if (ret) {
+		dev_dbg(dev, "%s: can't find syscon device (%d)\n", __func__, ret);
+	} else {
 		syscfg_base = (u32 *)ofnode_get_addr(args.node);
 
-		/* set memory mapping selection */
-		clrsetbits_le32(syscfg_base, MEM_MODE_MASK, mem_remap);
-	} else {
-		debug("%s: cannot find st,mem_remap property\n", __func__);
+		mem_remap = dev_read_u32_default(dev, "st,mem_remap", NOT_FOUND);
+		if (mem_remap != NOT_FOUND) {
+			/* set memory mapping selection */
+			clrsetbits_le32(syscfg_base, MEM_MODE_MASK, mem_remap);
+		} else {
+			dev_dbg(dev, "%s: cannot find st,mem_remap property\n", __func__);
+		}
+		
+		swp_fmc = dev_read_u32_default(dev, "st,swp_fmc", NOT_FOUND);
+		if (swp_fmc != NOT_FOUND) {
+			/* set fmc swapping selection */
+			clrsetbits_le32(syscfg_base, SWP_FMC_MASK, swp_fmc << SWP_FMC_OFFSET);
+		} else {
+			dev_dbg(dev, "%s: cannot find st,swp_fmc property\n", __func__);
+		}
+
+		dev_dbg(dev, "syscfg %x = %x\n", (u32)syscfg_base, *syscfg_base);
 	}
 
 	dev_for_each_subnode(bank_node, dev) {