2022-04-11 14:03:14

by Arınç ÜNAL

Subject: [PATCH 1/3] mips: dts: mt7621: add mdio label to mdio-bus

Add mdio label to the mdio-bus node to easily refer to it.

Use the newly created label on the GB-PC2 devicetree.

Signed-off-by: Arınç ÜNAL <[email protected]>
---
.../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 18 ++++++++----------
arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +-
2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index a7fce8de6147..b427ae9e081f 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -93,17 +93,15 @@ gpio-pinmux {
};
};

-&ethernet {
- gmac1: mac@1 {
- status = "okay";
- phy-handle = <&ethphy7>;
- };
+&gmac1 {
+ status = "okay";
+ phy-handle = <&ethphy7>;
+};

- mdio-bus {
- ethphy7: ethernet-phy@7 {
- reg = <7>;
- phy-mode = "rgmii-rxid";
- };
+&mdio {
+ ethphy7: ethernet-phy@7 {
+ reg = <7>;
+ phy-mode = "rgmii-rxid";
};
};

diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi
index 3222684915ac..40d0f28446ca 100644
--- a/arch/mips/boot/dts/ralink/mt7621.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7621.dtsi
@@ -342,7 +342,7 @@ gmac1: mac@1 {
phy-mode = "rgmii-rxid";
};

- mdio-bus {
+ mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;

--
2.25.1

2022-04-11 22:23:48

by Sergio Paracuellos

Subject: Re: [PATCH 1/3] mips: dts: mt7621: add mdio label to mdio-bus

On Sun, Apr 10, 2022 at 10:32 PM Arınç ÜNAL <[email protected]> wrote:
>
> Add mdio label to the mdio-bus node to easily refer to it.
>
> Use the newly created label on the GB-PC2 devicetree.
>
> Signed-off-by: Arınç ÜNAL <[email protected]>
> ---
> .../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 18 ++++++++----------
> arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +-
> 2 files changed, 9 insertions(+), 11 deletions(-)

Reviewed-by: Sergio Paracuellos <[email protected]>

Thanks,
Sergio Paracuellos

2022-04-12 10:47:46

by Arınç ÜNAL

Subject: [PATCH 3/3] mips: dts: mt7621: remove binding for defining gpio function for pin groups

All pin groups function as gpio unless set otherwise. Therefore, remove
this unnecessary binding.

Tested on UniElec U7621-06-16M on OpenWrt.

Signed-off-by: Arınç ÜNAL <[email protected]>
---
arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 12 ------------
arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 12 ------------
2 files changed, 24 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
index 75f3b0425487..c307a0edb91f 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
@@ -97,18 +97,6 @@ &pcie {
status = "okay";
};

-&pinctrl {
- pinctrl-names = "default";
- pinctrl-0 = <&state_default>;
-
- state_default: state-default {
- gpio-pinmux {
- groups = "uart3", "wdt";
- function = "gpio";
- };
- };
-};
-
&gmac1 {
status = "okay";
phy-handle = <&ethphy4>;
diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index b427ae9e081f..8268d738e74f 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -81,18 +81,6 @@ &pcie {
status = "okay";
};

-&pinctrl {
- pinctrl-names = "default";
- pinctrl-0 = <&state_default>;
-
- state_default: state-default {
- gpio-pinmux {
- groups = "wdt";
- function = "gpio";
- };
- };
-};
-
&gmac1 {
status = "okay";
phy-handle = <&ethphy7>;
--
2.25.1

2022-04-12 22:33:11

by Arınç ÜNAL

Subject: [PATCH 2/3] mips: dts: mt7621: mux phy4 to gmac1 for GB-PC1

Mux the MT7530 switch's phy4 to the SoC's gmac1 on the GB-PC1 devicetree.
This achieves 2 Gbps total bandwidth to the CPU using the second RGMII.

Signed-off-by: Arınç ÜNAL <[email protected]>
---
.../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
index 5892bcf71595..75f3b0425487 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
@@ -103,14 +103,21 @@ &pinctrl {

state_default: state-default {
gpio-pinmux {
- groups = "rgmii2", "uart3", "wdt";
+ groups = "uart3", "wdt";
function = "gpio";
};
};
};

-&ethernet {
- pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+&gmac1 {
+ status = "okay";
+ phy-handle = <&ethphy4>;
+};
+
+&mdio {
+ ethphy4: ethernet-phy@4 {
+ reg = <4>;
+ };
};

&switch0 {
@@ -119,10 +126,5 @@ port@0 {
status = "okay";
label = "ethblack";
};
-
- port@4 {
- status = "okay";
- label = "ethblue";
- };
};
};
--
2.25.1