[openwrt/openwrt] linux: replace nvmem-cells with nvmem-layout
LEDE Commits
lede-commits at lists.infradead.org
Fri Dec 27 04:35:03 PST 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/648d070c76616ba13ef692e8f270a2dcc08b7bd4
commit 648d070c76616ba13ef692e8f270a2dcc08b7bd4
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Tue Aug 6 12:29:58 2024 -0700
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 at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16097
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
target/linux/ath79/dts/qca9563_dlink_covr.dtsi | 2 --
.../dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi | 3 +--
.../mediatek/dts/mt7981b-openembed-som7981.dts | 1 -
.../mediatek/dts/mt7981b-unielec-u7981-01-nand.dts | 1 -
.../mediatek/dts/mt7986a-acelink-ew-7886cax.dts | 1 -
.../patches-6.6/101-dts-update-mt7629-rfb.patch | 20 +++++++++--------
...-dts-armada-370-synology-ds213j-mtd-parts.patch | 4 +---
.../arch/arm64/boot/dts/qcom/ipq6010-mango-dvk.dts | 25 ++++++++++++---------
.../arch/arm64/boot/dts/qcom/ipq8072-301w.dts | 26 +++++++++++++---------
target/linux/ramips/dts/mt7620a_bolt_bl100.dts | 1 -
10 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/target/linux/ath79/dts/qca9563_dlink_covr.dtsi b/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
index 640de11d34..d298c84e62 100644
--- 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 0560bbd33e..896185ae14 100644
--- 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 at 1C0000 {
- compatible = "nvmem-cells";
+ partition at 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 d5c868567b..d2cca4ee95 100644
--- a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
@@ -164,7 +164,6 @@
};
partition at 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 230a612a34..649787ae64 100644
--- 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 1bf5d7317e..4add0fd51f 100644
--- 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 at 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 166d97ab01..05dc2583bb 100644
--- 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 at 24 {
-+ reg = <0x24 0x6>;
-+ };
++ macaddr_factory_24: macaddr at 24 {
++ reg = <0x24 0x6>;
++ };
+
-+ macaddr_factory_2a: macaddr at 2a {
-+ reg = <0x2a 0x6>;
++ macaddr_factory_2a: macaddr at 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 1f02ff74b0..135952ee5f 100644
--- 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 940224dd35..439b394e8c 100644
--- 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 at 360000 {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
label = "0:ART";
reg = <0x00360000 0x00040000>;
- macaddr_eth0: macaddr at 0 {
- reg = <0x0 0x6>;
- };
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
- macaddr_eth1: macaddr at 6 {
- reg = <0x6 0x6>;
- };
+ macaddr_eth0: macaddr at 0 {
+ reg = <0x0 0x6>;
+ };
+
+ macaddr_eth1: macaddr at 6 {
+ reg = <0x6 0x6>;
+ };
- macaddr_eth2: macaddr at c {
- reg = <0xc 0x6>;
+ macaddr_eth2: macaddr at 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 2fe723591e..4fd768f4e5 100644
--- 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 at 0 {
- reg = <0x0 0x5fc02>;
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ aqr0_fw: firmware at 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 at 0 {
- reg = <0x0 0x5fc02>;
+ aqr1_fw: firmware at 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 cb1f3b8055..d12933a81f 100644
--- a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
+++ b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
@@ -164,7 +164,6 @@
};
partition at 40000 {
- compatible = "nvmem-cells";
label = "factory";
reg = <0x40000 0x10000>;
read-only;
More information about the lede-commits
mailing list