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>
This commit is contained in:
Rosen Penev
2024-08-06 12:29:58 -07:00
committed by Robert Marko
parent d6c5805db3
commit 648d070c76
10 changed files with 41 additions and 41 deletions

View File

@@ -266,8 +266,7 @@
};
};
config1: partition@1C0000 {
compatible = "nvmem-cells";
partition@1C0000 {
label = "Config1";
reg = <0x001C0000 0x00080000>;
read-only;

View File

@@ -164,7 +164,6 @@
};
partition@180000 {
compatible = "nvmem-cells";
label = "factory";
reg = <0x180000 0x100000>;
read-only;

View File

@@ -47,7 +47,6 @@
reg = <0x180000 0x200000>;
read-only;
compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;

View File

@@ -183,7 +183,6 @@
};
partition@180000 {
compatible = "nvmem-cells";
reg = <0x180000 0x200000>;
label = "factory";
read-only;

View File

@@ -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>;
+ };
+ };
+};