ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt5350_olimex_rt5350f-olinuxino.dtsi

diff --git a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
index 8665c7dd735b15711db8cbc02ccf6a2cdfaf15d5..58b0bacc8ae790a22001c2011020e0b04cd1e401 100644 (file)
--- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
+++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi
@@ -4,7 +4,6 @@
        compatible = "olimex,rt5350f-olinuxino", "ralink,rt5350-soc";
 
        aliases {
-               serial0 = &uartlite;
                serial1 = &uart;
        };
 };
@@ -12,7 +11,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -34,10 +33,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 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -49,23 +62,20 @@
        };
 };
 
-&gpio1 {
-       status = "okay";
-};
-
 &state_default {
        gpio {
-               ralink,group = "jtag";
-               ralink,function = "gpio";
+               groups = "jtag";
+               function = "gpio";
        };
        uartf_gpio {
-               ralink,group = "uartf";
-               ralink,function = "gpio uartf";
+               groups = "uartf";
+               function = "gpio uartf";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
@@ -74,16 +84,9 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
        ralink,led-polarity = <1>;
-};
-
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &i2c {