Skip to contentSkip to conversation

sunxi: Sync Bananapi M2+ dts files and add H5 variant

PATCH Superseded Chen-Yu Tsai 4 participants 18 messages Jan 25, 2019 – Feb 14, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover sunxi: Sync Bananapi M2+ dts files and add H5 variant

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

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                       |  13 +-
 configs/Sinovoip_BPI_M2_Plus_defconfig        |  21 +-
 ...efconfig => bananapi_m2_plus_h3_defconfig} |   0
 ...efconfig => bananapi_m2_plus_h5_defconfig} |   4 +-
 7 files changed, 40 insertions(+), 222 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%)
 mode change 100644 => 120000 configs/Sinovoip_BPI_M2_Plus_defconfig
 copy configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} (100%)
 copy configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h5_defconfig} (85%)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

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 doen 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.

---

 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%)
arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts +2 -188
index 30540dc8e0c5..195a75da13f1 100644
@@ -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";
 };
arch/arm/dts/sunxi-bananapi-m2-plus.dtsi renamed from arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts +16 -7
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
@@ -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 {
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 7 lines · 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 doen for

s/doen/done

Quoted 4 lines

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.

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

#3 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 7 lines
Quoted 4 lines

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.

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

ChenYu

#4 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 19 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 3 lines
Quoted 3 lines

the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC device tree").

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

#5 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 22 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 21 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 5 lines
Quoted 4 lines

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.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.
Given that the U-Boot release is scheduled to happen after that, we should start now and possibly fix things later.

Cheers,
Andre.

#6 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 32 lines · Andre Przywara
Quoted 28 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 26 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 7 lines
Quoted 4 lines

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.

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Quoted 7 lines
Quoted 1 line

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

#7 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 35 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 34 lines · Andre Przywara
Quoted 29 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 19 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 3 lines
Quoted 3 lines

the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC device tree").

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

Quoted 7 lines
Quoted 5 lines

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

Cheers,
Andre.

#8 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 43 lines · Andre Przywara
Quoted 39 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 38 lines · Andre Przywara
Quoted 22 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 21 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 5 lines
Quoted 4 lines

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.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed.

[1] https://www.denx.de/wiki/U-Boot/ReleaseCycle

#9 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 49 lines · Jagan Teki
Quoted 47 lines · Andre Przywara
Quoted 42 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 32 lines · Andre Przywara
Quoted 28 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 26 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 7 lines
Quoted 4 lines

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.

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Quoted 7 lines
Quoted 1 line

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Quoted 8 lines
Quoted 2 lines

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed.

[1] https://www.denx.de/wiki/U-Boot/ReleaseCycle

Or you can merge these patches as is for now, and sync up all the device tree files
once the next merge window opens. These patches were sent a full two weeks before
the merge window closed. AFAIK they are eligible [1] for the pending release.

[1] https://www.denx.de/wiki/U-Boot/DevelopmentProcess

ChenYu

#10 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Hi Chen-Yu,

Quoted 54 lines · Chen-Yu Tsai
Quoted 52 lines · Jagan Teki
Quoted 49 lines · Andre Przywara
Quoted 35 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 34 lines · Andre Przywara
Quoted 29 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 19 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 3 lines
Quoted 3 lines

the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC device tree").

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

Quoted 7 lines
Quoted 5 lines

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

Quoted 8 lines
Quoted 5 lines

I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed.

[1] https://www.denx.de/wiki/U-Boot/ReleaseCycle

Or you can merge these patches as is for now, and sync up all the device tree files

Can't you wait till all get in? any urgency? idea is to grab all sync changes in one commit.

Quoted 3 lines

once the next merge window opens. These patches were sent a full two weeks before
the merge window closed. AFAIK they are eligible [1] for the pending release.

To be clear I knew this and same mentioned above, I missed it during last MW.

#11 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 62 lines · Jagan Teki

Hi Chen-Yu,

Quoted 58 lines · Chen-Yu Tsai
Quoted 56 lines · Jagan Teki
Quoted 43 lines · Andre Przywara
Quoted 39 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 38 lines · Andre Przywara
Quoted 22 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 21 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 5 lines
Quoted 4 lines

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.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

[1] https://www.denx.de/wiki/U-Boot/ReleaseCycle

Or you can merge these patches as is for now, and sync up all the device tree files

Can't you wait till all get in? any urgency? idea is to grab all sync changes in one commit.

It's not urgent at all. It's more likely that I completely forget about this in two months.

And it will still be two commits either way you cut it: 1 for the sync, the other for the defconfig and MAINTAINERS entry.

Quoted 5 lines
Quoted 3 lines

once the next merge window opens. These patches were sent a full two weeks before
the merge window closed. AFAIK they are eligible [1] for the pending release.

To be clear I knew this and same mentioned above, I missed it during last MW.

OK.

ChenYu

#12 lore raw

PATCH 1/3 sunxi: Sync Bananapi M2+ device tree from Linux v5.0-rc1

Quoted 69 lines · Chen-Yu Tsai
Quoted 67 lines · Jagan Teki

Hi Chen-Yu,

Quoted 62 lines · Chen-Yu Tsai
Quoted 49 lines · Jagan Teki
Quoted 47 lines · Andre Przywara
Quoted 42 lines · On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <[email protected]>…
Quoted 32 lines · Andre Przywara
Quoted 28 lines · On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <[email protected]>…
Quoted 26 lines · Chen-Yu Tsai
Quoted 11 lines · Jagan Teki
Quoted 7 lines · 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 doen for

s/doen/done

Good catch.

Quoted 7 lines
Quoted 4 lines

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.

Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.

Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out.

Quoted 7 lines
Quoted 1 line

Yes, better we can pick relevant version on during next MW.

I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository:
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1

There should be no need to wait for the Linux MW to close.

Not for Linux, I'm referring here about u-boot MW.

Quoted 8 lines
Quoted 2 lines

Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs.

I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed.

[1] https://www.denx.de/wiki/U-Boot/ReleaseCycle

Or you can merge these patches as is for now, and sync up all the device tree files

Quoted 8 lines
Quoted 2 lines

Can't you wait till all get in? any urgency? idea is to grab all sync changes in one commit.

It's not urgent at all. It's more likely that I completely forget about this in two months.

And it will still be two commits either way you cut it: 1 for the sync, the other for the defconfig and MAINTAINERS entry.

OK, will look at the rest and pick accordingly. thanks!

#13 lore raw

PATCH 2/3 sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

In reply to 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.

---

 board/sunxi/MAINTAINERS                       | 12 ++++++-----
 configs/Sinovoip_BPI_M2_Plus_defconfig        | 21 +------------------
 ...efconfig => bananapi_m2_plus_h3_defconfig} |  0
 3 files changed, 8 insertions(+), 25 deletions(-)
 mode change 100644 => 120000 configs/Sinovoip_BPI_M2_Plus_defconfig
 copy configs/{Sinovoip_BPI_M2_Plus_defconfig => bananapi_m2_plus_h3_defconfig} (100%)
board/sunxi/MAINTAINERS +7 -5
index 608a86be4970..f420c92e8c92 100644
@@ -137,6 +137,13 @@ M:	Jagan Teki <[email protected]>
 S:	Maintained
 F:	configs/bananapi_m2_berry_defconfig
 
+BANANAPI M2 PLUS H3 BOARD
+M:	Icenowy Zheng <[email protected]>
+M:	Chen-Yu Tsai <[email protected]>
+S:	Maintained
+F:	configs/bananapi_m2_plus_h3_defconfig
+F:	configs/Sinovoip_BPI_M2_Plus_defconfig
+
 BANANAPI M2 ULTRA BOARD
 M:	Chen-Yu Tsai <[email protected]>
 S:	Maintained
@@ -418,11 +425,6 @@ S:	Maintained
 F:	configs/Sinlinx_SinA33_defconfig
 W:	http://linux-sunxi.org/Sinlinx_SinA33
 
-SINOVOIP BPI M2 PLUS H3 BOARD
-M:	Icenowy Zheng <[email protected]>
-S:	Maintained
-F:	configs/Sinovoip_BPI_M2_Plus_defconfig
-
 SINOVOIP BPI M3 A83T BOARD
 M:	VishnuPatekar <[email protected]>
 S:	Maintained
configs/Sinovoip_BPI_M2_Plus_defconfig deleted +0 -20
deleted file mode 100644
index c2025ee0a499..000000000000
@@ -1,20 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_SPL=y
-CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-CONFIG_DRAM_ZQ=3881979
-CONFIG_DRAM_ODT_EN=y
-CONFIG_MACPWR="PD6"
-CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-CONFIG_NR_DRAM_BANKS=1
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-# 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_SUN8I_EMAC=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
configs/Sinovoip_BPI_M2_Plus_defconfig new file +1 -0
new file mode 120000
index 000000000000..322e1e6d21f0
@@ -0,0 +1 @@
+bananapi_m2_plus_h3_defconfig
\ No newline at end of file
configs/bananapi_m2_plus_h3_defconfig renamed from configs/Sinovoip_BPI_M2_Plus_defconfig +0 -0
similarity index 100%
copy from configs/Sinovoip_BPI_M2_Plus_defconfig
copy to configs/bananapi_m2_plus_h3_defconfig
Signature · 1 line
2.20.1
#14 lore raw

PATCH 2/3 sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

Quoted 7 lines · 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.

Quoted 5 lines

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.

Didn't find similar symbolic link with configs before, don't know if its fine to go with.

Tom or anyone,

Any comments on this?

#15 lore raw

PATCH 2/3 sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

Quoted 14 lines · Jagan Teki
Quoted 7 lines · 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.

Quoted 5 lines

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.

Quoted 6 lines

Didn't find similar symbolic link with configs before, don't know if its fine to go with.

Tom or anyone,

Any comments on this?

No symlinks please. Just update the docs as needed, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190213/6d597874/attachment.sig>
#16 lore raw

PATCH 2/3 sunxi: Rename Sinovoip BPI M2 Plus to Bananapi M2 Plus H3

Quoted 16 lines · Tom Rini
Quoted 14 lines · Jagan Teki
Quoted 12 lines · 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.

Quoted 8 lines
Quoted 6 lines

Didn't find similar symbolic link with configs before, don't know if its fine to go with.

Tom or anyone,

Any comments on this?

No symlinks please. Just update the docs as needed, thanks!

Got it. Will send v2 tomorrow.

ChenYu

#17 lore raw

PATCH 3/3 sunxi: Add Bananapi M2+ H5 board

In reply to 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

---

 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%)
arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts new file +11 -0
new file mode 100644
index 000000000000..350376748389
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2018 Chen-Yu Tsai <[email protected]>
+
+/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";
+};
board/sunxi/MAINTAINERS +2 -1
index f420c92e8c92..b6d5c94a7c7a 100644
@@ -137,11 +137,12 @@ M:	Jagan Teki <[email protected]>
 S:	Maintained
 F:	configs/bananapi_m2_berry_defconfig
 
-BANANAPI M2 PLUS H3 BOARD
+BANANAPI M2 PLUS BOARDS
 M:	Icenowy Zheng <[email protected]>
 M:	Chen-Yu Tsai <[email protected]>
 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
configs/bananapi_m2_plus_h5_defconfig renamed from configs/bananapi_m2_plus_h3_defconfig +2 -2
similarity index 85%
copy from configs/bananapi_m2_plus_h3_defconfig
copy to configs/bananapi_m2_plus_h5_defconfig
index c2025ee0a499..e7c10dbdf2d0 100644
@@ -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
Signature · 1 line
2.20.1