diff mbox series

[U-Boot,3/3] sunxi: Add Bananapi M2+ H5 board

Message ID 20190125103824.9803-4-wens@csie.org
State Changes Requested
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series sunxi: Sync Bananapi M2+ dts files and add H5 variant | expand

Commit Message

Chen-Yu Tsai Jan. 25, 2019, 10:38 a.m. UTC 
As the H5 is pin compatible with the H3, vendors tend to upgrade their
existing H3 products with an H5 SoC swap. This is the case with the
Bananapi M2+ H5.

Add the following to support it:

  - device tree file: synced from Linux v5.0-rc1,
  - defconfig: copy of bananapi_m2_plus_h3_defconfig with only SoC
	       family and default device tree file name changed
  - MAINTAINERS entry

Signed-off-by: Chen-Yu Tsai <wens@csie.org>

---

 arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts           | 11 +++++++++++
 board/sunxi/MAINTAINERS                               |  3 ++-
 ...lus_h3_defconfig => bananapi_m2_plus_h5_defconfig} |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts
 copy configs/{bananapi_m2_plus_h3_defconfig => bananapi_m2_plus_h5_defconfig} (85%)
diff mbox series

Patch

diff --git a/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts b/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts
new file mode 100644
index 000000000000..350376748389
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts
@@ -0,0 +1,11 @@ 
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org>
+
+/dts-v1/;
+#include "sun50i-h5.dtsi"
+#include <sunxi-bananapi-m2-plus.dtsi>
+
+/ {
+	model = "Banana Pi BPI-M2-Plus H5";
+	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun50i-h5";
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index f420c92e8c92..b6d5c94a7c7a 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -137,11 +137,12 @@  M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/bananapi_m2_berry_defconfig
 
-BANANAPI M2 PLUS H3 BOARD
+BANANAPI M2 PLUS BOARDS
 M:	Icenowy Zheng <icenowy@aosc.io>
 M:	Chen-Yu Tsai <wens@csie.org>
 S:	Maintained
 F:	configs/bananapi_m2_plus_h3_defconfig
+F:	configs/bananapi_m2_plus_h5_defconfig
 F:	configs/Sinovoip_BPI_M2_Plus_defconfig
 
 BANANAPI M2 ULTRA BOARD
diff --git a/configs/bananapi_m2_plus_h3_defconfig b/configs/bananapi_m2_plus_h5_defconfig
similarity index 85%
copy from configs/bananapi_m2_plus_h3_defconfig
copy to configs/bananapi_m2_plus_h5_defconfig
index c2025ee0a499..e7c10dbdf2d0 100644
--- a/configs/bananapi_m2_plus_h3_defconfig
+++ b/configs/bananapi_m2_plus_h5_defconfig
@@ -1,7 +1,7 @@ 
 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
@@ -12,7 +12,7 @@  CONFIG_NR_DRAM_BANKS=1
 # CONFIG_CMD_FLASH is not set
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-bananapi-m2-plus"
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y