[U-Boot] [PATCH v2 0/3] sunxi: Sync Bananapi M2+ dts files and add H5 variant

[U-Boot] [PATCH v2 0/3] sunxi: Sync Bananapi M2+ dts files and add H5 variant

[Chen-Yu Tsai]

Hi everyone,

This is version 2 of my Bananapi M2+ H5 variant series.

This series adds support for the H5 variant of the Bananapi M2+, and
also renames the MAINTAINERS entry and defconfig for the Bananapi M2+
from its current name, Sinovoip BPI M2+.

Sinovoip is the brand name used for their own VOIP-related products,
while the brand name "Bananapi" should be used for single board
computers bearing the Bananapi logo. This was confirmed by Bananapi.

Patch 1 syncs up the BPI-M2+ device tree file from Linux v5.0-rc1.

Patch 2 renames the defconfig and maintainer entries to fix the brand
name.

Patch 3 adds support for the H5 variant of the Bananapi M2+.

Please have a look.

Regards
ChenYu

Changes in v2:
  - Fix "doen" typo
  - Drop symlink using original name, and entry for it in MAINTAINERS
  - Remove unrelated changes while renaming

Chen-Yu Tsai (3):
  sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1
  sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3
  sunxi: Add Bananapi M2+ H5 board

 arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts   |  11 +
 arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts    | 190 +-----------------
 ...2-plus.dts => sunxi-bananapi-m2-plus.dtsi} |  23 ++-
 board/sunxi/MAINTAINERS                       |  12 +-
 ...efconfig => bananapi_m2_plus_h3_defconfig} |   0
 ...efconfig => bananapi_m2_plus_h5_defconfig} |   6 +-
 6 files changed, 39 insertions(+), 203 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts
 copy arch/arm/dts/{sun8i-h3-bananapi-m2-plus.dts => sunxi-bananapi-m2-plus.dtsi} (92%)
 copy configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} (100%)
 rename configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h5_defconfig} (85%)

-- 
2.20.1

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Chen-Yu Tsai]

As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
device tree for the Bananapi M2+ has been split into a common dtsi file,
and an SoC-specific board device tree file that includes both the shared
dtsi file and the soc dtsi file. This was done to support both the H3
and H5 variants of the same board. This is similar to what was done for
the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split
out common board design for ALL-H3-CC device tree").

The newly split files are directly synced from Linux tag v5.0-rc1.

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

---

Changes in v2:
  - Fix "doen" typo

 arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts    | 190 +-----------------
 ...2-plus.dts => sunxi-bananapi-m2-plus.dtsi} |  23 ++-
 2 files changed, 18 insertions(+), 195 deletions(-)
 copy arch/arm/dts/{sun8i-h3-bananapi-m2-plus.dts => sunxi-bananapi-m2-plus.dtsi} (92%)

diff --git a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts
index 30540dc8e0c5..195a75da13f1 100644
--- a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts
+++ b/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts
@@ -42,195 +42,9 @@
 
 /dts-v1/;
 #include "sun8i-h3.dtsi"
-#include "sunxi-common-regulators.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "sunxi-bananapi-m2-plus.dtsi"
 
 / {
-	model = "Banana Pi BPI-M2-Plus";
+	model = "Banana Pi BPI-M2-Plus H3";
 	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";
-
-	aliases {
-		ethernet0 = &emac;
-		serial0 = &uart0;
-		serial1 = &uart1;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	connector {
-		compatible = "hdmi-connector";
-		type = "a";
-
-		port {
-			hdmi_con_in: endpoint {
-				remote-endpoint = <&hdmi_out_con>;
-			};
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-names = "default";
-
-		pwr_led {
-			label = "bananapi-m2-plus:red:pwr";
-			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
-			default-state = "on";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-
-		sw4 {
-			label = "power";
-			linux,code = <BTN_0>;
-			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	reg_gmac_3v3: gmac-3v3 {
-		      compatible = "regulator-fixed";
-		      regulator-name = "gmac-3v3";
-		      regulator-min-microvolt = <3300000>;
-		      regulator-max-microvolt = <3300000>;
-		      startup-delay-us = <100000>;
-		      enable-active-high;
-		      gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
-	};
-
-	wifi_pwrseq: wifi_pwrseq {
-		compatible = "mmc-pwrseq-simple";
-		pinctrl-names = "default";
-		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-	};
-};
-
-&de {
-	status = "okay";
-};
-
-&ehci0 {
-	status = "okay";
-};
-
-&ehci1 {
-	status = "okay";
-};
-
-&ehci2 {
-	status = "okay";
-};
-
-&emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_rgmii_pins>;
-	phy-supply = <&reg_gmac_3v3>;
-	phy-handle = <&ext_rgmii_phy>;
-	phy-mode = "rgmii";
-
-	status = "okay";
-};
-
-&external_mdio {
-	ext_rgmii_phy: ethernet-phy at 1 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <0>;
-	};
-};
-
-&hdmi {
-	status = "okay";
-};
-
-&hdmi_out {
-	hdmi_out_con: endpoint {
-		remote-endpoint = <&hdmi_con_in>;
-	};
-};
-
-&ir {
-	pinctrl-names = "default";
-	pinctrl-0 = <&ir_pins_a>;
-	status = "okay";
-};
-
-&mmc0 {
-	vmmc-supply = <&reg_vcc3v3>;
-	bus-width = <4>;
-	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
-	status = "okay";
-};
-
-&mmc1 {
-	vmmc-supply = <&reg_vcc3v3>;
-	vqmmc-supply = <&reg_vcc3v3>;
-	mmc-pwrseq = <&wifi_pwrseq>;
-	bus-width = <4>;
-	non-removable;
-	status = "okay";
-
-	brcmf: wifi at 1 {
-		reg = <1>;
-		compatible = "brcm,bcm4329-fmac";
-		interrupt-parent = <&pio>;
-		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
-		interrupt-names = "host-wake";
-	};
-};
-
-&mmc2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&mmc2_8bit_pins>;
-	vmmc-supply = <&reg_vcc3v3>;
-	vqmmc-supply = <&reg_vcc3v3>;
-	bus-width = <8>;
-	non-removable;
-	status = "okay";
-};
-
-&ohci0 {
-	status = "okay";
-};
-
-&ohci1 {
-	status = "okay";
-};
-
-&ohci2 {
-	status = "okay";
-};
-
-&reg_usb0_vbus {
-	gpio = <&pio 3 11 GPIO_ACTIVE_HIGH>; /* PD11 */
-	status = "okay";
-};
-
-&uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pins_a>;
-	status = "okay";
-};
-
-&uart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
-	status = "okay";
-};
-
-&usb_otg {
-	dr_mode = "otg";
-	status = "okay";
-};
-
-&usbphy {
-	usb0_id_det-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
-	usb0_vbus-supply = <&reg_usb0_vbus>;
-	/* USB host VBUS is on as long as VCC-IO is on */
-	status = "okay";
 };
diff --git a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
similarity index 92%
copy from arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts
copy to arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
index 30540dc8e0c5..3bed375b9c03 100644
--- a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts
+++ b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
@@ -40,17 +40,12 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/dts-v1/;
-#include "sun8i-h3.dtsi"
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Banana Pi BPI-M2-Plus";
-	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";
-
 	aliases {
 		ethernet0 = &emac;
 		serial0 = &uart0;
@@ -108,6 +103,8 @@
 		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+		clocks = <&rtc 1>;
+		clock-names = "ext_clock";
 	};
 };
 
@@ -140,7 +137,7 @@
 &external_mdio {
 	ext_rgmii_phy: ethernet-phy at 1 {
 		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <0>;
+		reg = <1>;
 	};
 };
 
@@ -220,7 +217,19 @@
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
-	status = "okay";
+	uart-has-rtscts;
+	status = "okay";
+
+	bluetooth {
+		compatible = "brcm,bcm43438-bt";
+		clocks = <&rtc 1>;
+		clock-names = "lpo";
+		vbat-supply = <&reg_vcc3v3>;
+		vddio-supply = <&reg_vcc3v3>;
+		device-wakeup-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
+		host-wakeup-gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
+		shutdown-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+	};
 };
 
 &usb_otg {
-- 
2.20.1

[U-Boot] [PATCH v2 2/3] sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

[Chen-Yu Tsai]

The brand Sinovoip is used for Sinovoip's original VOIP products, while
the Bananapi brand is for the single board computers they produce. This
has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
used.

To support the H5 variant of this board, the "H3" suffix is added to
the defconfig name.

A symbolic link for the original defconfig, pointing to the new one, is
added to keep 3rd party distributions happy.

Also add myself as one of the board maintainers.

As the device tree files were already correctly named, they do not
require any changes.

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

---

Changes in v2:
  - Drop symlink using original name, and entry for it in MAINTAINERS
  - Remove unrelated changes while renaming

 board/sunxi/MAINTAINERS                               | 11 ++++++-----
 ...2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} |  0
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} (100%)

diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 608a86be4970..c6c6aee1810c 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -137,6 +137,12 @@ M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/bananapi_m2_berry_defconfig
 
+BANANAPI M2 PLUS H3 BOARD
+M:	Icenowy Zheng <icenowy@aosc.io>
+M:	Chen-Yu Tsai <wens@csie.org>
+S:	Maintained
+F:	configs/bananapi_m2_plus_h3_defconfig
+
 BANANAPI M2 ULTRA BOARD
 M:	Chen-Yu Tsai <wens@csie.org>
 S:	Maintained
@@ -418,11 +424,6 @@ S:	Maintained
 F:	configs/Sinlinx_SinA33_defconfig
 W:	http://linux-sunxi.org/Sinlinx_SinA33
 
-SINOVOIP BPI M2 PLUS H3 BOARD
-M:	Icenowy Zheng <icenowy@aosc.io>
-S:	Maintained
-F:	configs/Sinovoip_BPI_M2_Plus_defconfig
-
 SINOVOIP BPI M3 A83T BOARD
 M:	VishnuPatekar <vishnupatekar0510@gmail.com>
 S:	Maintained
diff --git a/configs/Sinovoip_BPI_M2_Plus_defconfig b/configs/bananapi_m2_plus_h3_defconfig
similarity index 100%
rename from configs/Sinovoip_BPI_M2_Plus_defconfig
rename to configs/bananapi_m2_plus_h3_defconfig
-- 
2.20.1

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

[Chen-Yu Tsai]

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
-- 
2.20.1

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Jagan Teki]

On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> device tree for the Bananapi M2+ has been split into a common dtsi file,
> and an SoC-specific board device tree file that includes both the shared
> dtsi file and the soc dtsi file. This was done to support both the H3
> and H5 variants of the same board. This is similar to what was done for
> the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split
> out common board design for ALL-H3-CC device tree").
>
> The newly split files are directly synced from Linux tag v5.0-rc1.

Based on my previous patch comment, I expected to have full sync with
all H3 related files. any plan?

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Andre Przywara]

On Fri, 15 Feb 2019 19:28:20 +0530
Jagan Teki <jagan@amarulasolutions.com> wrote:

> On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> > device tree for the Bananapi M2+ has been split into a common dtsi
> > file, and an SoC-specific board device tree file that includes both
> > the shared dtsi file and the soc dtsi file. This was done to support
> > both the H3 and H5 variants of the same board. This is similar to what
> > was done for the Libre Computer ALL-H3-CC in U-boot commit
> > d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC
> > device tree").
> >
> > The newly split files are directly synced from Linux tag v5.0-rc1.  
> 
> Based on my previous patch comment, I expected to have full sync with
> all H3 related files. any plan?

Weren't you dismissing the idea because of "past the MW"?

So coming back to that discussion, I was wondering how DT *updates* are
actually a new feature (from a U-Boot perspective)?
Actually I see a lot of warnings from dtc about various things in our
older .dts's, which spoils buildman runs. From this point of view updating
the DTs is a mere fix (as they remove these warnings).
So would you be willing to push for DT updates for this U-Boot release
still, if I can show that U-Boot is not affected by the DT updates? Stuff
like adding audio DT nodes have actually zero risk of affecting U-Boot ;-)

Cheers,
Andre.

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Chen-Yu Tsai]

On Fri, Feb 15, 2019 at 9:58 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> > device tree for the Bananapi M2+ has been split into a common dtsi file,
> > and an SoC-specific board device tree file that includes both the shared
> > dtsi file and the soc dtsi file. This was done to support both the H3
> > and H5 variants of the same board. This is similar to what was done for
> > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split
> > out common board design for ALL-H3-CC device tree").
> >
> > The newly split files are directly synced from Linux tag v5.0-rc1.
>
> Based on my previous patch comment, I expected to have full sync with
> all H3 related files. any plan?

I thought the plan was to merge these first, then do a full sync for the
next merge window?

ChenYu

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Jagan Teki]

On Fri, Feb 15, 2019 at 7:46 PM Andre Przywara <andre.przywara@arm.com> wrote:
>
> On Fri, 15 Feb 2019 19:28:20 +0530
> Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> > On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > >
> > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> > > device tree for the Bananapi M2+ has been split into a common dtsi
> > > file, and an SoC-specific board device tree file that includes both
> > > the shared dtsi file and the soc dtsi file. This was done to support
> > > both the H3 and H5 variants of the same board. This is similar to what
> > > was done for the Libre Computer ALL-H3-CC in U-boot commit
> > > d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC
> > > device tree").
> > >
> > > The newly split files are directly synced from Linux tag v5.0-rc1.
> >
> > Based on my previous patch comment, I expected to have full sync with
> > all H3 related files. any plan?
>
> Weren't you dismissing the idea because of "past the MW"?
>
> So coming back to that discussion, I was wondering how DT *updates* are
> actually a new feature (from a U-Boot perspective)?

I would consider as new feature, since I have encountered an mmc issue
due to sync[1] atleast some thing broken with sync during MW.

> Actually I see a lot of warnings from dtc about various things in our
> older .dts's, which spoils buildman runs. From this point of view updating
> the DTs is a mere fix (as they remove these warnings).
> So would you be willing to push for DT updates for this U-Boot release
> still, if I can show that U-Boot is not affected by the DT updates? Stuff
> like adding audio DT nodes have actually zero risk of affecting U-Boot ;-)

I don't believe 100% based on my experience with [1] . I agree with
above lot of warnings older stuff, but I'm considering dts syncs as
part of MW as well to avoid regressions. please see my last PR about
sync[2].

[1] https://www.mail-archive.com/linux-sunxi at googlegroups.com/msg29264.html
[2] https://patchwork.ozlabs.org/patch/976408/

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Jagan Teki]

On Fri, Feb 15, 2019 at 7:48 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Fri, Feb 15, 2019 at 9:58 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > >
> > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> > > device tree for the Bananapi M2+ has been split into a common dtsi file,
> > > and an SoC-specific board device tree file that includes both the shared
> > > dtsi file and the soc dtsi file. This was done to support both the H3
> > > and H5 variants of the same board. This is similar to what was done for
> > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split
> > > out common board design for ALL-H3-CC device tree").
> > >
> > > The newly split files are directly synced from Linux tag v5.0-rc1.
> >
> > Based on my previous patch comment, I expected to have full sync with
> > all H3 related files. any plan?
>
> I thought the plan was to merge these first, then do a full sync for the
> next merge window?

OK. will do that this time.

[U-Boot] [PATCH v2 2/3] sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

[Jagan Teki]

On Fri, Feb 15, 2019 at 4:35 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> The brand Sinovoip is used for Sinovoip's original VOIP products, while
> the Bananapi brand is for the single board computers they produce. This
> has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
> Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
> used.
>
> To support the H5 variant of this board, the "H3" suffix is added to
> the defconfig name.
>
> A symbolic link for the original defconfig, pointing to the new one, is
> added to keep 3rd party distributions happy.

Look like you forgot to remove this since it's copy of defconfig not
symlink. If you are OK, I will update while applying.

[U-Boot] [PATCH v2 2/3] sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

[Chen-Yu Tsai]

On Mon, Feb 18, 2019 at 4:31 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Fri, Feb 15, 2019 at 4:35 PM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > The brand Sinovoip is used for Sinovoip's original VOIP products, while
> > the Bananapi brand is for the single board computers they produce. This
> > has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
> > Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
> > used.
> >
> > To support the H5 variant of this board, the "H3" suffix is added to
> > the defconfig name.
> >
> > A symbolic link for the original defconfig, pointing to the new one, is
> > added to keep 3rd party distributions happy.
>
> Look like you forgot to remove this since it's copy of defconfig not
> symlink. If you are OK, I will update while applying.

Yeah. I forgot. Please remove it when applying.

Thanks
ChenYu

[U-Boot] [PATCH v2 2/3] sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

[Jagan Teki]

On Mon, Feb 18, 2019 at 2:10 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Mon, Feb 18, 2019 at 4:31 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > On Fri, Feb 15, 2019 at 4:35 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > >
> > > The brand Sinovoip is used for Sinovoip's original VOIP products, while
> > > the Bananapi brand is for the single board computers they produce. This
> > > has been verified by Bananapi. Rename the board from "Sinovoip BPI M2
> > > Plus" to "Bananapi M2 Plus". For the defconfig file, all lowercase is
> > > used.
> > >
> > > To support the H5 variant of this board, the "H3" suffix is added to
> > > the defconfig name.
> > >
> > > A symbolic link for the original defconfig, pointing to the new one, is
> > > added to keep 3rd party distributions happy.
> >
> > Look like you forgot to remove this since it's copy of defconfig not
> > symlink. If you are OK, I will update while applying.
>
> Yeah. I forgot. Please remove it when applying.

Applied all to u-boot-sunxi/master

[U-Boot] [PATCH v2 1/3] sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

[Chen-Yu Tsai]

On Mon, Feb 18, 2019 at 4:28 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Fri, Feb 15, 2019 at 7:48 PM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > On Fri, Feb 15, 2019 at 9:58 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> > >
> > > On Fri, Feb 15, 2019 at 4:33 PM Chen-Yu Tsai <wens@csie.org> wrote:
> > > >
> > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out
> > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the
> > > > device tree for the Bananapi M2+ has been split into a common dtsi file,
> > > > and an SoC-specific board device tree file that includes both the shared
> > > > dtsi file and the soc dtsi file. This was done to support both the H3
> > > > and H5 variants of the same board. This is similar to what was done for
> > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split
> > > > out common board design for ALL-H3-CC device tree").
> > > >
> > > > The newly split files are directly synced from Linux tag v5.0-rc1.
> > >
> > > Based on my previous patch comment, I expected to have full sync with
> > > all H3 related files. any plan?
> >
> > I thought the plan was to merge these first, then do a full sync for the
> > next merge window?
>
> OK. will do that this time.

Thanks. Given the release timing, I suppose we would sync up to the 5.0 release
of Linux?

ChenYu