X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Fdts%2Fqca9557.dtsi;h=379e257d021f561e88d518518ebd3c14830cf84e;hb=65556127832c6b9c87a8b97ca2f937b799088c87;hp=3600d69cab417e40162b2aea96d64a2408505a01;hpb=b1a173d7c396c0a9e6bb0078a1a061eb9fdd0316;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi
index 3600d69cab..379e257d02 100644
--- a/target/linux/ath79/dts/qca9557.dtsi
+++ b/target/linux/ath79/dts/qca9557.dtsi
@@ -53,7 +53,7 @@
 				status = "disabled";
 			};
 
-			usb_phy0: usb-phy@18030000 {
+			usb_phy0: usb-phy0 {
 				compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
 
 				reset-names = "usb-phy", "usb-suspend-override";
@@ -64,7 +64,7 @@
 				status = "disabled";
 			};
 
-			usb_phy1: usb-phy {
+			usb_phy1: usb-phy1 {
 				compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy";
 
 				reset-names = "usb-phy", "usb-suspend-override";
@@ -109,7 +109,7 @@
 
 			pll: pll-controller@18050000 {
 				compatible = "qca,ar9557-pll",
-						"qca,qca9550-pll";
+						"qca,qca9550-pll", "syscon";
 				reg = <0x18050000 0x50>;
 
 				#clock-cells = <1>;
@@ -137,15 +137,31 @@
 				#reset-cells = <1>;
 				interrupt-parent = <&cpuintc>;
 
-				intc3: interrupt-controller@3 {
-					compatible = "qcom,qca9556-intc";
+				intc2: interrupt-controller2 {
+					compatible = "qca,ar9340-intc";
 
+					interrupt-parent = <&cpuintc>;
+					interrupts = <2>;
+
+					interrupt-controller;
+					#interrupt-cells = <1>;
+
+					qca,int-status-addr = <0xac>;
+					qca,pending-bits = <0xf>,	/* wmac */
+							<0x1f0>;	/* pcie rc 0 */
+				};
+
+				intc3: interrupt-controller3 {
+					compatible = "qca,ar9340-intc";
+
+					interrupt-parent = <&cpuintc>;
 					interrupts = <3>;
 
 					interrupt-controller;
 					#interrupt-cells = <1>;
 
-					qcom,pending-bits = <0x1f000>,		/* pcie rc */
+					qca,int-status-addr = <0xac>;
+					qca,pending-bits = <0x1f000>,		/* pcie rc 1 */
 							    <0x1000000>,	/* usb1 */
 							    <0x10000000>;	/* usb2 */
 				};
@@ -160,7 +176,29 @@
 				#reset-cells = <1>;
 			};
 
-			pcie: pcie-controller@18250000 {
+			pcie0: pcie-controller@180c0000 {
+				compatible = "qcom,ar7240-pci";
+				#address-cells = <3>;
+				#size-cells = <2>;
+				bus-range = <0x0 0x0>;
+				reg = <0x180c0000 0x1000>, /* CRP */
+				      <0x180f0000 0x100>,  /* CTRL */
+				      <0x14000000 0x1000>; /* CFG */
+				reg-names = "crp_base", "ctrl_base", "cfg_base";
+				ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000	/* pci memory */
+					  0x1000000 0 0x00000000 0x0000000 0 0x000001>;		/* io space */
+				interrupt-parent = <&intc2>;
+				interrupts = <1>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+
+				interrupt-map-mask = <0 0 0 1>;
+				interrupt-map = <0 0 0 0 &pcie0 0>;
+				status = "disabled";
+			};
+
+			pcie1: pcie-controller@18250000 {
 				compatible = "qcom,ar7240-pci";
 				#address-cells = <3>;
 				#size-cells = <2>;
@@ -178,16 +216,21 @@
 				#interrupt-cells = <1>;
 
 				interrupt-map-mask = <0 0 0 1>;
-				interrupt-map = <0 0 0 0 &pcie 0>;
+				interrupt-map = <0 0 0 0 &pcie1 0>;
 				status = "disabled";
 			};
 
+			gmac: gmac@18070000 {
+				compatible = "qca,qca9550-gmac";
+				reg = <0x18070000 0x14>;
+			};
+
 			wmac: wmac@18100000 {
 				compatible = "qca,qca9550-wmac";
 				reg = <0x18100000 0x10000>;
 
-				interrupt-parent = <&cpuintc>;
-				interrupts = <2>;
+				interrupt-parent = <&intc2>;
+				interrupts = <0>;
 
 				status = "disabled";
 			};
@@ -250,9 +293,12 @@
 };
 
 &eth0 {
-	compatible = "qca,qca9550-eth", "syscon";
+	compatible = "qca,qca9550-eth", "syscon", "simple-mfd";
+
+	pll-reg = <0 0x28 0>;
+	pll-handle = <&pll>;
 
-	pll-data = <0x82000101 0x80000101 0x80001313>;
+	pll-data = <0x16000000 0x00000101 0x00001616>;
 	phy-mode = "rgmii";
 
 	resets = <&rst 9>;
@@ -265,9 +311,12 @@
 };
 
 &eth1 {
-	compatible = "qca,qca9550-eth", "syscon";
+	compatible = "qca,qca9550-eth", "syscon", "simple-mfd";
+
+	pll-reg = <0 0x48 0>;
+	pll-handle = <&pll>;
 
-	pll-data = <0x82000101 0x80000101 0x80001313>;
+	pll-data = <0x16000000 0x00000101 0x00001616>;
 	phy-mode = "sgmii";
 
 	resets = <&rst 13>;