ipq806x: fix caldata loading for mr42/mr52

Commit 6cc149f167 (ipq806x: mr42/mr52: use nvmem for caldata, 2026-02-25)
broke wifi on meraki mr42/52 by making caldata inaccessible.
This commit adds UBI nvmem to ipq806x target and corrects art partition address

Signed-off-by: Aleksander Wałęski <olewales@gmail.com>

diff --git a/target/linux/ipq806x/config-6.12 b/target/linux/ipq806x/config-6.12
index 1e3dd40df33f62ea8ab124c107d180f58b34ac47..74c32dbdc6e03a8af4944a0b41fdf4647e5bc607 100644 (file)
--- a/target/linux/ipq806x/config-6.12
+++ b/target/linux/ipq806x/config-6.12
@@ -300,6 +300,7 @@ CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_UBI_NVMEM=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y

diff --git a/target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi
index 69b39a3afe2d8cfcd296ccb2e6165bebd0b31696..d5f56d070c64015a1f7f45b8b849e89d8b890bc4 100644 (file)
--- a/target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi
+++ b/target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi
@@ -194,8 +194,14 @@
                        partition@36c0000 {
                                label = "ubi";
                                reg = <0x36c0000 0x46c0000>;
+                       };
 
+                       partition@7d80000 {
+                               label = "art";
+                               reg = <0x7d80000 0x200000>;
+                               read-only;
                                volumes {
+
                                        ubi-volume-art {
                                                volname = "ART";
 
@@ -211,12 +217,6 @@
                                        };
                                };
                        };
-
-                       partition@7d80000 {
-                               label = "art";
-                               reg = <0x7d80000 0x200000>;
-                               read-only;
-                       };
                };
        };
 };