Commit 882b71e47df2889c77105ddcfe34cbafa762a208

Authored by Paul Kocialkowski
Committed by Jagan Teki
1 parent 9c2b0ddc41

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.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>

Showing 20 changed files with 2 additions and 22 deletions Side-by-side Diff

arch/arm/mach-sunxi/Kconfig
... ... @@ -427,11 +427,10 @@
427 427 config DRAM_ZQ
428 428 int "sunxi dram zq value"
429 429 default 123 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || \
430   - MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T || \
431   - MACH_SUNXI_H3_H5
  430 + MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_A83T
432 431 default 127 if MACH_SUN7I
433 432 default 14779 if MACH_SUN8I_V3S
434   - default 3881979 if MACH_SUN8I_R40 || MACH_SUN50I_H6
  433 + default 3881979 if MACH_SUNXI_H3_H5 || MACH_SUN8I_R40 || MACH_SUN50I_H6
435 434 default 4145117 if MACH_SUN9I
436 435 default 3881915 if MACH_SUN50I
437 436 ---help---
configs/bananapi_m2_plus_h3_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MACPWR="PD6"
9 8 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/bananapi_m2_plus_h5_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN50I_H5=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MACPWR="PD6"
9 8 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/bananapi_m2_zero_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=408
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC0_CD_PIN=""
9 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/libretech_all_h3_cc_h2_plus_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
9 8 CONFIG_NR_DRAM_BANKS=1
configs/libretech_all_h3_cc_h3_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
9 8 CONFIG_NR_DRAM_BANKS=1
configs/libretech_all_h3_cc_h5_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN50I_H5=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
9 8 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_m1_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=408
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_NR_DRAM_BANKS=1
9 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/nanopi_m1_plus_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=408
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC0_CD_PIN="PH13"
9 8 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/nanopi_neo_air_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=408
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 # CONFIG_VIDEO_DE2 is not set
9 8 CONFIG_NR_DRAM_BANKS=1
configs/nanopi_neo_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=408
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 # CONFIG_VIDEO_DE2 is not set
9 8 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_2_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_SPL=y
5 5 CONFIG_MACH_SUN8I_H3=y
6 6 CONFIG_DRAM_CLK=672
7   -CONFIG_DRAM_ZQ=3881979
8 7 CONFIG_DRAM_ODT_EN=y
9 8 CONFIG_USB1_VBUS_PIN="PG13"
10 9 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_lite_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_NR_DRAM_BANKS=1
9 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_one_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_NR_DRAM_BANKS=1
9 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_pc_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=624
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_NR_DRAM_BANKS=1
9 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/orangepi_pc_plus_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=624
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
9 8 CONFIG_NR_DRAM_BANKS=1
configs/orangepi_plus2e_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MACPWR="PD6"
9 8 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/orangepi_plus_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=672
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 CONFIG_MACPWR="PD6"
9 8 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
configs/orangepi_r1_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=624
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 # CONFIG_VIDEO_DE2 is not set
9 8 CONFIG_SPL_SPI_SUNXI=y
configs/orangepi_zero_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SPL=y
4 4 CONFIG_MACH_SUN8I_H3=y
5 5 CONFIG_DRAM_CLK=624
6   -CONFIG_DRAM_ZQ=3881979
7 6 CONFIG_DRAM_ODT_EN=y
8 7 # CONFIG_VIDEO_DE2 is not set
9 8 CONFIG_SPL_SPI_SUNXI=y