| Message ID | 20220317131008.7174-1-arinc.unal@arinc9.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | ramips: mt7621-dts: fix claiming rgmii2 pin group for EdgeRouter X SFP | expand |
Hi, I'd like to remind of this patch. On 17/03/2022 16:10, Arınç ÜNAL wrote: > For a TX->TX connected external phy to transmit/receive data, the rgmii2 > pin group needs to be claimed with gpio function, at least for EdgeRouter X > SFP. We already claim the pin group under the pinctrl node with gpio > function on the gpio node on mt7621_ubnt_edgerouter-x.dtsi. > > However, we should claim a pin group under its consumer node. It's the > ethernet node in this case, which we already claim the rgmii2 pin group > under it on mt7621.dtsi. Therefore, set the function as gpio on the rgmii2 > node for EdgeRouter X SFP and get rid of claiming the rgmii2 pin group > under the pinctrl node. With this change, we also get to remove a > definition from mt7621_ubnt_edgerouter-x.dtsi which is specific to > EdgeRouter X SFP. > > This change is tested on an EdgeRouter X SFP. > > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts | 6 ++++++ > target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi | 6 +----- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts > index 897aa90ea3..c00eb52c7c 100644 > --- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts > +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts > @@ -59,6 +59,12 @@ > }; > }; > > +&rgmii2_pins { > + rgmii2 { > + function = "gpio"; > + }; > +}; > + > &switch0 { > ports { > port@5 { > diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi > index dcc84d7ccc..95cf3d2ccd 100644 > --- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi > +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi > @@ -19,10 +19,6 @@ > }; > }; > > -ðernet { > - pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>; > -}; > - > &gmac0 { > nvmem-cells = <&macaddr_factory_22>; > nvmem-cell-names = "mac-address"; > @@ -114,7 +110,7 @@ > > &state_default { > gpio { > - groups = "uart2", "uart3", "pcie", "rgmii2", "jtag"; > + groups = "uart2", "uart3", "pcie", "jtag"; > function = "gpio"; > }; > };
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts index 897aa90ea3..c00eb52c7c 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts @@ -59,6 +59,12 @@ }; }; +&rgmii2_pins { + rgmii2 { + function = "gpio"; + }; +}; + &switch0 { ports { port@5 { diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi index dcc84d7ccc..95cf3d2ccd 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi @@ -19,10 +19,6 @@ }; }; -ðernet { - pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>; -}; - &gmac0 { nvmem-cells = <&macaddr_factory_22>; nvmem-cell-names = "mac-address"; @@ -114,7 +110,7 @@ &state_default { gpio { - groups = "uart2", "uart3", "pcie", "rgmii2", "jtag"; + groups = "uart2", "uart3", "pcie", "jtag"; function = "gpio"; }; };
For a TX->TX connected external phy to transmit/receive data, the rgmii2 pin group needs to be claimed with gpio function, at least for EdgeRouter X SFP. We already claim the pin group under the pinctrl node with gpio function on the gpio node on mt7621_ubnt_edgerouter-x.dtsi. However, we should claim a pin group under its consumer node. It's the ethernet node in this case, which we already claim the rgmii2 pin group under it on mt7621.dtsi. Therefore, set the function as gpio on the rgmii2 node for EdgeRouter X SFP and get rid of claiming the rgmii2 pin group under the pinctrl node. With this change, we also get to remove a definition from mt7621_ubnt_edgerouter-x.dtsi which is specific to EdgeRouter X SFP. This change is tested on an EdgeRouter X SFP. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts | 6 ++++++ target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-)