ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_asus_rt-acx5p.dtsi

diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
index a34aed2df01997d570c505953b9084c53039dddc..5bccddec0b6ff4ff08e6a47ab81ae1103431c0ec 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
+++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -13,16 +14,6 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
-       palmbus: palmbus@1E000000 {
-               i2c@900 {
-                       status = "okay";
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
 
@@ -43,23 +34,29 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "rt-ac85p:blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
-               wlan2g {
-                       label = "rt-ac85p:blue:wlan2g";
-                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0radio";
-               };
 
                wlan5g {
-                       label = "rt-ac85p:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1radio";
+                       linux,default-trigger = "phy1tpt";
+               };
+
+               wlan2g {
+                       label = "blue:wlan2g";
+                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
                };
        };
 };
 
+&i2c {
+       status = "okay";
+};
+
 &sdhci {
        status = "okay";
 };
@@ -84,13 +81,31 @@
                        read-only;
                };
 
-               factory: partition@1e0000 {
+               partition@1e0000 {
                        label = "factory";
                        reg = <0x1e0000 0x100000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
+                       };
                };
 
-               factory2: partition@2e0000 {
+               partition@2e0000 {
                        label = "factory2";
                        reg = <0x2e0000 0x100000>;
                        read-only;
@@ -121,7 +136,8 @@
        wifi0: wifi@0,0 {
                compatible = "pci14c3,7615";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
        };
 };
@@ -130,26 +146,59 @@
        wifi1: wifi@0,0 {
                compatible = "pci14c3,7615";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
-       mediatek,portmap = "wllll";
-       port@5 {
-               status = "disabled";
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy0>;
+
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
        };
 };
 
-&i2c {
-       status = "disabled";
+&switch0 {
+       ports {
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan4";
+               };
+       };
 };
 
 &state_default {
        gpio {
-               ralink,group = "uart2", "uart3", "i2c";
-               ralink,function = "gpio";
+               groups = "uart2", "uart3", "i2c";
+               function = "gpio";
        };
 };