[U-Boot] [PATCH v2 4/5] sunxi: Add Libre Computer Board ALL-H3-CC H5 ver.

[Chen-Yu Tsai]

This patch adds a device tree file for the H5 version of the Libre
Computer Board ALL-H3-CC. It is the same board first introduced in
commit afe27544125e ("sunxi: Add support for Libre Computer Board
ALL-H3-CC H3 ver."), with the H3 SoC replaced with the H5 SoC, and
has 4Gb DDR3 chips instead of 2Gb ones.

The device tree utilizes the common board design file for ALL-H3-CC,
providing just the model strings and SoC specifics.

Signed-off-by: Chen-Yu Tsai <wens at csie.org>
Acked-by: Maxime Ripard <maxime.ripard at bootlin.com>
---
 arch/arm/dts/Makefile                                       | 1 +
 ...tech-all-h3-cc.dts => sun50i-h5-libretech-all-h3-cc.dts} | 6 +++---
 board/sunxi/MAINTAINERS                                     | 1 +
 ...ngepi_one_defconfig => libretech_all_h3_cc_h5_defconfig} | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)
 copy arch/arm/dts/{sun8i-h2-plus-libretech-all-h3-cc.dts => sun50i-h5-libretech-all-h3-cc.dts} (53%)
 copy configs/{orangepi_one_defconfig => libretech_all_h3_cc_h5_defconfig} (80%)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 21e7bc1472aa..482ece6112f2 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -371,6 +371,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
 dtb-$(CONFIG_MACH_SUN8I_V3S) += \
 	sun8i-v3s-licheepi-zero.dtb
 dtb-$(CONFIG_MACH_SUN50I_H5) += \
+	sun50i-h5-libretech-all-h3-cc.dtb \
 	sun50i-h5-nanopi-neo2.dtb \
 	sun50i-h5-nanopi-neo-plus2.dtb \
 	sun50i-h5-orangepi-pc2.dtb \
diff --git a/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts
similarity index 53%
copy from arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts
copy to arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts
index 4db0d4bb65eb..a7e53c5c26b4 100644
--- a/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts
+++ b/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts
@@ -4,10 +4,10 @@
  */
 
 /dts-v1/;
-#include "sun8i-h3.dtsi"
+#include "sun50i-h5.dtsi"
 #include "sunxi-libretech-all-h3-cc.dtsi"
 
 / {
-	model = "Libre Computer Board ALL-H3-CC H2+";
-	compatible = "libretech,all-h3-cc-h2-plus", "allwinner,sun8i-h2-plus";
+	model = "Libre Computer Board ALL-H3-CC H5";
+	compatible = "libretech,all-h3-cc-h5", "allwinner,sun50i-h5";
 };
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 4c21a2fedfe8..ba36a09f5027 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -271,6 +271,7 @@ M:	Chen-Yu Tsai <wens at csie.org>
 S:	Maintained
 F:	configs/libretech_all_h3_cc_h2_plus_defconfig
 F:	configs/libretech_all_h3_cc_h3_defconfig
+F:	configs/libretech_all_h3_cc_h5_defconfig
 
 NANOPI-M1 BOARD
 M:	Mylène Josserand <mylene.josserand at free-electrons.com>
diff --git a/configs/orangepi_one_defconfig b/configs/libretech_all_h3_cc_h5_defconfig
similarity index 80%
copy from configs/orangepi_one_defconfig
copy to configs/libretech_all_h3_cc_h5_defconfig
index 23f4973e5bab..061bddc8fd5e 100644
--- a/configs/orangepi_one_defconfig
+++ b/configs/libretech_all_h3_cc_h5_defconfig
@@ -1,11 +1,11 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_SPL=y
-CONFIG_MACH_SUN8I_H3=y
+CONFIG_MACH_SUN50I_H5=y
 CONFIG_DRAM_CLK=672
 CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-libretech-all-h3-cc"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_SPL_DOS_PARTITION is not set
-- 
2.17.0