From: Shiji Yang <yangshiji66@qq.com>
Date: Mon, 22 Feb 2021 16:10:45 +0000 (+0800)
Subject: ramips: improve gpio control for Phicomm PSG1218
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d1176ad95a82495c3745465da902de11ea2f88ea;p=openwrt%2Fstaging%2Fblocktrron.git

ramips: improve gpio control for Phicomm PSG1218

Description:
1. From key and led config setting, we can find only "uartf" and "i2c" are used
as gpio by check mt7620 datasheet. It's time to remove unused pin group.

2. PSG1218 only have three led, so we can remove ethernet led pinctrl. refer to
Phicomm K2G.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
---

diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
index 4163a9cd43..c3ec73b681 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
@@ -84,6 +84,13 @@
 	};
 };
 
+&state_default {
+	gpio {
+		groups = "i2c", "uartf";
+		function = "gpio";
+	};
+};
+
 &pcie {
 	status = "okay";
 };
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
index baa0d8b261..d17f2fce59 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
@@ -5,17 +5,7 @@
 	model = "Phicomm PSG1218 rev.A";
 };
 
-&state_default {
-	gpio {
-		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-		function = "gpio";
-	};
-};
-
 &ethernet {
-	pinctrl-names = "default";
-	pinctrl-0 = <&ephy_pins>;
-
 	mtd-mac-address = <&factory 0x28>;
 
 	mediatek,portmap = "llllw";
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
index f7e70c92c8..822fb13b6f 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
@@ -5,16 +5,6 @@
 	model = "Phicomm PSG1218 rev.B";
 };
 
-&state_default {
-	gpio {
-		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
-		function = "gpio";
-	};
-};
-
 &ethernet {
-	pinctrl-names = "default";
-	pinctrl-0 = <&ephy_pins>;
-
 	mtd-mac-address = <&factory 0x28>;
 };