ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_netgear_ex6150.dts

diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
index fc8a68a1359f4aa2fa3f096d8c42ba2c8b19911a..7ad421d1a0beac03cad9aa2d1df4bc8bc7b3ca48 100644 (file)
--- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "netgear,ex6150", "mediatek,mt7621-soc";
@@ -17,58 +17,57 @@
                led-upgrade = &power_amber;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                power_amber: power_amber {
-                       label = "ex6150:amber:power";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                power_green: power_green {
-                       label = "ex6150:green:power";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "ex6150:green:wps";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rightarrow {
-                       label = "ex6150:blue:rightarrow";
-                       gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+                       label = "blue:rightarrow";
+                       gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
                leftarrow {
-                       label = "ex6150:blue:leftarrow";
-                       gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+                       label = "blue:leftarrow";
+                       gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
                };
 
                router_green {
-                       label = "ex6150:green:router";
-                       gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+                       label = "green:router";
+                       gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                router_red {
-                       label = "ex6150:red:router";
-                       gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
+                       label = "red:router";
+                       gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
 
                client_green {
-                       label = "ex6150:green:client";
-                       gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+                       label = "green:client";
+                       gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                client_red {
-                       label = "ex6150:red:client";
-                       gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+                       label = "red:client";
+                       gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -77,20 +76,21 @@
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                toggle {
                        label = "AP/Extender toggle";
-                       gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 48 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
+                       linux,input-type = <EV_SW>;
                        /* Active when switch is set to "Access Point" */
                };
        };
@@ -121,10 +121,28 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -210,12 +228,16 @@
 
 &pcie {
        status = "okay";
+
+       reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>,
+                     <&gpio 8 GPIO_ACTIVE_LOW>;
 };
 
 &pcie0 {
        wifi@0,0 {
                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>;
        };
 };
@@ -223,20 +245,33 @@
 &pcie1 {
        wifi@0,0 {
                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>;
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x00000004>;
+       pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "sdhci", "rgmii2", "jtag";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan";
                };
        };
 };
+
+&state_default {
+       gpio {
+               groups = "sdhci", "rgmii2", "jtag";
+               function = "gpio";
+       };
+};