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
---
Changes in v2: None
arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts | 11 +++++++++++ board/sunxi/MAINTAINERS | 3 ++- ...lus_h3_defconfig => bananapi_m2_plus_h5_defconfig} | 6 +++--- 3 files changed, 16 insertions(+), 4 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 --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 c6c6aee1810c..8e2f90fc68c3 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
BANANAPI M2 ULTRA BOARD M: Chen-Yu Tsai wens@csie.org 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 597618fb900b..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,9 +12,9 @@ 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_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y