Merge pull request #12 from wigyori/master

update oxnas target, update ipq806x target, create trunk tag and update revisioning accordingly

1 files changed, 60 insertions, 62 deletions

diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 2120dc7dcd..031d8f0052 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -6,68 +6,6 @@
 	compatible = "CY-SWR1100", "ralink,rt3883-soc";
 	model = "Samsung CY-SWR1100";
 
-	palmbus@10000000 {
-		gpio1: gpio@638 {
-			status = "okay";
-		};
-	};
-
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "spi";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
-	ethernet@10100000 {
-		port@0 {
-			mediatek,fixed-link = <1000 1 1 1>;
-			phy-mode = "rgmii";
-		};
-	};
-
-	pci@10140000 {
-		status = "okay";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pci_pins>;
-
-		pci_pins: pci {
-			pci {
-				ralink,group = "pci";
-				ralink,function = "pci-fnc";
-			};
-		};
-
-		host-bridge {
-			pci-bridge@1 {
-				status = "okay";
-
-				wmac@0,0 {
-					ralink,5ghz = <0>;
-					compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-					reg = < 0x10000 0 0 0 0 >;
-					ralink,eeprom = "rt2x00pci_1_0.eeprom";
-				};
-			};
-		};
-	};
-
-	wmac@10180000 {
-		status = "okay";
-		ralink,2ghz = <0>;
-		ralink,mtd-eeprom = <&factory 0>;
-	};
-
-	ehci@101c0000 {
-		status = "okay";
-	};
-
-	ohci@101c1000 {
-		status = "okay";
-	};
-
 	nor-flash@1c000000 {
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
@@ -150,3 +88,63 @@
 		};
 	};
 };
+
+&gpio1 {
+	status = "okay";
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "spi";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&ethernet {
+	port@0 {
+		mediatek,fixed-link = <1000 1 1 1>;
+		phy-mode = "rgmii";
+	};
+};
+
+&pci {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pci_pins>;
+
+	pci_pins: pci {
+		pci {
+			ralink,group = "pci";
+			ralink,function = "pci-fnc";
+		};
+	};
+
+	host-bridge {
+		pci-bridge@1 {
+			status = "okay";
+
+			wmac@0,0 {
+				ralink,5ghz = <0>;
+				compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
+				reg = < 0x10000 0 0 0 0 >;
+				ralink,eeprom = "rt2x00pci_1_0.eeprom";
+			};
+		};
+	};
+};
+
+&wmac {
+	status = "okay";
+	ralink,2ghz = <0>;
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};