From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 9 Mar 2026 22:05:55 +0000 (-0700)
Subject: ipq806x: ap3935: fix uboot nvmem
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed70a07d1535e87befa5383e21db0ce0094ce5ee;p=thirdparty%2Fopenwrt.git

ipq806x: ap3935: fix uboot nvmem

In the transition to nvmem-layout and subsequent disabling of non layout
u-boot-env, this device was left out.

Transition to nvmem-layout to fix the mac address.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22263
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts
index 6b6e97d8050..2bc357d92e3 100644
--- a/target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts
+++ b/target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts
@@ -212,12 +212,15 @@
 				#size-cells = <1>;
 
 				cfg1@2a0000 {
-					compatible = "u-boot,env-redundant-bool";
 					label = "CFG1";
 					reg = <0x2a0000 0x0010000>;
 
-					ethaddr: ethaddr {
-						#nvmem-cell-cells = <1>;
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-bool";
+
+						ethaddr: ethaddr {
+							#nvmem-cell-cells = <1>;
+						};
 					};
 				};