summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorArınç ÜNAL <arinc.unal@arinc9.com>2022-01-25 18:39:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-08 15:23:49 +0300
commitb24dfa54d6e80e6f30fe6bdc2b0fcea48f041092 (patch)
tree27676dbeae6ab37f796ef4f065c2e8f897e97502 /drivers/staging
parent97d01fabee69aa38967fa85e8f0280345dc69c27 (diff)
downloadlinux-b24dfa54d6e80e6f30fe6bdc2b0fcea48f041092.tar.xz
staging: mt7621-dts: fix pinctrl properties for ethernet
[ Upstream commit 0a93c0d75809582893e82039143591b9265b520e ] Add pinctrl properties with rgmii1 & mdio pins under ethernet node which was wrongfully put under an external phy node. GMAC1 will start working with this fix. Link: https://lore.kernel.org/netdev/02ecce91-7aad-4392-c9d7-f45ca1b31e0b@arinc9.com/T/ Move GB-PC2 specific phy_external node to its own device tree. Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> Link: https://lore.kernel.org/r/20220125153903.1469-5-arinc.unal@arinc9.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/mt7621-dts/gbpc2.dts16
-rw-r--r--drivers/staging/mt7621-dts/mt7621.dtsi13
2 files changed, 14 insertions, 15 deletions
diff --git a/drivers/staging/mt7621-dts/gbpc2.dts b/drivers/staging/mt7621-dts/gbpc2.dts
index 52760e7351f6..f9b69091bfc0 100644
--- a/drivers/staging/mt7621-dts/gbpc2.dts
+++ b/drivers/staging/mt7621-dts/gbpc2.dts
@@ -12,10 +12,16 @@
function = "gpio";
};
-&gmac1 {
- status = "ok";
-};
+&ethernet {
+ gmac1: mac@1 {
+ status = "ok";
+ phy-handle = <&phy_external>;
+ };
-&phy_external {
- status = "ok";
+ mdio-bus {
+ phy_external: ethernet-phy@5 {
+ reg = <5>;
+ phy-mode = "rgmii-rxid";
+ };
+ };
};
diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index eca384cdec39..99b0eef1f3e2 100644
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -391,6 +391,9 @@
mediatek,ethsys = <&sysc>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
@@ -408,22 +411,12 @@
reg = <1>;
status = "off";
phy-mode = "rgmii-rxid";
- phy-handle = <&phy_external>;
};
mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- phy_external: ethernet-phy@5 {
- status = "off";
- reg = <5>;
- phy-mode = "rgmii-rxid";
-
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii2_pins>;
- };
-
switch0: switch0@0 {
compatible = "mediatek,mt7621";
#address-cells = <1>;