ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_d-team_newifi-d2.dts

diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
index 85b8c5c2e0a35ad835af2bc568a4ecb0ccd82fbd..9d426fb17df10670301fb5804e068cec840fe775 100644 (file)
--- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
@@ -1,20 +1,19 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "d-team,newifi-d2", "mediatek,mt7621-soc";
-       model = "Newifi-D2";
+       model = "D-Team Newifi D2";
 
        aliases {
                led-boot = &led_power_blue;
                led-failsafe = &led_power_blue;
                led-running = &led_power_blue;
                led-upgrade = &led_power_blue;
-               label-mac-device = &ethernet;
+               label-mac-device = &gmac0;
        };
 
        chosen {
@@ -25,37 +24,40 @@
                compatible = "gpio-leds";
 
                power-amber {
-                       label = "newifi-d2:amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_power_blue: power-blue {
-                       label = "newifi-d2:blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                internet-amber {
-                       label = "newifi-d2:amber:internet";
+                       label = "amber:internet";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                internet-blue {
-                       label = "newifi-d2:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "newifi-d2:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "newifi-d2:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "newifi-d2:blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
                        linux,default-trigger = "usbport";
@@ -93,10 +95,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <45000000>;
+               broken-flash-reset;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -115,10 +118,32 @@
                                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 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
+
+                                       macaddr_factory_e006: macaddr@e006 {
+                                               reg = <0xe006 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -137,7 +162,8 @@
 &pcie0 {
        mt76@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>;
        };
 };
@@ -145,12 +171,45 @@
 &pcie1 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
+};
+
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       nvmem-cells = <&macaddr_factory_e006>;
+                       nvmem-cell-names = "mac-address";
+               };
+       };
 };
 
 &state_default {