Skip to contentSkip to conversation

tegra_mmc: get tap and trim from dts

PATCH In review Svyatoslav Ryhel 2 participants 5 messages Oct 3, 2023 – Nov 4, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover tegra_mmc: get tap and trim from dts

Default-tap and default-trim values are used for eMMC setup mostly on T114+ devices. As for now, those values are hardcoded for T210 and ignored for all other Tegra generations. Fix this by passing tap and trim values from dts.

---
Changes from v2
- no changes, re-sending

Changes from v1
- move t210 device tree fix into this series
- switch dev_read_u32_default > dev_read_u32
- if reading of device tree tap/trim values returns error store error in entries of driver structure
- apply tap and trim only if they pass error check
---

Svyatoslav Ryhel (2):
ARM: tegra210: set default-tap and default-trim values in sdhci nodes
mmc: tegra: get default-tap and default-trim from device tree

 arch/arm/dts/tegra210.dtsi                  |  8 ++++
 arch/arm/include/asm/arch-tegra/tegra_mmc.h | 17 +++----
 drivers/mmc/tegra_mmc.c                     | 52 +++++++++++----------
 3 files changed, 44 insertions(+), 33 deletions(-)
Signature · 1 line
2.39.2
#1 lore raw

PATCH v3 1/2 ARM: tegra210: set default-tap and default-trim values in sdhci nodes

Tegra MMC driver has hardcoded tap and trim values as for now. Set default-tap and default-trim values in sdhci nodes to avoid regressions in case Tegra MMC driver is upated to use dts values.

---
 arch/arm/dts/tegra210.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/dts/tegra210.dtsi +8 -0
index a521a43d6c..28ecd2b467 100644
@@ -704,6 +704,8 @@
 		clock-names = "sdhci";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
+		nvidia,default-tap = <0x2>;
+		nvidia,default-trim = <0x4>;
 		status = "disabled";
 	};
 
@@ -715,6 +717,8 @@
 		clock-names = "sdhci";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
+		nvidia,default-tap = <0x8>;
+		nvidia,default-trim = <0x0>;
 		status = "disabled";
 	};
 
@@ -726,6 +730,8 @@
 		clock-names = "sdhci";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
+		nvidia,default-tap = <0x3>;
+		nvidia,default-trim = <0x3>;
 		status = "disabled";
 	};
 
@@ -737,6 +743,8 @@
 		clock-names = "sdhci";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
+		nvidia,default-tap = <0x8>;
+		nvidia,default-trim = <0x0>;
 		status = "disabled";
 	};
 
Signature · 1 line
2.39.2
#2 lore raw

Re: [PATCH v3 1/2] ARM: tegra210: set default-tap and default-trim values in sdhci nodes

Quoted 5 lines · Svyatoslav Ryhel

Tegra MMC driver has hardcoded tap and trim values as for now. Set default-tap and default-trim values in sdhci nodes to avoid regressions in case Tegra MMC driver is upated to use dts values.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#3 lore raw

PATCH v3 2/2 mmc: tegra: get default-tap and default-trim from device tree

In reply to Svyatoslav Ryhel

Default-tap and default-trim values are used for eMMC setup mostly on T114+ devices. As for now, those values are hardcoded for T210 and ignored for all other Tegra generations. Fix this by passing tap and trim values from dts.

---
 arch/arm/include/asm/arch-tegra/tegra_mmc.h | 17 +++----
 drivers/mmc/tegra_mmc.c                     | 52 +++++++++++----------
 2 files changed, 36 insertions(+), 33 deletions(-)
arch/arm/include/asm/arch-tegra/tegra_mmc.h +9 -8
index d6a55764ba..750c7d809e 100644
@@ -128,21 +128,22 @@ struct tegra_mmc {
 
 /* SDMMC1/3 settings from SDMMCx Initialization Sequence of TRM */
 #define MEMCOMP_PADCTRL_VREF	7
-#define AUTO_CAL_ENABLE		(1 << 29)
-#define AUTO_CAL_ACTIVE		(1 << 31)
-#define AUTO_CAL_START		(1 << 31)
+#define AUTO_CAL_ENABLE		BIT(29)
+#define AUTO_CAL_ACTIVE		BIT(31)
+#define AUTO_CAL_START		BIT(31)
+
 #if defined(CONFIG_TEGRA210)
 #define AUTO_CAL_PD_OFFSET	(0x7D << 8)
 #define AUTO_CAL_PU_OFFSET	(0 << 0)
-#define IO_TRIM_BYPASS_MASK	(1 << 2)
-#define TRIM_VAL_SHIFT		24
-#define TRIM_VAL_MASK		(0x1F << TRIM_VAL_SHIFT)
-#define TAP_VAL_SHIFT		16
-#define TAP_VAL_MASK		(0xFF << TAP_VAL_SHIFT)
 #else
 #define AUTO_CAL_PD_OFFSET	(0x70 << 8)
 #define AUTO_CAL_PU_OFFSET	(0x62 << 0)
 #endif
 
+#define TRIM_VAL_SHIFT		24
+#define TRIM_VAL_MASK		(0x1F << TRIM_VAL_SHIFT)
+#define TAP_VAL_SHIFT		16
+#define TAP_VAL_MASK		(0xFF << TAP_VAL_SHIFT)
+
 #endif	/* __ASSEMBLY__ */
 #endif	/* __TEGRA_MMC_H_ */
drivers/mmc/tegra_mmc.c +27 -25

76 lines not on this page · raw message

Signature · 1 line
2.39.2
#4 lore raw

Re: [PATCH v3 2/2] mmc: tegra: get default-tap and default-trim from device tree

Quoted 6 lines · Svyatoslav Ryhel

Default-tap and default-trim values are used for eMMC setup mostly on T114+ devices. As for now, those values are hardcoded for T210 and ignored for all other Tegra generations. Fix this by passing tap and trim values from dts.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom