Skip to contentSkip to conversation

armv8: ls1028a: define esdhc_status_fixup

PATCH New Xiaowei Bao 2 participants 2 messages Apr 14, 2020 – Apr 21, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 armv8: ls1028a: define esdhc_status_fixup

From: Yinbo Zhu <[email protected]>

This patch is to define esdhc_status_fixup function for ls1028a to disable SDHC1/SDHC2 status in device tree node if not selected.

---
 .../include/asm/arch-fsl-layerscape/immap_lsch3.h  |  5 +++
 board/freescale/ls1028a/ls1028a.c                  | 40 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +5 -0
index 299201b..c2fbc23 100644
@@ -232,7 +232,12 @@
 #define DCFG_PORSR1			0x000
 #define DCFG_PORSR1_RCW_SRC		0xff800000
 #define DCFG_PORSR1_RCW_SRC_NOR		0x12f00000
+#define DCFG_RCWSR12			0x12c
+#define DCFG_RCWSR12_SDHC_SHIFT		24
+#define DCFG_RCWSR12_SDHC_MASK		0x7
 #define DCFG_RCWSR13			0x130
+#define DCFG_RCWSR13_SDHC_SHIFT		3
+#define DCFG_RCWSR13_SDHC_MASK		0x7
 #define DCFG_RCWSR13_DSPI		(0 << 8)
 #define DCFG_RCWSR15			0x138
 #define DCFG_RCWSR15_IFCGRPABASE_QSPI	0x3
board/freescale/ls1028a/ls1028a.c +40 -0
index aa93534..a8bdd12 100644
@@ -135,6 +135,46 @@ void detail_board_ddr_info(void)
 	print_ddr_info(0);
 }
 
+int esdhc_status_fixup(void *blob, const char *compat)
+{
+	void __iomem *dcfg_ccsr = (void __iomem *)DCFG_BASE;
+	char esdhc1_path[] = "/soc/mmc at 2140000";
+	char esdhc2_path[] = "/soc/mmc at 2150000";
+	char dspi1_path[] = "/soc/spi at 2100000";
+	char dspi2_path[] = "/soc/spi@2110000";
+	u32 mux_sdhc1, mux_sdhc2;
+	u32 io = 0;
+
+	/*
+	 * The PMUX IO-expander for mux select is used to control
+	 * the muxing of various onboard interfaces.
+	 */
+
+	io = in_le32(dcfg_ccsr + DCFG_RCWSR12);
+	mux_sdhc1 = (io >> DCFG_RCWSR12_SDHC_SHIFT) & DCFG_RCWSR12_SDHC_MASK;
+
+	/* Disable esdhc1/dspi1 if not selected. */
+	if (mux_sdhc1 != 0)
+		do_fixup_by_path(blob, esdhc1_path, "status", "disabled",
+				 sizeof("disabled"), 1);
+	if (mux_sdhc1 != 2)
+		do_fixup_by_path(blob, dspi1_path, "status", "disabled",
+				 sizeof("disabled"), 1);
+
+	io = in_le32(dcfg_ccsr + DCFG_RCWSR13);
+	mux_sdhc2 = (io >> DCFG_RCWSR13_SDHC_SHIFT) & DCFG_RCWSR13_SDHC_MASK;
+
+	/* Disable esdhc2/dspi2 if not selected. */
+	if (mux_sdhc2 != 0)
+		do_fixup_by_path(blob, esdhc2_path, "status", "disabled",
+				 sizeof("disabled"), 1);
+	if (mux_sdhc2 != 2)
+		do_fixup_by_path(blob, dspi2_path, "status", "disabled",
+				 sizeof("disabled"), 1);
+
+	return 0;
+}
+
 #ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 armv8: ls1028a: define esdhc_status_fixup

Quoted 12 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Xiaowei Bao
Sent: Tuesday, April 14, 2020 2:55 PM
To: Sudhanshu Gupta <[email protected]>; Harninder Rai <[email protected]>; rajesh.bhagat at nxp.co; Andy Tang <[email protected]>; u-boot at lists.denx.de
Cc: Yinbo Zhu <[email protected]>; Xiaowei Bao <[email protected]>; Y.b. Lu <[email protected]>
Subject: [PATCH] armv8: ls1028a: define esdhc_status_fixup

From: Yinbo Zhu <[email protected]>

Quoted 7 lines

This patch is to define esdhc_status_fixup function for ls1028a to disable SDHC1/SDHC2 status in device tree node if not selected.

---

Applied to fsl-qoriq. Awaiting upstream.

Thanks
Priyanka