lantiq: convert ralink,mtd-eeprom to nvmem

These devices use the binding + eeprom-swap. Turns out the reason swap
is needed is because the binding wrongly swaps the data on big endian
hosts. NVMEM doesn't do this and thus just works.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22207
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 4fc79b7be3dcadc06c2d08b3901ebee811cff594..1c651b71eee860512a6e9cf0a8c05820e27282b8 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -156,6 +156,10 @@
                                                reg = <0x16 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -174,9 +178,7 @@
        wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16 1>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index fa8df363d318365588fee388e0e7b1a2d849f5b0..9ad8ce0268dd082931537d0e73093510c271040a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -162,6 +162,10 @@
                                        macaddr_boardconfig_16: macaddr@16 {
                                                reg = <0x16 0x6>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -187,8 +191,8 @@
        wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
+               nvmem-cells = <&eeprom_boardconfig_410>;
+               nvmem-cell-names = "eeprom";
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 0c2cbbf9dbaf69818a733cd49bc22cccef06215b..6ea201184fca9c8fe3c9f5132dc41a3945ecb49e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -194,6 +194,10 @@
                                                reg = <0x16 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -211,10 +215,10 @@
        req-mask = <0xf>;
 
        wifi@e,0 {
-               compatible = "pci0,0";
+               compatible = "pci1814,0601";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
+               nvmem-cells = <&eeprom_boardconfig_410>;
+               nvmem-cell-names = "eeprom";
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 4387a77fda0ab13d12ec9fba571e915e84127021..18206e91d223f6e49843cec71ee1be9116cd776e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -204,6 +204,10 @@
                                        macaddr_boardconfig_16: macaddr@16 {
                                                reg = <0x16 0x6>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -234,10 +238,8 @@
        wifi0: wifi@e,0 {
                compatible = "pci1814,0601";
                reg = <0x7000 0 0 0 0>;
-               nvmem-cells = <&macaddr_boardconfig_16>;
-               nvmem-cell-names = "mac-address";
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
+               nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index b4effa65efbdfc74516665d398194df502b8923f..115410a5380147912b8048faec451ff689e5c592 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -219,6 +219,10 @@
                                        macaddr_boardconfig_16: macaddr@16 {
                                                reg = <0x16 0x6>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -254,10 +258,8 @@
        wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 
        usb@0f,0 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index c9f1c83ffaecd2999e715f813a7300a8d78a614a..294691f1d7ead491f03c7cdcef1c30a2c0a1552b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -230,6 +230,10 @@
                                                reg = <0x16 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -243,10 +247,8 @@
        wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16 1>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 4901fd7223bf2ed8518b87c73ce38f7c1db4ffd4..672d19782a7a883ba71db37c53999c49f831bccb 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -247,6 +247,10 @@
                                                reg = <0x16 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
+
+                                       eeprom_boardconfig_410: eeprom@410 {
+                                               reg = <0x410 0x200>;
+                                       };
                                };
                        };
                };
@@ -260,10 +264,8 @@
        wifi@e,0 {
                compatible = "pci1814,3091";
                reg = <0x7000 0 0 0 0>;
-               ralink,mtd-eeprom = <&boardconfig 0x410>;
-               ralink,eeprom-swap;
-               nvmem-cells = <&macaddr_boardconfig_16 1>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16 1>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };