ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
index 82bc8c9957d69267fb5b88a61b6ac10360de292b..7fcd68e6ba2ea808a9b9b5684e889ec51b00194e 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi
@@ -19,31 +19,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       gpio_export {
-               compatible = "gpio-export";
-               #size-cells = <0>;
-
-               usbpower {
-                       gpio-export,name = "usbpower";
-                       gpio-export,output = <1>;
-                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&sysc {
-       ralink,gpiomux = "i2c", "jtag";
-       ralink,uartmux = "gpio";
-       ralink,wdtmux = <1>;
-};
-
-&gpio0 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
 };
 
 &gpio3 {
@@ -53,10 +28,11 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <10000000>;
+               spi-max-frequency = <80000000>;
+               m25p,fast-read;
 
                partitions {
                        compatible = "fixed-partitions";
@@ -70,30 +46,48 @@
                        };
 
                        partition@30000 {
-                               label = "u-boot-env";
+                               label = "hw_panic";
                                reg = <0x30000 0x10000>;
                                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 {
                                compatible = "denx,uimage";
                                label = "firmware";
-                               reg = <0x50000 0xf80000>;
+                               reg = <0x50000 0xf70000>;
                        };
 
-                       partition@fd0000 {
-                               label = "hwf_config";
-                               reg = <0xfd0000 0x10000>;
+                       partition@fc0000 {
+                               label = "oem";
+                               reg = <0xfc0000 0x20000>;
                                read-only;
                        };
 
-                       bdinfo: partition@fe0000 {
+                       partition@fe0000 {
                                label = "bdinfo";
                                reg = <0xfe0000 0x10000>;
                                read-only;
@@ -109,9 +103,9 @@
 };
 
 &ethernet {
-       pinctrl-names = "default";
-       pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "wllll";
 };
 
@@ -120,9 +114,8 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pa_pins>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &state_default {