[U-Boot] [linux-sunxi] [PATCH 3/3] arm: sunxi: Enable DRAM ODT by default on H3/H5

Wed Apr 3 07:39:43 UTC 2019

On Thu, Mar 14, 2019 at 4:07 PM Paul Kocialkowski
<paul.kocialkowski at bootlin.com> wrote:
>
> 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.
>
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
> ---
>  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(-)
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index 10d5c5b5cb0f..8234a76e7310 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -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
> diff --git a/configs/bananapi_m2_plus_h3_defconfig b/configs/bananapi_m2_plus_h3_defconfig
> index b906942b2430..4e4734655fc9 100644
> --- a/configs/bananapi_m2_plus_h3_defconfig
> +++ b/configs/bananapi_m2_plus_h3_defconfig
> @@ -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
> diff --git a/configs/bananapi_m2_plus_h5_defconfig b/configs/bananapi_m2_plus_h5_defconfig
> index 4d70cb632fe9..29dd892d7f07 100644
> --- a/configs/bananapi_m2_plus_h5_defconfig
> +++ b/configs/bananapi_m2_plus_h5_defconfig
> @@ -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
> diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig
> index 4cabf32ffc72..8546674b2395 100644
> --- a/configs/bananapi_m2_zero_defconfig
> +++ b/configs/bananapi_m2_zero_defconfig
> @@ -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
> diff --git a/configs/emlid_neutis_n5_devboard_defconfig b/configs/emlid_neutis_n5_devboard_defconfig
> index 3df0ca13f04d..19e8d792556c 100644
> --- a/configs/emlid_neutis_n5_devboard_defconfig
> +++ b/configs/emlid_neutis_n5_devboard_defconfig
> @@ -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
> diff --git a/configs/libretech_all_h3_cc_h2_plus_defconfig b/configs/libretech_all_h3_cc_h2_plus_defconfig
> index 7a83e0752ec2..3bccd6042910 100644
> --- a/configs/libretech_all_h3_cc_h2_plus_defconfig
> +++ b/configs/libretech_all_h3_cc_h2_plus_defconfig
> @@ -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
> diff --git a/configs/libretech_all_h3_cc_h3_defconfig b/configs/libretech_all_h3_cc_h3_defconfig
> index e2ebc7527f2f..c00ab01fdda4 100644
> --- a/configs/libretech_all_h3_cc_h3_defconfig
> +++ b/configs/libretech_all_h3_cc_h3_defconfig
> @@ -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
> diff --git a/configs/libretech_all_h3_cc_h5_defconfig b/configs/libretech_all_h3_cc_h5_defconfig
> index 30c1aa21b713..5843f34325b5 100644
> --- a/configs/libretech_all_h3_cc_h5_defconfig
> +++ b/configs/libretech_all_h3_cc_h5_defconfig
> @@ -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
> diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
> index 222a8f9eaf35..af7fa0b20b2c 100644
> --- a/configs/nanopi_m1_defconfig
> +++ b/configs/nanopi_m1_defconfig
> @@ -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
> diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig
> index 0f30e0f3301e..84e152546b67 100644
> --- a/configs/nanopi_m1_plus_defconfig
> +++ b/configs/nanopi_m1_plus_defconfig
> @@ -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
> diff --git a/configs/nanopi_neo2_defconfig b/configs/nanopi_neo2_defconfig
> index 9de893adfaf9..2d44135bbc73 100644
> --- a/configs/nanopi_neo2_defconfig
> +++ b/configs/nanopi_neo2_defconfig
> @@ -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
> diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
> index 47f6232fdcba..bd099c8d6717 100644
> --- a/configs/nanopi_neo_air_defconfig
> +++ b/configs/nanopi_neo_air_defconfig
> @@ -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
> diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig
> index d5ef0e3fd336..074b172061fa 100644
> --- a/configs/nanopi_neo_defconfig
> +++ b/configs/nanopi_neo_defconfig
> @@ -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
> diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
> index 88c76a55e53f..11cb8f61b03d 100644
> --- a/configs/nanopi_neo_plus2_defconfig
> +++ b/configs/nanopi_neo_plus2_defconfig
> @@ -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
> diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
> index 54427762ff1f..ce3cc8352cfc 100644
> --- a/configs/orangepi_2_defconfig
> +++ b/configs/orangepi_2_defconfig
> @@ -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
> diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
> index 2a5aa6e014d8..490f5a3aae4d 100644
> --- a/configs/orangepi_lite_defconfig
> +++ b/configs/orangepi_lite_defconfig
> @@ -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
> diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
> index 9ed1eccb3086..949fc5d40f77 100644
> --- a/configs/orangepi_one_defconfig
> +++ b/configs/orangepi_one_defconfig
> @@ -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
> diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
> index ad837382c8e8..a5bac5b2926f 100644
> --- a/configs/orangepi_pc2_defconfig
> +++ b/configs/orangepi_pc2_defconfig
> @@ -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
> diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
> index 0fe1ca81e066..79d623719e30 100644
> --- a/configs/orangepi_pc_defconfig
> +++ b/configs/orangepi_pc_defconfig
> @@ -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
> diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig
> index c601937f7cfa..31e9bcf0b3f1 100644
> --- a/configs/orangepi_pc_plus_defconfig
> +++ b/configs/orangepi_pc_plus_defconfig
> @@ -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
> diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
> index 90ab51bd0d2d..f31fd28a4f67 100644
> --- a/configs/orangepi_plus2e_defconfig
> +++ b/configs/orangepi_plus2e_defconfig
> @@ -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
> diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
> index 49796ac19809..8a9ea272c3c1 100644
> --- a/configs/orangepi_plus_defconfig
> +++ b/configs/orangepi_plus_defconfig
> @@ -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"
> diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
> index 20ae6df5a0d4..0d64eebc099d 100644
> --- a/configs/orangepi_prime_defconfig
> +++ b/configs/orangepi_prime_defconfig
> @@ -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
> diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig
> index 87f076f827f9..6492d8580c16 100644
> --- a/configs/orangepi_r1_defconfig
> +++ b/configs/orangepi_r1_defconfig
> @@ -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
> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
> index b3376b4f10ee..b881a8483179 100644
> --- a/configs/orangepi_zero_defconfig
> +++ b/configs/orangepi_zero_defconfig
> @@ -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
> diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
> index e62b3cb15041..ab0d12e750a3 100644
> --- a/configs/orangepi_zero_plus2_defconfig
> +++ b/configs/orangepi_zero_plus2_defconfig
> @@ -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
> diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
> index cc8b8c7f9ab9..37ca6dff374f 100644
> --- a/configs/orangepi_zero_plus_defconfig
> +++ b/configs/orangepi_zero_plus_defconfig
> @@ -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?