ramips: clean up useless dts partition labels

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

diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index e36602d6c9adf737f3fb31e43f0dc1f86cb3b648..983c7fc03e9e6c526aa02f6985727e37189312a4 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -7,10 +7,10 @@
        compatible = "onion,omega2", "mediatek,mt7628an-soc";
 
        aliases {
-               led-boot = &system_led;
-               led-failsafe = &system_led;
-               led-running = &system_led;
-               led-upgrade = &system_led;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        chosen {
@@ -20,83 +20,73 @@
        leds {
                compatible = "gpio-leds";
 
-               system_led: system {
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+               led_system: system {
+                       label = "amber:system";
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_RESTART>;
                };
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "gpio";
-                       ralink,function = "gpio";
-               };
-
-               perst {
-                       ralink,group = "perst";
-                       ralink,function = "gpio";
-               };
-
-               refclk {
-                       ralink,group = "refclk";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "gpio";
+               function = "gpio";
+       };
 
-               i2s {
-                       ralink,group = "i2s";
-                       ralink,function = "gpio";
-               };
+       perst {
+               groups = "perst";
+               function = "gpio";
+       };
 
-               spis {
-                       ralink,group = "spis";
-                       ralink,function = "gpio";
-               };
+       refclk {
+               groups = "refclk";
+               function = "gpio";
+       };
 
-               wled_kn {
-                       ralink,group = "wled_kn";
-                       ralink,function = "gpio";
-               };
+       i2s {
+               groups = "i2s";
+               function = "gpio";
+       };
 
-               wled_an {
-                       ralink,group = "wled_an";
-                       ralink,function = "gpio";
-               };
+       spis {
+               groups = "spis";
+               function = "gpio";
+       };
 
-               wdt {
-                       ralink,group = "wdt";
-                       ralink,function = "gpio";
-               };
+       wled_kn {
+               groups = "wled_kn";
+               function = "gpio";
+       };
 
-               pwm0 {
-                       ralink,group = "pwm0";
-                       ralink,function = "gpio";
-               };
+       wled_an {
+               groups = "wled_an";
+               function = "gpio";
+       };
 
-               pwm1 {
-                       ralink,group = "pwm1";
-                       ralink,function = "gpio";
-               };
+       wdt {
+               groups = "wdt";
+               function = "gpio";
        };
-};
 
-&gpio1 {
-       status = "okay";
-};
+       pwm0 {
+               groups = "pwm0";
+               function = "gpio";
+       };
 
-&gpio2 {
-       status = "okay";
+       pwm1 {
+               groups = "pwm1";
+               function = "gpio";
+       };
 };
 
 &spi0 {
@@ -105,7 +95,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
-       m25p80@0 {
+       flash0: flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <40000000>;
@@ -127,10 +117,24 @@
                                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>;
+                                       };
+
+                                       macaddr_factory_28: macaddr@28 {
+                                               reg = <0x28 0x6>;
+                                       };
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -162,7 +166,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x28>;
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
 };
 
 &sdhci {
@@ -172,4 +177,7 @@
 
 &wmac {
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };