X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fram%2Fstm32_sdram.c;h=f6cac8eb90bfd542f70b07862a1e6e07808befb4;hb=af7716250454566f1cdb48aa70b7458665693964;hp=fdf088e783362398dcdc69d7e41ba66d73c7311a;hpb=2ee87b0c1a5439e4ad6467cb8d5e8fb58922ca4b;p=oweals%2Fu-boot.git

diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index fdf088e783..f6cac8eb90 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * (C) Copyright 2017
- * Vikas Manocha, <vikas.manocha@st.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
  */
 
 #include <common.h>
@@ -11,7 +10,10 @@
 #include <ram.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
+#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
 
 struct stm32_fmc_regs {
 	/* 0x0 */
@@ -253,9 +255,40 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)
 {
 	struct stm32_sdram_params *params = dev_get_platdata(dev);
 	struct bank_params *bank_params;
+	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;
+
+	ret = dev_read_phandle_with_args(dev, "st,syscfg", NULL, 0, 0,
+						 &args);
+	if (ret) {
+		dev_dbg(dev, "%s: can't find syscon device (%d)\n", __func__, ret);
+	} else {
+		syscfg_base = (u32 *)ofnode_get_addr(args.node);
+
+		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) {
 		/* extract the bank index from DT */