Skip to contentSkip to conversation

Change Bananapi-R2-Pro board to match V1.0

PATCH Applied Frank Wunderlich 2 participants 5 messages Apr 2, 2022 – Apr 10, 2022 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Change Bananapi-R2-Pro board to match V1.0

From: Frank Wunderlich <[email protected]>

Mainline Devicetree was created for v00 prototype that was not in public sale and only shipped to few developers. V1.0 of the board has some changes in io-domain and gmacs are swapped.

Change mainline DTS to match the current hardware.

Frank Wunderlich (2):
arm64: dts: rockchip: Change io-domains of bpi-r2-pro
arm64: dts: rockchip: Add gmac1 and change network settings

 .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts   | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)
Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 1/2 arm64: dts: rockchip: Change io-domains of bpi-r2-pro

From: Frank Wunderlich <[email protected]>

New Hardware revision has different io domain settings than the first board.

First version was not sold, so the setting can be savely overridden.

Fixes f901aaadaa2a ("arm64: dts: rockchip: Add Bananapi R2 Pro")
---
 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +2 -2
index a01886b467ed..a0388ff85ddf 100644
@@ -345,9 +345,9 @@ &pmu_io_domains {
 	pmuio2-supply = <&vcc3v3_pmu>;
 	vccio1-supply = <&vccio_acodec>;
 	vccio3-supply = <&vccio_sd>;
-	vccio4-supply = <&vcc_1v8>;
+	vccio4-supply = <&vcc_3v3>;
 	vccio5-supply = <&vcc_3v3>;
-	vccio6-supply = <&vcc_3v3>;
+	vccio6-supply = <&vcc_1v8>;
 	vccio7-supply = <&vcc_3v3>;
 	status = "okay";
 };
Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

PATCH 2/2 arm64: dts: rockchip: Add gmac1 and change network settings

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

New Version (v1.0) of R2 pro has swapped gmacs compared to the v00.

WAN-Port is now on gmac1 (RTL8211F) and lan-ports on gmac0 with mt7531 switch.

There is already a mt7531 dsa driver in mainline, but it needs to be modified to work for this board.

Fixes f901aaadaa2a ("arm64: dts: rockchip: Add Bananapi R2 Pro")
---
 .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts   | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +33 -3
index a0388ff85ddf..067fe4a6b178 100644
@@ -16,6 +16,7 @@ / {
 
 	aliases {
 		ethernet0 = &gmac0;
+		ethernet1 = &gmac1;
 		mmc0 = &sdmmc0;
 		mmc1 = &sdhci;
 	};
@@ -78,7 +79,6 @@ &gmac0 {
 	assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
 	assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&cru CLK_MAC0_2TOP>;
 	clock_in_out = "input";
-	phy-handle = <&rgmii_phy0>;
 	phy-mode = "rgmii";
 	pinctrl-names = "default";
 	pinctrl-0 = <&gmac0_miim
@@ -90,8 +90,38 @@ &gmac0_rgmii_clk
 	snps,reset-active-low;
 	/* Reset time is 20ms, 100ms for rtl8211f */
 	snps,reset-delays-us = <0 20000 100000>;
+	tx_delay = <0x4f>;
+	rx_delay = <0x0f>;
+	status = "okay";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+		pause;
+	};
+};
+
+&gmac1 {
+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru CLK_MAC1_2TOP>;
+	clock_in_out = "output";
+	phy-handle = <&rgmii_phy1>;
+	phy-mode = "rgmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac1m1_miim
+		     &gmac1m1_tx_bus2
+		     &gmac1m1_rx_bus2
+		     &gmac1m1_rgmii_clk
+		     &gmac1m1_rgmii_bus>;
+
+	snps,reset-gpio = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	/* Reset time is 20ms, 100ms for rtl8211f */
+	snps,reset-delays-us = <0 20000 100000>;
+
 	tx_delay = <0x3c>;
 	rx_delay = <0x2f>;
+
 	status = "okay";
 };
 
@@ -315,8 +345,8 @@ &i2c5 {
 	status = "disabled";
 };
 
-&mdio0 {
-	rgmii_phy0: ethernet-phy@0 {
+&mdio1 {
+	rgmii_phy1: ethernet-phy@0 {
 		compatible = "ethernet-phy-ieee802.3-c22";
 		reg = <0x0>;
 	};
Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#3 lore raw
In reply to Frank Wunderlich
Quoted 11 lines · Frank Wunderlich

Mainline Devicetree was created for v00 prototype that was not in public sale and only shipped to few developers. V1.0 of the board has some changes in io-domain and gmacs are swapped.

Change mainline DTS to match the current hardware.

Frank Wunderlich (2):
arm64: dts: rockchip: Change io-domains of bpi-r2-pro
arm64: dts: rockchip: Add gmac1 and change network settings

[...]

Applied, thanks!

[1/2] arm64: dts: rockchip: Change io-domains of bpi-r2-pro

      commit: 34fc952867aa2a2e257bf2bcbbaac97ac91f8bd1
[2/2] arm64: dts: rockchip: Add gmac1 and change network settings
      commit: 5c8e82ed3a4a5c8023b2959d8f3292f7291e7227

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>

A message that is not in the archive (sent off-list or not yet received): [email protected]

maintainer
#5 lore raw

Hi Frank,

Am Dienstag, 5. April 2022, 08:09:43 CEST schrieb Frank Wunderlich:

Quoted 21 lines

Am 4. April 2022 10:59:59 MESZ schrieb Heiko Stuebner <[email protected]>:

Quoted 20 lines · Frank Wunderlich
Quoted 11 lines

Mainline Devicetree was created for v00 prototype that was not in public sale and only shipped to few developers. V1.0 of the board has some changes in io-domain and gmacs are swapped.

Change mainline DTS to match the current hardware.

Frank Wunderlich (2):
arm64: dts: rockchip: Change io-domains of bpi-r2-pro
arm64: dts: rockchip: Add gmac1 and change network settings

[...]

Applied, thanks!

[1/2] arm64: dts: rockchip: Change io-domains of bpi-r2-pro

     commit: 34fc952867aa2a2e257bf2bcbbaac97ac91f8bd1
[2/2] arm64: dts: rockchip: Add gmac1 and change network settings
     commit: 5c8e82ed3a4a5c8023b2959d8f3292f7291e7227
Quoted 7 lines
Quoted 1 line

Best regards,

Hi Heiko,

Thanks for fast apply.

Can you treat it as fix (for 5.18). At least io-domain will damage board if someone use 5.18. Network will simply not work.

I've moved both over to fixes now.

It's clear for the io-domain but also the second patch probably makes the 1.0 board actually work where it wasn't before I guess, so that also counts as a fix :-)

Heiko