linux: replace nvmem-cells with nvmem-layout

The former is deprecated in favor of nvmem-layout. In preparation for
eventual removal from the kernel, do so here.

Some of these are leftovers from nvmem-layout conversion.

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

diff --git a/target/linux/ath79/dts/qca9563_dlink_covr.dtsi b/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
index 640de11d34f1815a62d859d8113efa81057c6a76..d298c84e6201f68ca3044b677ffc59596941b669 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
@@ -90,8 +90,6 @@
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;

diff --git a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
index 0560bbd33e0adc6c270c94f9115b4b4574f41265..896185ae146bf19cea4c2c93a42c33c2ecc958df 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
+++ b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
@@ -266,8 +266,7 @@
                                };
                        };
 
-                       config1: partition@1C0000 {
-                               compatible = "nvmem-cells";
+                       partition@1C0000 {
                                label = "Config1";
                                reg = <0x001C0000 0x00080000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
index d5c868567bddfa651337f338dcc824973763a2b3..d2cca4ee95f514a3f71f3e5c4d55b7008db6d1f4 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
@@ -164,7 +164,6 @@
                        };
 
                        partition@180000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x180000 0x100000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
index 230a612a34f7d370eb09e92284950d9949bf10cd..649787ae64b1ace48fdd65a248fbdc76b51baa1a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
+++ b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
@@ -47,7 +47,6 @@
                                reg = <0x180000 0x200000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;

diff --git a/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts b/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
index 1bf5d7317e84711703bb5143209efadcd96dc6ae..4add0fd51f53bb7dbf0a737dd78a4a0ffff0ace1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
+++ b/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
@@ -183,7 +183,6 @@
                        };
 
                        partition@180000 {
-                               compatible = "nvmem-cells";
                                reg = <0x180000 0x200000>;
                                label = "factory";
                                read-only;

diff --git a/target/linux/mediatek/patches-6.6/101-dts-update-mt7629-rfb.patch b/target/linux/mediatek/patches-6.6/101-dts-update-mt7629-rfb.patch
index 166d97ab01ae5a812f5c63f04fd6c84b9f45d91f..05dc2583bb9eb0bbda566cf37793256c62d3b3ed 100644 (file)
--- a/target/linux/mediatek/patches-6.6/101-dts-update-mt7629-rfb.patch
+++ b/target/linux/mediatek/patches-6.6/101-dts-update-mt7629-rfb.patch
@@ -40,21 +40,23 @@
                        };
                };
        };
-@@ -273,3 +282,17 @@
+@@ -273,3 +282,19 @@
        pinctrl-0 = <&watchdog_pins>;
        status = "okay";
  };
 +
 +&factory {
-+      compatible = "nvmem-cells";
-+      #address-cells = <1>;
-+      #size-cells = <1>;
++      nvmem-layout {
++              compatible = "fixed-layout";
++              #address-cells = <1>;
++              #size-cells = <1>;
 +
-+      macaddr_factory_24: macaddr@24 {
-+              reg = <0x24 0x6>;
-+      };
++              macaddr_factory_24: macaddr@24 {
++                      reg = <0x24 0x6>;
++              };
 +
-+      macaddr_factory_2a: macaddr@2a {
-+              reg = <0x2a 0x6>;
++              macaddr_factory_2a: macaddr@2a {
++                      reg = <0x2a 0x6>;
++              };
 +      };
 +};

diff --git a/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch b/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
index 1f02ff74b07d17ae0276201dfbcb8d0dc05f85c6..135952ee5f05c487ab6553ddfcaa94b162deda6a 100644 (file)
--- a/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
+++ b/target/linux/mvebu/patches-6.6/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
@@ -42,7 +42,7 @@
  };
  
  &pinctrl {
-@@ -259,48 +280,52 @@
+@@ -259,48 +280,50 @@
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <20000000>;
  
@@ -112,8 +112,6 @@
 +                              label = "vendor";
 +                              read-only;
 +
-+                              compatible = "nvmem-cells";
-+
 +                              nvmem-layout {
 +                                      compatible = "fixed-layout";
 +                                      #address-cells = <1>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts
index 940224dd3550e6848a2842d24f01057f8a6daee9..439b394e8c599098fedf41deec7ed271d5097bc1 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts
@@ -161,22 +161,25 @@
                        };
 
                        partition@360000 {
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                label = "0:ART";
                                reg = <0x00360000 0x00040000>;
 
-                               macaddr_eth0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_eth1: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
+                                       macaddr_eth0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_eth1: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
 
-                               macaddr_eth2: macaddr@c {
-                                       reg = <0xc 0x6>;
+                                       macaddr_eth2: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
index 2fe723591e77f48b28f0b63b7ed0b02909f6002e..4fd768f4e59c4a34b8ad2e1222083ebd571d483f 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
@@ -339,12 +339,14 @@
                                label = "0:ethphyfw1";
                                reg = <0x3b0000 0x80000>;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               aqr0_fw: firmware@0 {
-                                       reg = <0x0 0x5fc02>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       aqr0_fw: firmware@0 {
+                                               reg = <0x0 0x5fc02>;
+                                       };
                                };
                        };
 
@@ -352,12 +354,14 @@
                                label = "0:ethphyfw2";
                                reg = <0x430000 0x80000>;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               aqr1_fw: firmware@0 {
-                                       reg = <0x0 0x5fc02>;
+                                       aqr1_fw: firmware@0 {
+                                               reg = <0x0 0x5fc02>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
index cb1f3b8055af56f5bf821ce42ca0dbb5763fe970..d12933a81f63f979a123340b2000a03016f2a1a5 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
+++ b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
@@ -164,7 +164,6 @@
                        };
 
                        partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;