[openwrt/openwrt] ipq806x: 5.15: revert unwanted DSA conversion for ASRock G10

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 25 02:49:02 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a87b6cda02f04c9fec3a90fbdfeeb9f20f8b0743

commit a87b6cda02f04c9fec3a90fbdfeeb9f20f8b0743
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Oct 20 16:53:01 2022 +0200

    ipq806x: 5.15: revert unwanted DSA conversion for ASRock G10
    
    In refreshing DTS to the upstream version an unwanted change slipped in
    the commit. The ASRock G10 dts got converted to DSA without any support.
    
    Revert this to swconfig driver to restore normal functionality.
    
    Fixes: 88bf6525251f ("ipq806x: 5.15: replace dtsi patches with upstream version")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 .../arch/arm/boot/dts/qcom-ipq8064-g10.dts         | 76 ++++------------------
 1 file changed, 11 insertions(+), 65 deletions(-)

diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
index 59d5d3ec3d..63a72b53ae 100644
--- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
+++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-g10.dts
@@ -158,71 +158,17 @@
 	pinctrl-0 = <&mdio0_pins>;
 	pinctrl-names = "default";
 
-	switch at 10 {
-		compatible = "qca,qca8337";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0x10>;
-
-		qca8k,rgmii56_1_8v;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port at 0 {
-				reg = <0>;
-				label = "cpu";
-				ethernet = <&gmac1>;
-				phy-mode = "rgmii-id";
-
-				fixed-link {
-					speed = <1000>;
-					full-duplex;
-				};
-			};
-
-			port at 1 {
-				reg = <1>;
-				label = "lan1";
-			};
-
-			port at 2 {
-				reg = <2>;
-				label = "lan2";
-			};
-
-			port at 3 {
-				reg = <3>;
-				label = "lan3";
-			};
-
-			port at 4 {
-				reg = <4>;
-				label = "lan4";
-			};
-
-			port at 5 {
-				reg = <5>;
-				label = "wan";
-			};
-
-			/*
-			port at 6 {
-					reg = <0>;
-					label = "cpu";
-					ethernet = <&gmac2>;
-					phy-mode = "rgmii";
-
-					fixed-link {
-							speed = <1000>;
-							full-duplex;
-							pause;
-							asym-pause;
-					};
-			};
-			*/
-		};
+	ethernet-phy at 0 {
+		reg = <0>;
+		qca,ar8327-initvals = <
+			0x00004 0x7600000   /* PAD0_MODE */
+			0x00008 0x1000000   /* PAD5_MODE */
+			0x0000c 0x80        /* PAD6_MODE */
+			0x000e4 0x6a545     /* MAC_POWER_SEL */
+			0x000e0 0xc74164de  /* SGMII_CTRL */
+			0x0007c 0x4e        /* PORT0_STATUS */
+			0x00094 0x4e        /* PORT6_STATUS */
+			>;
 	};
 };
 




More information about the lede-commits mailing list