Skip to contentSkip to conversation

arm: sunxi: Allow per-platform DRAM ZQ configuration on sun8i

PATCH New Paul Kocialkowski 3 participants 11 messages Mar 14, 2019 – Apr 9, 2019

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

PATCH 1/3 arm: sunxi: Allow per-platform DRAM ZQ configuration on sun8i

A few sun8i platforms define specific default DRAM ZQ values, but they are not taken in account because of MACH_SUN8I being used for the 123 default first.

Replace MACH_SUN8I with the list of platforms that don't have specific DRAM ZQ values, to avoid overwriting the default for those that do.

---
 arch/arm/mach-sunxi/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +3 -1
index 74e234cded75..c557c79ef097 100644
@@ -414,7 +414,9 @@ endif
 
 config DRAM_ZQ
 	int "sunxi dram zq value"
-	default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN8I
+	default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \
+		       MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T || \
+		       MACH_SUNXI_H3_H5
 	default 127 if MACH_SUN7I
 	default 14779 if MACH_SUN8I_V3S
 	default 3881979 if MACH_SUN8I_R40 || MACH_SUN50I_H6
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 arm: sunxi: Set the default DRAM ZQ value to 3881979 on H3/H5

Most H3/H5 boards we support have the DRAM ZQ value set to 3881979, which is also consistent with the default set for the R40.

Make this value the default on H3/H5 instead of 123.

---
 arch/arm/mach-sunxi/Kconfig                   | 5 ++---
 configs/bananapi_m2_plus_h3_defconfig         | 1 -
 configs/bananapi_m2_plus_h5_defconfig         | 1 -
 configs/bananapi_m2_zero_defconfig            | 1 -
 configs/libretech_all_h3_cc_h2_plus_defconfig | 1 -
 configs/libretech_all_h3_cc_h3_defconfig      | 1 -
 configs/libretech_all_h3_cc_h5_defconfig      | 1 -
 configs/nanopi_m1_defconfig                   | 1 -
 configs/nanopi_m1_plus_defconfig              | 1 -
 configs/nanopi_neo_air_defconfig              | 1 -
 configs/nanopi_neo_defconfig                  | 1 -
 configs/orangepi_2_defconfig                  | 1 -
 configs/orangepi_lite_defconfig               | 1 -
 configs/orangepi_one_defconfig                | 1 -
 configs/orangepi_pc_defconfig                 | 1 -
 configs/orangepi_pc_plus_defconfig            | 1 -
 configs/orangepi_plus2e_defconfig             | 1 -
 configs/orangepi_plus_defconfig               | 1 -
 configs/orangepi_r1_defconfig                 | 1 -
 configs/orangepi_zero_defconfig               | 1 -
 20 files changed, 2 insertions(+), 22 deletions(-)
arch/arm/mach-sunxi/Kconfig +2 -3
index c557c79ef097..10d5c5b5cb0f 100644
@@ -415,11 +415,10 @@ endif
 config DRAM_ZQ
 	int "sunxi dram zq value"
 	default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \
-		       MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T || \
-		       MACH_SUNXI_H3_H5
+		       MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T
 	default 127 if MACH_SUN7I
 	default 14779 if MACH_SUN8I_V3S
-	default 3881979 if MACH_SUN8I_R40 || MACH_SUN50I_H6
+	default 3881979 if MACH_SUNXI_H3_H5 || MACH_SUN8I_R40 || MACH_SUN50I_H6
 	default 4145117 if MACH_SUN9I
 	default 3881915 if MACH_SUN50I
 	---help---
configs/bananapi_m2_plus_h3_defconfig +0 -1
index 597618fb900b..b906942b2430 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/bananapi_m2_plus_h5_defconfig +0 -1
index e7c10dbdf2d0..4d70cb632fe9 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/bananapi_m2_zero_defconfig +0 -1
index 91302eb49cf8..4cabf32ffc72 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN=""
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h2_plus_defconfig +0 -1
index 8f3144895c6d..7a83e0752ec2 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/libretech_all_h3_cc_h3_defconfig +0 -1
index e5e0f593a7db..e2ebc7527f2f 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/libretech_all_h3_cc_h5_defconfig +0 -1
index e4a93bde481f..30c1aa21b713 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_m1_defconfig +0 -1
index b3a7870ea9a6..222a8f9eaf35 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_m1_plus_defconfig +0 -1
index b83cdf2e1ccd..0f30e0f3301e 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN="PH13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/nanopi_neo_air_defconfig +0 -1
index 33f9c0746c16..47f6232fdcba 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_neo_defconfig +0 -1
index 40f5bd176e59..d5ef0e3fd336 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_2_defconfig +0 -1
index ab6566e49a8b..54427762ff1f 100644
@@ -4,7 +4,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_lite_defconfig +0 -1
index 1092a852503a..2a5aa6e014d8 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_one_defconfig +0 -1
index 404fdd91197b..9ed1eccb3086 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_pc_defconfig +0 -1
index de11df755e4e..0fe1ca81e066 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_pc_plus_defconfig +0 -1
index ce26cfaf9b55..c601937f7cfa 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_plus2e_defconfig +0 -1
index b0813e4e10b0..90ab51bd0d2d 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/orangepi_plus_defconfig +0 -1
index 05023737a956..49796ac19809 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/orangepi_r1_defconfig +0 -1
index 05c3b08b766e..87f076f827f9 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
configs/orangepi_zero_defconfig +0 -1
index 44fc18b7b1ed..b3376b4f10ee 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/3 arm: sunxi: Set the default DRAM ZQ value to 3881979 on H3/H5

Quoted 8 lines · Paul Kocialkowski

Most H3/H5 boards we support have the DRAM ZQ value set to 3881979, which is also consistent with the default set for the R40.

Make this value the default on H3/H5 instead of 123.

---

Applied to u-boot-sunxi/master

#3 lore raw

PATCH 3/3 arm: sunxi: Enable DRAM ODT by default on H3/H5

In reply to Paul Kocialkowski

Most of the boards we support with H3/H5 enable DRAM on-die termination, which is consistent with the high DRAM clocks that are used.

Make it the default (like it's done for other similar platforms) instead of defining it in each defconfig.

---
 arch/arm/mach-sunxi/Kconfig                   | 1 +
 configs/bananapi_m2_plus_h3_defconfig         | 1 -
 configs/bananapi_m2_plus_h5_defconfig         | 1 -
 configs/bananapi_m2_zero_defconfig            | 1 -
 configs/emlid_neutis_n5_devboard_defconfig    | 1 +
 configs/libretech_all_h3_cc_h2_plus_defconfig | 1 -
 configs/libretech_all_h3_cc_h3_defconfig      | 1 -
 configs/libretech_all_h3_cc_h5_defconfig      | 1 -
 configs/nanopi_m1_defconfig                   | 1 -
 configs/nanopi_m1_plus_defconfig              | 1 -
 configs/nanopi_neo2_defconfig                 | 1 +
 configs/nanopi_neo_air_defconfig              | 1 -
 configs/nanopi_neo_defconfig                  | 1 -
 configs/nanopi_neo_plus2_defconfig            | 1 +
 configs/orangepi_2_defconfig                  | 1 -
 configs/orangepi_lite_defconfig               | 1 -
 configs/orangepi_one_defconfig                | 1 -
 configs/orangepi_pc2_defconfig                | 1 +
 configs/orangepi_pc_defconfig                 | 1 -
 configs/orangepi_pc_plus_defconfig            | 1 -
 configs/orangepi_plus2e_defconfig             | 1 -
 configs/orangepi_plus_defconfig               | 1 -
 configs/orangepi_prime_defconfig              | 1 +
 configs/orangepi_r1_defconfig                 | 1 -
 configs/orangepi_zero_defconfig               | 1 -
 configs/orangepi_zero_plus2_defconfig         | 1 +
 configs/orangepi_zero_plus_defconfig          | 1 +
 27 files changed, 8 insertions(+), 19 deletions(-)
arch/arm/mach-sunxi/Kconfig +1 -0
index 10d5c5b5cb0f..8234a76e7310 100644
@@ -427,6 +427,7 @@ config DRAM_ZQ
 config DRAM_ODT_EN
 	bool "sunxi dram odt enable"
 	default y if MACH_SUN8I_A23
+	default y if MACH_SUNXI_H3_H5
 	default y if MACH_SUN8I_R40
 	default y if MACH_SUN50I
 	default y if MACH_SUN50I_H6
configs/bananapi_m2_plus_h3_defconfig +0 -1
index b906942b2430..4e4734655fc9 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/bananapi_m2_plus_h5_defconfig +0 -1
index 4d70cb632fe9..29dd892d7f07 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/bananapi_m2_zero_defconfig +0 -1
index 4cabf32ffc72..8546674b2395 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN=""
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/emlid_neutis_n5_devboard_defconfig +1 -0
index 3df0ca13f04d..19e8d792556c 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h2_plus_defconfig +0 -1
index 7a83e0752ec2..3bccd6042910 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h3_defconfig +0 -1
index e2ebc7527f2f..c00ab01fdda4 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h5_defconfig +0 -1
index 30c1aa21b713..5843f34325b5 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_m1_defconfig +0 -1
index 222a8f9eaf35..af7fa0b20b2c 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/nanopi_m1_plus_defconfig +0 -1
index 0f30e0f3301e..84e152546b67 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN="PH13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_neo2_defconfig +1 -0
index 9de893adfaf9..2d44135bbc73 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/nanopi_neo_air_defconfig +0 -1
index 47f6232fdcba..bd099c8d6717 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_neo_defconfig +0 -1
index d5ef0e3fd336..074b172061fa 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_neo_plus2_defconfig +1 -0
index 88c76a55e53f..11cb8f61b03d 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_2_defconfig +0 -1
index 54427762ff1f..ce3cc8352cfc 100644
@@ -4,7 +4,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_lite_defconfig +0 -1
index 2a5aa6e014d8..490f5a3aae4d 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_one_defconfig +0 -1
index 9ed1eccb3086..949fc5d40f77 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_pc2_defconfig +1 -0
index ad837382c8e8..a5bac5b2926f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MACPWR="PD6"
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_pc_defconfig +0 -1
index 0fe1ca81e066..79d623719e30 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_I2C_SUPPORT=y
configs/orangepi_pc_plus_defconfig +0 -1
index c601937f7cfa..31e9bcf0b3f1 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_plus2e_defconfig +0 -1
index 90ab51bd0d2d..f31fd28a4f67 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_plus_defconfig +0 -1
index 49796ac19809..8a9ea272c3c1 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_USB1_VBUS_PIN="PG13"
configs/orangepi_prime_defconfig +1 -0
index 20ae6df5a0d4..0d64eebc099d 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_r1_defconfig +0 -1
index 87f076f827f9..6492d8580c16 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_defconfig +0 -1
index b3376b4f10ee..b881a8483179 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_plus2_defconfig +1 -0
index e62b3cb15041..ab0d12e750a3 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MMC0_CD_PIN="PH13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_plus_defconfig +1 -0
index cc8b8c7f9ab9..37ca6dff374f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
Signature · 1 line
2.20.1
#4 lore raw

PATCH 3/3 arm: sunxi: Enable DRAM ODT by default on H3/H5

Quoted 355 lines · Paul Kocialkowski

Most of the boards we support with H3/H5 enable DRAM on-die termination, which is consistent with the high DRAM clocks that are used.

Make it the default (like it's done for other similar platforms) instead of defining it in each defconfig.

---
 arch/arm/mach-sunxi/Kconfig                   | 1 +
 configs/bananapi_m2_plus_h3_defconfig         | 1 -
 configs/bananapi_m2_plus_h5_defconfig         | 1 -
 configs/bananapi_m2_zero_defconfig            | 1 -
 configs/emlid_neutis_n5_devboard_defconfig    | 1 +
 configs/libretech_all_h3_cc_h2_plus_defconfig | 1 -
 configs/libretech_all_h3_cc_h3_defconfig      | 1 -
 configs/libretech_all_h3_cc_h5_defconfig      | 1 -
 configs/nanopi_m1_defconfig                   | 1 -
 configs/nanopi_m1_plus_defconfig              | 1 -
 configs/nanopi_neo2_defconfig                 | 1 +
 configs/nanopi_neo_air_defconfig              | 1 -
 configs/nanopi_neo_defconfig                  | 1 -
 configs/nanopi_neo_plus2_defconfig            | 1 +
 configs/orangepi_2_defconfig                  | 1 -
 configs/orangepi_lite_defconfig               | 1 -
 configs/orangepi_one_defconfig                | 1 -
 configs/orangepi_pc2_defconfig                | 1 +
 configs/orangepi_pc_defconfig                 | 1 -
 configs/orangepi_pc_plus_defconfig            | 1 -
 configs/orangepi_plus2e_defconfig             | 1 -
 configs/orangepi_plus_defconfig               | 1 -
 configs/orangepi_prime_defconfig              | 1 +
 configs/orangepi_r1_defconfig                 | 1 -
 configs/orangepi_zero_defconfig               | 1 -
 configs/orangepi_zero_plus2_defconfig         | 1 +
 configs/orangepi_zero_plus_defconfig          | 1 +
 27 files changed, 8 insertions(+), 19 deletions(-)
arch/arm/mach-sunxi/Kconfig +1 -0
index 10d5c5b5cb0f..8234a76e7310 100644
@@ -427,6 +427,7 @@ config DRAM_ZQ
 config DRAM_ODT_EN
        bool "sunxi dram odt enable"
        default y if MACH_SUN8I_A23
+       default y if MACH_SUNXI_H3_H5
        default y if MACH_SUN8I_R40
        default y if MACH_SUN50I
        default y if MACH_SUN50I_H6
configs/bananapi_m2_plus_h3_defconfig +0 -1
index b906942b2430..4e4734655fc9 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/bananapi_m2_plus_h5_defconfig +0 -1
index 4d70cb632fe9..29dd892d7f07 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/bananapi_m2_zero_defconfig +0 -1
index 4cabf32ffc72..8546674b2395 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN=""
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/emlid_neutis_n5_devboard_defconfig +1 -0
index 3df0ca13f04d..19e8d792556c 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h2_plus_defconfig +0 -1
index 7a83e0752ec2..3bccd6042910 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h3_defconfig +0 -1
index e2ebc7527f2f..c00ab01fdda4 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h5_defconfig +0 -1
index 30c1aa21b713..5843f34325b5 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_m1_defconfig +0 -1
index 222a8f9eaf35..af7fa0b20b2c 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/nanopi_m1_plus_defconfig +0 -1
index 0f30e0f3301e..84e152546b67 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC0_CD_PIN="PH13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_neo2_defconfig +1 -0
index 9de893adfaf9..2d44135bbc73 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/nanopi_neo_air_defconfig +0 -1
index 47f6232fdcba..bd099c8d6717 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_neo_defconfig +0 -1
index d5ef0e3fd336..074b172061fa 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_neo_plus2_defconfig +1 -0
index 88c76a55e53f..11cb8f61b03d 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_2_defconfig +0 -1
index 54427762ff1f..ce3cc8352cfc 100644
@@ -4,7 +4,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_lite_defconfig +0 -1
index 2a5aa6e014d8..490f5a3aae4d 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_one_defconfig +0 -1
index 9ed1eccb3086..949fc5d40f77 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_pc2_defconfig +1 -0
index ad837382c8e8..a5bac5b2926f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MACPWR="PD6"
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_pc_defconfig +0 -1
index 0fe1ca81e066..79d623719e30 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_I2C_SUPPORT=y
configs/orangepi_pc_plus_defconfig +0 -1
index c601937f7cfa..31e9bcf0b3f1 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_plus2e_defconfig +0 -1
index 90ab51bd0d2d..f31fd28a4f67 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_plus_defconfig +0 -1
index 49796ac19809..8a9ea272c3c1 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ODT_EN=y
 CONFIG_MACPWR="PD6"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_USB1_VBUS_PIN="PG13"
configs/orangepi_prime_defconfig +1 -0
index 20ae6df5a0d4..0d64eebc099d 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
configs/orangepi_r1_defconfig +0 -1
index 87f076f827f9..6492d8580c16 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_defconfig +0 -1
index b3376b4f10ee..b881a8483179 100644
@@ -3,7 +3,6 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=624
-CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
 CONFIG_SPL_SPI_SUNXI=y
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_plus2_defconfig +1 -0
index e62b3cb15041..ab0d12e750a3 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set
 CONFIG_MMC0_CD_PIN="PH13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_zero_plus_defconfig +0 -0
index cc8b8c7f9ab9..37ca6dff374f 100644

configs/orangepi_zero_plus_defconfig CONFIG_SPL=y · line 7

Quoted 4 lines
configs/orangepi_zero_plus_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set

Why ODT not enabled these boards?

#5 lore raw

PATCH 3/3 arm: sunxi: Enable DRAM ODT by default on H3/H5

Hi,

Quoted 38 lines · Jagan Teki
Quoted 36 lines · Paul Kocialkowski

Most of the boards we support with H3/H5 enable DRAM on-die termination, which is consistent with the high DRAM clocks that are used.

Make it the default (like it's done for other similar platforms) instead of defining it in each defconfig.

---
 arch/arm/mach-sunxi/Kconfig                   | 1 +
 configs/bananapi_m2_plus_h3_defconfig         | 1 -
 configs/bananapi_m2_plus_h5_defconfig         | 1 -
 configs/bananapi_m2_zero_defconfig            | 1 -
 configs/emlid_neutis_n5_devboard_defconfig    | 1 +
 configs/libretech_all_h3_cc_h2_plus_defconfig | 1 -
 configs/libretech_all_h3_cc_h3_defconfig      | 1 -
 configs/libretech_all_h3_cc_h5_defconfig      | 1 -
 configs/nanopi_m1_defconfig                   | 1 -
 configs/nanopi_m1_plus_defconfig              | 1 -
 configs/nanopi_neo2_defconfig                 | 1 +
 configs/nanopi_neo_air_defconfig              | 1 -
 configs/nanopi_neo_defconfig                  | 1 -
 configs/nanopi_neo_plus2_defconfig            | 1 +
 configs/orangepi_2_defconfig                  | 1 -
 configs/orangepi_lite_defconfig               | 1 -
 configs/orangepi_one_defconfig                | 1 -
 configs/orangepi_pc2_defconfig                | 1 +
 configs/orangepi_pc_defconfig                 | 1 -
 configs/orangepi_pc_plus_defconfig            | 1 -
 configs/orangepi_plus2e_defconfig             | 1 -
 configs/orangepi_plus_defconfig               | 1 -
 configs/orangepi_prime_defconfig              | 1 +
 configs/orangepi_r1_defconfig                 | 1 -
 configs/orangepi_zero_defconfig               | 1 -
 configs/orangepi_zero_plus2_defconfig         | 1 +
 configs/orangepi_zero_plus_defconfig          | 1 +
 27 files changed, 8 insertions(+), 19 deletions(-)

[...]

Quoted 11 lines

configs/orangepi_zero_plus_defconfig CONFIG_SPL=y · line 7

Quoted 9 lines
configs/orangepi_zero_plus_defconfig +1 -0
index cc8b8c7f9ab9..37ca6dff374f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set

Why ODT not enabled these boards?

Because the config wasn't set before on these boards and I don't want to change the DRAM configuration of any board without testing.

It's very likely that enabling ODT would be a good idea on these boards too, but someone needs to test that before making the change.

Cheers,

Paul

Signature · 3 lines
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
#6 lore raw

PATCH 3/3 arm: sunxi: Enable DRAM ODT by default on H3/H5

Quoted 57 lines · Paul Kocialkowski

Hi,

Quoted 38 lines · Jagan Teki
Quoted 36 lines · Paul Kocialkowski

Most of the boards we support with H3/H5 enable DRAM on-die termination, which is consistent with the high DRAM clocks that are used.

Make it the default (like it's done for other similar platforms) instead of defining it in each defconfig.

---
 arch/arm/mach-sunxi/Kconfig                   | 1 +
 configs/bananapi_m2_plus_h3_defconfig         | 1 -
 configs/bananapi_m2_plus_h5_defconfig         | 1 -
 configs/bananapi_m2_zero_defconfig            | 1 -
 configs/emlid_neutis_n5_devboard_defconfig    | 1 +
 configs/libretech_all_h3_cc_h2_plus_defconfig | 1 -
 configs/libretech_all_h3_cc_h3_defconfig      | 1 -
 configs/libretech_all_h3_cc_h5_defconfig      | 1 -
 configs/nanopi_m1_defconfig                   | 1 -
 configs/nanopi_m1_plus_defconfig              | 1 -
 configs/nanopi_neo2_defconfig                 | 1 +
 configs/nanopi_neo_air_defconfig              | 1 -
 configs/nanopi_neo_defconfig                  | 1 -
 configs/nanopi_neo_plus2_defconfig            | 1 +
 configs/orangepi_2_defconfig                  | 1 -
 configs/orangepi_lite_defconfig               | 1 -
 configs/orangepi_one_defconfig                | 1 -
 configs/orangepi_pc2_defconfig                | 1 +
 configs/orangepi_pc_defconfig                 | 1 -
 configs/orangepi_pc_plus_defconfig            | 1 -
 configs/orangepi_plus2e_defconfig             | 1 -
 configs/orangepi_plus_defconfig               | 1 -
 configs/orangepi_prime_defconfig              | 1 +
 configs/orangepi_r1_defconfig                 | 1 -
 configs/orangepi_zero_defconfig               | 1 -
 configs/orangepi_zero_plus2_defconfig         | 1 +
 configs/orangepi_zero_plus_defconfig          | 1 +
 27 files changed, 8 insertions(+), 19 deletions(-)

[...]

Quoted 11 lines

configs/orangepi_zero_plus_defconfig CONFIG_SPL=y · line 7

Quoted 9 lines
configs/orangepi_zero_plus_defconfig +1 -0
index cc8b8c7f9ab9..37ca6dff374f 100644
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=624
 CONFIG_DRAM_ZQ=3881977
+# CONFIG_DRAM_ODT_EN is not set

Why ODT not enabled these boards?

Quoted 5 lines

Because the config wasn't set before on these boards and I don't want to change the DRAM configuration of any board without testing.

It's very likely that enabling ODT would be a good idea on these boards too, but someone needs to test that before making the change.

OK, let me test check it from my end.

#7 lore raw

PATCH 3/3 arm: sunxi: Enable DRAM ODT by default on H3/H5

In reply to Paul Kocialkowski
Quoted 9 lines · Paul Kocialkowski

Most of the boards we support with H3/H5 enable DRAM on-die termination, which is consistent with the high DRAM clocks that are used.

Make it the default (like it's done for other similar platforms) instead of defining it in each defconfig.

---

Applied to u-boot-sunxi/master

#8 lore raw

PATCH 1/3 arm: sunxi: Allow per-platform DRAM ZQ configuration on sun8i

In reply to Paul Kocialkowski

Hi Paul,

Quoted 18 lines · Paul Kocialkowski

A few sun8i platforms define specific default DRAM ZQ values, but they are not taken in account because of MACH_SUN8I being used for the 123 default first.

Replace MACH_SUN8I with the list of platforms that don't have specific DRAM ZQ values, to avoid overwriting the default for those that do.

---
 arch/arm/mach-sunxi/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +0 -0
index 74e234cded75..c557c79ef097 100644

arch/arm/mach-sunxi/Kconfig endif · line 422

Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +3 -1
@@ -414,7 +414,9 @@ endif
 
 config DRAM_ZQ
        int "sunxi dram zq value"
-       default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN8I
+       default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \
+                      MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T || \
+                      MACH_SUNXI_H3_H5
        default 127 if MACH_SUN7I
        default 14779 if MACH_SUN8I_V3S
        default 3881979 if MACH_SUN8I_R40 || MACH_SUN50I_H6

Would it work if these were just re-ordered so the more specific ones come first?

Thanks,

Signature · 4 lines
Julian Calaby

Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
#9 lore raw

PATCH 1/3 arm: sunxi: Allow per-platform DRAM ZQ configuration on sun8i

Hi Julian,

Quoted 22 lines · Julian Calaby

Hi Paul,

Quoted 18 lines · Paul Kocialkowski

A few sun8i platforms define specific default DRAM ZQ values, but they are not taken in account because of MACH_SUN8I being used for the 123 default first.

Replace MACH_SUN8I with the list of platforms that don't have specific DRAM ZQ values, to avoid overwriting the default for those that do.

---
 arch/arm/mach-sunxi/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +0 -0
index 74e234cded75..c557c79ef097 100644
@@ -414,7 +414,9 @@ endif
 
Quoted 12 lines

arch/arm/mach-sunxi/Kconfig endif · line 422

Quoted 9 lines
arch/arm/mach-sunxi/Kconfig +3 -1
 config DRAM_ZQ
        int "sunxi dram zq value"
-       default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN8I
+       default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \
+                      MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T || \
+                      MACH_SUNXI_H3_H5
        default 127 if MACH_SUN7I
        default 14779 if MACH_SUN8I_V3S
        default 3881979 if MACH_SUN8I_R40 || MACH_SUN50I_H6

Would it work if these were just re-ordered so the more specific ones come first?

Yes it looks like this would work, but I think it's better to be explicit and avoid any misunderstanding.

Cheers,

Paul

Signature · 3 lines
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
#10 lore raw

PATCH 1/3 arm: sunxi: Allow per-platform DRAM ZQ configuration on sun8i

In reply to Paul Kocialkowski
Quoted 10 lines · Paul Kocialkowski

A few sun8i platforms define specific default DRAM ZQ values, but they are not taken in account because of MACH_SUN8I being used for the 123 default first.

Replace MACH_SUN8I with the list of platforms that don't have specific DRAM ZQ values, to avoid overwriting the default for those that do.

---

Applied to u-boot-sunxi/master