[PATCH v2 3/3] ramips: mt7621-dts: add pinctrl properties for ethernet

[Rosen Penev]

On Fri, Feb 11, 2022 at 2:27 PM Arınç ÜNAL <arinc.unal at arinc9.com> wrote:
>
> On 12/02/2022 00:53, Rosen Penev wrote:
> > On Fri, Feb 11, 2022 at 4:46 AM Arınç ÜNAL <arinc.unal at arinc9.com> wrote:
> >>
> >> Add the missing pinctrl properties on the ethernet node.
> >> GMAC1 will start working with this change.
> >>
> >> Link: https://lore.kernel.org/netdev/83a35aa3-6cb8-2bc4-2ff4-64278bbcd8c8@arinc9.com/
> >>
> >> Overwrite pinctrl-0 property without rgmii2_pins on devicetrees which use
> >> the rgmii2 pins as GPIO (22 - 33).
> >>
> >> Add rgmii2 pin group to gpio function on mt7621_tplink_archer-x6-v3.dtsi
> >> which uses GPIO 28.
> >>
> >> Signed-off-by: Arınç ÜNAL <arinc.unal at arinc9.com>
> >> ---
> >>   target/linux/ramips/dts/mt7621.dtsi                         | 3 +++
> >>   target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts    | 4 ++++
> >>   target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts      | 4 ++++
> >>   target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts       | 4 ++++
> >>   target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts            | 4 ++++
> >>   target/linux/ramips/dts/mt7621_firefly_firewrt.dts          | 4 ++++
> >>   target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts            | 4 ++++
> >>   target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts            | 4 ++++
> >>   target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts  | 4 ++++
> >>   .../linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts  | 4 ++++
> >>   .../linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts   | 4 ++++
> >>   target/linux/ramips/dts/mt7621_mtc_wr1201.dts               | 4 ++++
> >>   target/linux/ramips/dts/mt7621_netgear_ex6150.dts           | 4 ++++
> >>   target/linux/ramips/dts/mt7621_sercomm_na502.dts            | 4 ++++
> >>   target/linux/ramips/dts/mt7621_telco-electronics_x1.dts     | 4 ++++
> >>   target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi     | 6 +++++-
> >>   target/linux/ramips/dts/mt7621_tplink_re350-v1.dts          | 4 ++++
> >>   target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi         | 4 ++++
> >>   target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi       | 4 ++++
> >>   target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts       | 4 ++++
> >>   target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi         | 4 ++++
> >>   target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts      | 4 ++++
> >>   target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts    | 4 ++++
> >>   target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi      | 4 ++++
> >>   target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts       | 4 ++++
> >>   target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi      | 4 ++++
> >>   target/linux/ramips/dts/mt7621_zyxel_nr7101.dts             | 4 ++++
> >>   27 files changed, 108 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
> >> index bfb66740a2..56799201c0 100644
> >> --- a/target/linux/ramips/dts/mt7621.dtsi
> >> +++ b/target/linux/ramips/dts/mt7621.dtsi
> >> @@ -456,6 +456,9 @@
> >>
> >>                  mediatek,ethsys = <&sysc>;
> >>
> >> +               pinctrl-names = "default";
> >> +               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
> >> +
> >>                  gmac0: mac at 0 {
> >>                          compatible = "mediatek,eth-mac";
> >>                          reg = <0>;
> >> diff --git a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
> >> index 8c6fdab04f..73c125e496 100644
> >> --- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
> >> +++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
> >> @@ -147,6 +147,10 @@
> >>          };
> >>   };
> >>
> >> +&ethernet {
> >> +       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
> >> +};
> >> +
> >>   &gmac0 {
> >>          nvmem-cells = <&macaddr_factory_e000>;
> >>          nvmem-cell-names = "mac-address";
> >> diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
> >> index f9211463f8..7b82008ff7 100644
> >> --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
> >> +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
> >> @@ -152,6 +152,10 @@
> >>          };
> >>   };
> >>
> >> +&ethernet {
> >> +       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
> >> +};
> >> +
> >>   &switch0 {
> >>          ports {
> >>                  port at 0 {
> >> diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
> >> index 5d20b6e28a..5e295791a3 100644
> >> --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
> >> +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
> >> @@ -172,6 +172,10 @@
> >>          };
> >>   };
> >>
> >> +&ethernet {
> >> +       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
> >> +};
> >> +
> >>   &gmac0 {
> >>          nvmem-cells = <&macaddr_factory_4>;
> >>          nvmem-cell-names = "mac-address";
> >> diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
> >> index d30e4d1953..dc537cf504 100644
> >> --- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
> >> +++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
> >> @@ -174,6 +174,10 @@
> >>          };
> >>   };
> >>
> >> +&ethernet {
> >> +       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
> >> +};
> >> +
> >>   &gmac0 {
> >>          nvmem-cells = <&macaddr_factory_e000>;
> >>          nvmem-cell-names = "mac-address";
> >> diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
> >> index 9da515f017..247d9b797e 100644
> >> --- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
> >> +++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
> >> @@ -104,6 +104,10 @@
> >>          };
> >>   };
> >>
> >> +&ethernet {
> >> +       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
> >> +};
> >> +
> >>   &gmac0 {
> >>          nvmem-cells = <&macaddr_factory_e000>;
> >>          nvmem-cell-names = "mac-address";
> >> diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
> >> index db760381a4..e7545736aa 100644
> >> --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
> >> +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
> > this device does not have the second GMAC connected to another
> > ethernet interface. The PC2 does.
>
> I'm not sure what do you ask of me to change here. Both GBPC1 and GBPC2
> use some of the RGMII2 GPIOs 22 - 33 for other purposes which, on paper,
> makes it impossible to connect anything to the 2nd GMAC of the SoC and
> expect traffic flow.
No way.

NeilBrown got it working on his PC2. I no longer have mine so I can't confirm.
>
> In any case, rgmii2 pin group is given gpio function on both of the
> devicetrees, therefore I overwrite the pinctrl-0 property on both of them.
>
> Arınç