ramips: DTS rework

[openwrt/openwrt.git] / target / linux / ramips / dts / Y1S.dts

diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/Y1S.dts
index 7679e0a72147ca0406c57ed905bc05b77234c653..cfa5e2123aa1d600d2d287f1a76950f0365d1853 100644 (file)
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/Y1S.dts
@@ -6,40 +6,6 @@
        compatible = "lenovo,Y1S", "ralink,mt7620a-soc";
        model = "Lenovo Y1S";
 
-       ethernet@10100000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x4>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
-               mediatek,portmap = "wllll";
-
-               port@4 {
-                       status = "okay";
-                       phy-handle = <&phy4>;
-                       phy-mode = "rgmii";
-               };
-
-               port@5 {
-                       status = "okay";
-                       phy-handle = <&phy5>;
-                       phy-mode = "rgmii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy5: ethernet-phy@5 {
-                               reg = <5>;
-                               phy-mode = "rgmii";
-                       };
-               };
-       };
-
        gpio_export {
                compatible = "gpio-export";
                #size-cells = <0>;
@@ -61,10 +27,6 @@
                };
        };
 
-       gsw@10110000 {
-               mediatek,port4 = "gmac";
-       };
-       
        gpio-leds {
                compatible = "gpio-leds";
 
@@ -104,3 +66,41 @@
                };
        };
 };
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+       mediatek,portmap = "wllll";
+
+       port@4 {
+               status = "okay";
+               phy-handle = <&phy4>;
+               phy-mode = "rgmii";
+       };
+
+       port@5 {
+               status = "okay";
+               phy-handle = <&phy5>;
+               phy-mode = "rgmii";
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy4: ethernet-phy@4 {
+                       reg = <4>;
+                       phy-mode = "rgmii";
+               };
+
+               phy5: ethernet-phy@5 {
+                       reg = <5>;
+                       phy-mode = "rgmii";
+               };
+       };
+};
+
+&gsw {
+       mediatek,port4 = "gmac";
+};