sama7d65_curiosity_pro: update DDR3L device

LiBinSHA · noglitch · commit b472683896aa · 2025-09-23T15:38:13.000+02:00
Use W638GU6RB11 instead of W638GU6QB12 in DRAM configuration of
sama7d65_curiosity_pro. DDR3L W638GU6QB12 is kept to configure
sama7d65_curiosity_pro older rev. X1.
Configure 8Gb DDR3L DDR_W638GU6RB11 in 1866K speed bin.
Set the device with ODT impedance to 60 and output impedance to 40.

Signed-off-by: Li Bin &lt;bin.li@microchip.com&gt;
Tested-by: Ryan Wanner &lt;ryan.wanner@microchip.com&gt;
Acked-by: Nicolas Ferre &lt;nicolas.ferre@microchip.com&gt;
diff --git a/Kconfig b/Kconfig
@@ -594,6 +594,7 @@ config DDR_DRIVER_IMPEDANCE
 	default 40 if DDR_W632GU6NB12I
 	default 40 if DDR_W634GU6NB12I
 	default 40 if DDR_W638GU6QB12
+	default 40 if DDR_W638GU6RB11
 	default 40 if DDR_AS4C512M16D3LA_10BIN
 	default 40 if DDR_AS4C128M16D2A_25BAN
 	default 40 if DDR_EM68D16CBQC_18IH
@@ -612,6 +613,7 @@ config DDR_ODT_IMPEDANCE
 	default 60 if DDR_W632GU6NB12I
 	default 60 if DDR_W634GU6NB12I
 	default 60 if DDR_W638GU6QB12
+	default 60 if DDR_W638GU6RB11
 	default 60 if DDR_AS4C512M16D3LA_10BIN
 	default 50 if DDR_MT47H128M16RT_25E_C
 	default 50 if DDR_W9751G6NB
diff --git a/configs/sama7d65_curiosity_pro-bsrnf_uboot_defconfig b/configs/sama7d65_curiosity_pro-bsrnf_uboot_defconfig
@@ -7,7 +7,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 CONFIG_NANDFLASH=y
diff --git a/configs/sama7d65_curiosity_pro-bsrsd1_uboot_defconfig b/configs/sama7d65_curiosity_pro-bsrsd1_uboot_defconfig
@@ -7,7 +7,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 CONFIG_SDCARD=y
diff --git a/configs/sama7d65_curiosity_pro_bkptnone_defconfig b/configs/sama7d65_curiosity_pro_bkptnone_defconfig
@@ -8,7 +8,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 # CONFIG_REDIRECT_ALL_INTS_AIC is not set
diff --git a/configs/sama7d65_curiosity_prodf_qspi_uboot_defconfig b/configs/sama7d65_curiosity_prodf_qspi_uboot_defconfig
@@ -6,7 +6,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 CONFIG_SPI_CLK=50000000
diff --git a/configs/sama7d65_curiosity_pronf_uboot_defconfig b/configs/sama7d65_curiosity_pronf_uboot_defconfig
@@ -7,7 +7,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 CONFIG_NANDFLASH=y
diff --git a/configs/sama7d65_curiosity_prosd1_uboot_defconfig b/configs/sama7d65_curiosity_prosd1_uboot_defconfig
@@ -7,7 +7,7 @@ CONFIG_CPU_CLK_800MHZ=y
 CONFIG_DEBUG=y
 CONFIG_CONSOLE_INDEX=19
 CONFIG_DDR_SET_BY_DEVICE=y
-CONFIG_DDR_W638GU6QB12=y
+CONFIG_DDR_W638GU6RB11=y
 CONFIG_DDR_8_GBIT=y
 CONFIG_MEM_CLOCK_533=y
 CONFIG_SDCARD=y
diff --git a/driver/Config.in.dram b/driver/Config.in.dram
@@ -155,10 +155,17 @@ config DDR_W634GU6NB12I
 	help
 		DDR3L W634GU6NB12I 32 Meg x 16 x 8 DDR3L-1600
 config DDR_W638GU6QB12
-	bool "DDR3L W638GU6QB12 (SAMA7D65 CURIOSITY-PRO)"
+	bool "DDR3L W638GU6QB12 (SAMA7D65 CURIOSITY PRO rev.X1)"
 	depends on UMCTL2
 	help
-		DDR3L W638GU6QB-12 64 Meg x 16 x 8 DDR3L-1600
+		DDR3L W638GU6QB12 64 Meg x 16 x 8 DDR3L-1600
+		Soldered on older X1 revision of SAMA7D65 Curiosity Pro
+config DDR_W638GU6RB11
+	bool "DDR3L W638GU6RB11 (SAMA7D65 CURIOSITY PRO)"
+	depends on UMCTL2
+	help
+		DDR3L W638GU6RB11 64 Meg x 16 x 8 DDR3L-1866
+		Soldered on official revision of SAMA7D65 Curiosity Pro
 config DDR_MT47H128M16RT_25E_C
 	bool "DDR2 MT47H128M16RT-25E:C(SAMA7G5_DDR2_EB)"
 	depends on UMCTL2
diff --git a/driver/driver_cpp.mk b/driver/driver_cpp.mk
@@ -96,6 +96,9 @@ endif
 ifeq ($(CONFIG_DDR_W638GU6QB12), y)
 CPPFLAGS += -DCONFIG_DDR3 -DCONFIG_DDR3_SPEED_BIN_1600K -DCONFIG_DDR_8_GBIT
 endif
+ifeq ($(CONFIG_DDR_W638GU6RB11), y)
+CPPFLAGS += -DCONFIG_DDR3 -DCONFIG_DDR3_SPEED_BIN_1866K -DCONFIG_DDR_8_GBIT
+endif
 ifeq ($(CONFIG_DDR_MT41K512M16HA_125), y)
 CPPFLAGS += -DCONFIG_DDR3 -DCONFIG_DDR3_SPEED_BIN_1600K -DCONFIG_DDR_8_GBIT
 endif
