Revert "bmips: huawei-hg556a-c: use nvmem for wifi eeprom"

This reverts commit 72f43ac220616fbd2f9658b9b60a861e8565a998.

The NVMEM codepath does not perform automatic byte conversion. It can be
fixed but the upstream version is quite different from the local
mac80211 patch. Revert until mac80211 gets updated and the whole mess
can get squared away.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22091
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit b270580deabb40fa7af702d35d32b1f9f80fd007)

diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-c.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-c.dts
index 5133e724768943ef8579a7a5125a82cf433b9e89..2c948da6d748b42d263ca1fd6594f12d66db6d99 100644 (file)
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-c.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-c.dts
@@ -38,26 +38,16 @@
        };
 };
 
-&cal_data {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               cal_data_1fe00: calibration@1fe00 {
-                       reg = <0x1fe00 0x200>;
-               };
-       };
-};
-
 &pci {
        status = "okay";
 
        wifi@1,0 {
-               compatible = "pci1814,3062";
+               compatible = "pci0,0";
                reg = <0x0800 0 0 0 0>;
 
-               nvmem-cells = <&cal_data_1fe00>, <&macaddr_cfe_6a0 1>;
-               nvmem-cell-names = "calibration", "mac-address";
+               ralink,mtd-eeprom = <&cal_data 0x1fe00>;
+
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
+               nvmem-cell-names = "mac-address";
        };
 };