Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

config/Config-build.in

@@ -69,6 +69,7 @@ menu "Global build settings"
 		default y
 
 	config USE_APK
+		imply PACKAGE_apk-mbedtls
 		bool "Use APK instead of OPKG to build distribution (EXPERIMENTAL)"
 
 	comment "General build options"
@@ -113,6 +114,7 @@ menu "Global build settings"
 	config IPK_FILES_CHECKSUMS
 		bool
 		prompt "Record files checksums in package metadata"
+		depends on !USE_APK
 		help
 		  This makes file checksums part of package metadata. It increases size
 		  but provides you with pkg_check command to check for flash corruptions.

include/package-pack.mk

@@ -205,6 +205,8 @@ $(_endef)
 	rm -rf $$(IDIR_$(1))
 ifeq ($$(CONFIG_USE_APK),)
 	$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1))))
+else
+	$$(call remove_ipkg_files,$(1),$$(call apk_package_files,$(call gen_package_wildcard,$(1))))
 endif
 	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
@@ -224,15 +226,6 @@ endif
 
 	$(RSTRIP) $$(IDIR_$(1))
 
-    ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),)
-	(cd $$(IDIR_$(1)); \
-		( \
-			find . -type f \! -path ./CONTROL/\* -exec $(MKHASH) sha256 -n \{\} \; 2> /dev/null | \
-			sed 's|\([[:blank:]]\)\./| \1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \
-		) || true \
-	)
-    endif
-
     ifneq ($$(KEEP_$(1)),)
 		@( \
 			keepfiles=""; \
@@ -305,7 +298,38 @@ else
 	if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi;
 	if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1).alternatives; fi;
 	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" > $$(IDIR_$(1))/lib/apk/packages/$(1).list)
-	if [ -f $$(ADIR_$(1))/conffiles ]; then mv $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; fi;
+	# Move conffiles to IDIR and build conffiles_static with csums
+	if [ -f $$(ADIR_$(1))/conffiles ]; then \
+		mv -f $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
+		for file in $$$$(cat $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles); do \
+			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
+			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
+			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
+		done; \
+	fi
+
+	# Some package (base-files) manually append stuff to conffiles
+	# Append stuff from it and delete the CONTROL directory since everything else should be migrated
+	if [ -f $$(IDIR_$(1))/CONTROL/conffiles ]; then \
+		echo $$$$(IDIR_$(1))/CONTROL/conffiles >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
+		for file in $$$$(cat $$(IDIR_$(1))/CONTROL/conffiles); do \
+			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
+			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
+			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
+		done; \
+		rm -rf $$(IDIR_$(1))/CONTROL/conffiles; \
+	fi
+
+    ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),)
+	if [ -f $$(IDIR_$(1))/CONTROL/files-sha256sum ]; then mv -f $$(IDIR_$(1))/CONTROL/files-sha256sum $$(IDIR_$(1))/lib/apk/packages/$(1).files-sha256sum; fi
+    endif
+
+	if [ -z "$$$$(ls -A $$(IDIR_$(1))/CONTROL 2>/dev/null)" ]; then \
+		rm -rf $$(IDIR_$(1))/CONTROL; \
+	else \
+		echo "CONTROL directory $$(IDIR_$(1))/CONTROL is not empty! This is not right and should be checked!" >&2; \
+		exit 1; \
+	fi
 
 	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
 	  --info "name:$(1)$$(ABIV_$(1))" \

include/rootfs.mk

@@ -80,24 +80,27 @@ define prepare_rootfs
 	@( \
 		cd $(1); \
 		if [ -n "$(CONFIG_USE_APK)" ]; then \
-		$(STAGING_DIR_HOST)/bin/tar -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install" -O > script.sh; \
-		chmod +x script.sh; \
-		IPKG_INSTROOT=$(1) $$(command -v bash) script.sh; \
+			IPKG_POSTINST_PATH=./lib/apk/db/*.post-install; \
+			$(STAGING_DIR_HOST)/bin/tar -C ./lib/apk/db/ -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install"; \
 		else \
-		for script in ./usr/lib/opkg/info/*.postinst; do \
+			IPKG_POSTINST_PATH=./usr/lib/opkg/info/*.postinst; \
+		fi; \
+		for script in $$IPKG_POSTINST_PATH; do \
 			IPKG_INSTROOT=$(1) $$(command -v bash) $$script; \
 			ret=$$?; \
 			if [ $$ret -ne 0 ]; then \
 				echo "postinst script $$script has failed with exit code $$ret" >&2; \
 				exit 1; \
 			fi; \
+			[ -n "$(CONFIG_USE_APK)" ] && $(STAGING_DIR_HOST)/bin/tar --delete -f ./lib/apk/db/scripts.tar $$(basename $$script); \
 		done; \
-		$(if $(IB),,awk -i inplace \
-			'/^Status:/ { \
-				if ($$3 == "user") { $$3 = "ok" } \
-				else { sub(/,\<user\>|\<user\>,/, "", $$3) } \
-			}1' $(1)/usr/lib/opkg/status) ; \
-		$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status ;) \
+		if [ -z "$(CONFIG_USE_APK)" ]; then \
+			$(if $(IB),,awk -i inplace \
+				'/^Status:/ { \
+					if ($$3 == "user") { $$3 = "ok" } \
+					else { sub(/,\<user\>|\<user\>,/, "", $$3) } \
+				}1' $(1)/usr/lib/opkg/status) ; \
+			$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status ;) \
 		fi; \
 		for script in ./etc/init.d/*; do \
 			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
@@ -115,6 +118,7 @@ define prepare_rootfs
 	rm -rf \
 		$(1)/boot \
 		$(1)/tmp/* \
+		$(1)/lib/apk/db/*.post-install* \
 		$(1)/usr/lib/opkg/info/*.postinst* \
 		$(1)/usr/lib/opkg/lists/* \
 		$(1)/var/lock/*.lock

include/target.mk

@@ -6,6 +6,16 @@
 ifneq ($(__target_inc),1)
 __target_inc=1
 
+ifneq ($(DUMP),)
+  # Parse generic config that might be set before a .config is generated to modify the
+  # default package configuration
+  # Keep DYNAMIC_DEF_PKG_CONF in sync with toplevel.mk to reflect the same configs
+  DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_SECCOMP
+  $(foreach config, $(DYNAMIC_DEF_PKG_CONF), \
+    $(eval $(config) := $(shell grep "$(config)=y" $(TOPDIR)/.config 2>/dev/null)) \
+  )
+endif
+
 # default device type
 DEVICE_TYPE?=router
 
@@ -26,8 +36,8 @@ DEFAULT_PACKAGES:=\
 	urandom-seed \
 	urngd
 
-ifdef CONFIG_USE_APK
-DEFAULT_PACKAGES+=apk
+ifneq ($(CONFIG_USE_APK),)
+DEFAULT_PACKAGES+=apk-openssl
 else
 DEFAULT_PACKAGES+=opkg
 endif

include/toplevel.mk

@@ -75,7 +75,22 @@ endif
 
 _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p))
 
-prepare-tmpinfo: FORCE
+# Config that will invalidate the .targetinfo as they will affect
+# DEFAULT_PACKAGES.
+# Keep DYNAMIC_DEF_PKG_CONF in sync with target.mk to reflect the same configs
+DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_SECCOMP
+check-dynamic-def-pkg: FORCE
+	@+DEF_PKG_CONFS=""; \
+	if [ -f $(TOPDIR)/.config ]; then \
+		for config in $(DYNAMIC_DEF_PKG_CONF); do \
+			DEF_PKG_CONFS="$$DEF_PKG_CONFS "$$(grep "$$config"=y $(TOPDIR)/.config); \
+		done; \
+	fi; \
+	[ ! -f tmp/.packagedynamicdefault ] || OLD_DEF_PKG_CONFS=$$(cat tmp/.packagedynamicdefault); \
+	[ "$$DEF_PKG_CONFS" = "$$OLD_DEF_PKG_CONFS" ] || rm -rf tmp/info/.targetinfo*; \
+	mkdir -p tmp && echo "$$DEF_PKG_CONFS" > tmp/.packagedynamicdefault;
+
+prepare-tmpinfo: check-dynamic-def-pkg FORCE
 	@+$(MAKE) -r -s $(STAGING_DIR_HOST)/.prereq-build $(PREP_MK)
 	mkdir -p tmp/info feeds
 	[ -e $(TOPDIR)/feeds/base ] || ln -sf $(TOPDIR)/package $(TOPDIR)/feeds/base

package/Makefile

@@ -81,7 +81,7 @@ endif
 ifndef SDK
   $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
 ifneq ($(CONFIG_USE_APK),)
-  $(curdir)/compile: $(curdir)/system/apk/host/compile $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
+  $(curdir)//compile += $(curdir)/system/apk/host/compile $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
 else
   $(curdir)/compile: $(curdir)/system/opkg/host/compile
 endif

package/base-files/Makefile

@@ -249,6 +249,8 @@ ifneq ($(CONFIG_USE_APK),)
 	mkdir -p $(1)/etc/apk/
 	$(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories)
 	$(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories
+
+	rm -f $(1)/etc/uci-defaults/13_fix-group-user
 else
 	$(if $(CONFIG_CLEAN_IPKG),, \
 		mkdir -p $(1)/etc/opkg; \

package/base-files/files/etc/uci-defaults/13_fix-group-user

@@ -1,5 +1,8 @@
 . /lib/functions.sh
 
+# Skip if we don't have /usr/lib/opkg/info (APK installation)
+[ -d /usr/lib/opkg/info ] || exit 0
+
 for file in $(grep -sl Require-User /usr/lib/opkg/info/*.control); do
 	file="${file##*/}"
 	file="${file%.control}"

package/base-files/files/lib/functions.sh

@@ -533,4 +533,4 @@ cmdline_get_var() {
 	done
 }
 
-[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh
+[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh || true

package/base-files/files/sbin/pkg_check

@@ -23,6 +23,13 @@ MISSING=""
 SUMMARY=""
 NL="
 "
+if [ -d /usr/lib/opkg ]; then
+	IPKG_INFO_DIR=/usr/lib/opkg/info
+elif [ -d /lib/apk ];
+	IPKG_INFO_DIR=/lib/apk/packages
+else
+	exti 1
+fi
 
 # Arguments parsing
 while expr "x$1" : "x-" > /dev/null; do
@@ -49,12 +56,12 @@ done
 
 # Check all packages by default
 if [ -z "$1" ]; then
-	set $(cd /usr/lib/opkg/info/; for i in *.files-sha256sum; do basename $i .files-sha256sum; done)
+	set $(cd $IPKG_INFO_DIR; for i in *.files-sha256sum; do basename $i .files-sha256sum; done)
 fi
 
 # Iterate over packages
 while [ "$1" ]; do
-	if [ \! -f "/usr/lib/opkg/info/$1.files-sha256sum" ]; then
+	if [ \! -f "$IPKG_INFO_DIR/$1.files-sha256sum" ]; then
 		if [ "$ERRFATAL" = no ]; then
 			echo " * No checksums for $1 - skipping"
 			echo
@@ -72,13 +79,13 @@ while [ "$1" ]; do
 	fi
 	[ $QUIET = yes ] || echo " * Checking package $1:"
 	ERR=""
-	CHECK="$(sha256sum -c /usr/lib/opkg/info/$1.files-sha256sum 2> /dev/null)"
+	CHECK="$(sha256sum -c $IPKG_INFO_DIR/$1.files-sha256sum 2> /dev/null)"
 
 	# Are the changed files config files?
-	if [ $? -ne 0 ] && [ "$(cat "/usr/lib/opkg/info/$1.files-sha256sum")" ]; then
+	if [ $? -ne 0 ] && [ "$(cat "$IPKG_INFO_DIR/$1.files-sha256sum")" ]; then
 		NEWCHECK="$(echo "$CHECK" | grep '^.*: OK$')"
 		for i in $(echo "$CHECK" | sed -n 's|^\(.*\): FAILED$|\1|p'); do
-			if [ "$(grep "^$i\$" "/usr/lib/opkg/info/$1.conffiles" 2> /dev/null)" ] || \
+			if [ "$(grep "^$i\$" "$IPKG_INFO_DIR/$1.conffiles" 2> /dev/null)" ] || \
 			   [ "$(echo "$i" | grep "^/etc/uci-defaults/")" ]; then
 				NEWCHECK="${NEWCHECK}${NL}${i}: CONFIGURED"
 			else
@@ -91,7 +98,7 @@ while [ "$1" ]; do
 
 	# Do we have changed files or not?
 	if [ -z "$ERR" ]; then
-		[ $QUIET = yes ] || [ ! -s "/usr/lib/opkg/info/$1.files-sha256sum" ] || echo "$CHECK" | sed 's|^|   - |'
+		[ $QUIET = yes ] || [ ! -s "$IPKG_INFO_DIR/$1.files-sha256sum" ] || echo "$CHECK" | sed 's|^|   - |'
 		[ $QUIET = yes ] || echo " * Package $1 is ok"
 		[ $QUIET = yes ] || echo
 	else

package/base-files/files/sbin/sysupgrade

@@ -130,12 +130,20 @@ fi
 
 
 list_conffiles() {
-	awk '
-		BEGIN { conffiles = 0 }
-		/^Conffiles:/ { conffiles = 1; next }
-		!/^ / { conffiles = 0; next }
-		conffiles == 1 { print }
-	' /usr/lib/opkg/status
+	if [ -f /usr/lib/opkg/status ]; then
+		awk '
+			BEGIN { conffiles = 0 }
+			/^Conffiles:/ { conffiles = 1; next }
+			!/^ / { conffiles = 0; next }
+			conffiles == 1 { print }
+		' /usr/lib/opkg/status
+	elif [ -d /lib/apk/packages ]; then
+		conffiles=""
+		for file in /lib/apk/packages/*.conffiles_static; do
+			conffiles="$(echo -e "$(cat $file)\n$conffiles")"
+		done
+		echo "$conffiles"
+	fi
 }
 
 list_changed_conffiles() {

package/kernel/linux/modules/netdevices.mk

@@ -1671,7 +1671,7 @@ $(eval $(call KernelPackage,pcs-xpcs))
 define KernelPackage/stmmac-core
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Synopsis Ethernet Controller core (NXP,STMMicro,others)
-  DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +LINUX_6_6:kmod-of-mdio +kmod-ptp
+  DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +kmod-ptp
   KCONFIG:=CONFIG_STMMAC_ETH \
     CONFIG_STMMAC_SELFTESTS=n \
     CONFIG_STMMAC_PLATFORM \

package/kernel/mt76/Makefile

@@ -321,7 +321,7 @@ endef
 define KernelPackage/mt7996e
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7996E wireless driver
-  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
   FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
   AUTOLOAD:=$(call AutoProbe,mt7996e)
 endef

package/network/services/dropbear/Makefile

@@ -224,7 +224,6 @@ define Package/dropbear/install
 	$(INSTALL_CONF) ./files/dropbear.config $(1)/etc/config/dropbear
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
-	$(INSTALL_DIR) $(1)/usr/lib/opkg/info
 	$(INSTALL_DIR) $(1)/etc/dropbear
 	$(INSTALL_DIR) $(1)/lib/preinit
 	$(INSTALL_DATA) ./files/dropbear.failsafe $(1)/lib/preinit/99_10_failsafe_dropbear

package/system/apk/Makefile

@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_INSTALL:=1
 
 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
-PKG_BUILD_DEPENDS:=lua/host
+HOST_BUILD_DEPENDS:=lua/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -52,7 +52,6 @@ MESON_HOST_VARS+=VERSION=$(PKG_VERSION)
 MESON_VARS+=VERSION=$(PKG_VERSION)
 
 MESON_HOST_ARGS += \
-	-Dhelp=disabled \
 	-Dcompressed-help=false \
 	-Ddocs=disabled \
 	-Dcrypto_backend=openssl \

package/utils/yafut/Makefile

@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/kempniu/yafut.git
-PKG_MIRROR_HASH:=9cc6b4c485ce16d44b67ebf79e8bee1e07aecde112da739cf33e8714ac3842e7
-PKG_SOURCE_DATE:=2024-05-13
-PKG_SOURCE_VERSION:=2b45baaf1cced47af8f22dd3acbf1df2f04c7510
+PKG_MIRROR_HASH:=7540e977104d41b3aca27b58fda8cd84ebec80cfe01d955712fb8dc717aff6a6
+PKG_SOURCE_DATE:=2024-06-10
+PKG_SOURCE_VERSION:=38439f8a53d33b14744bc8f938662670b9d3e361
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE

target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts

@@ -147,7 +147,7 @@
 				read-only;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi

@@ -146,7 +146,7 @@
 				read-only;
 			};
 
-			art: partition@50000 {
+			partition@50000 {
 				label = "art";
 				reg = <0x0050000 0x0010000>;
 				read-only;

target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts

@@ -31,7 +31,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7161_netgear_wndr3700.dts

@@ -31,7 +31,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@7f0000 {
+	partition@7f0000 {
 		label = "art";
 		reg = <0x7f0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7161_netgear_wndr3800.dts

@@ -32,7 +32,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts

@@ -32,7 +32,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts

@@ -31,7 +31,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts

@@ -32,7 +32,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;

target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts

@@ -146,7 +146,7 @@
 				read-only;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;

target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts

@@ -171,7 +171,7 @@
 				openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x10000>;
 				read-only;

target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi

@@ -101,7 +101,7 @@
 				label = "firmware";
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;

target/linux/ath79/dts/ar7240_tplink.dtsi

@@ -99,7 +99,7 @@
 				label = "firmware";
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;

target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts

@@ -174,7 +174,7 @@
 				openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x10000>;
 				read-only;

target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts

@@ -31,7 +31,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@ff0000 {
+	partition@ff0000 {
 		label = "art";
 		reg = <0xff0000 0x10000>;
 		read-only;

target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts

@@ -31,7 +31,7 @@
 		openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
 	};
 
-	art: partition@7f0000 {
+	partition@7f0000 {
 		label = "art";
 		reg = <0x7f0000 0x10000>;
 		read-only;

target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts

@@ -128,7 +128,7 @@
 				reg = <0x020000 0x7d0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar7242_ubnt_sw.dtsi

@@ -100,7 +100,7 @@
 				read-only;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				reg = <0x7f0000 0x010000>;
 				label = "art";
 				read-only;

target/linux/ath79/dts/ar724x_ubnt_xm.dtsi

@@ -58,7 +58,7 @@
 				read-only;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi

@@ -134,7 +134,7 @@
 				read-only;
 			};
 
-			art: partition@1fe0000 {
+			partition@1fe0000 {
 				label = "art";
 				reg = <0x1fe0000 0x020000>;
 				read-only;
@@ -144,6 +144,10 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
+					cal_art_11000: calibration@11000 {
+						reg = <0x11000 0x440>;
+					};
+
 					macaddr_art_1120c: macaddr@1120c {
 						reg = <0x1120c 0x6>;
 					};
@@ -248,7 +252,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x11000>;
+	nvmem-cells = <&cal_art_11000>;
+	nvmem-cell-names = "calibration";
 };
 
 &uart {

target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts

@@ -87,16 +87,26 @@
 				};
 			};
 
-			partition@1 {
+			partition@20000 {
 				compatible = "tplink,firmware";
 				label = "firmware";
 				reg = <0x020000 0x3D0000>;
 			};
 
-			art: partition@2 {
+			partition@3f0000 {
 				label = "art";
-				reg = <0x3F0000 0x010000>;
+				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -129,7 +139,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts

@@ -120,10 +120,20 @@
 				reg = <0x020000 0x7D0000>;
 			};
 
-			art: partition@7F0000 {
+			partition@7f0000 {
 				label = "art";
-				reg = <0x7F0000 0x010000>;
+				reg = <0x7f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -145,7 +155,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts

@@ -142,10 +142,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -166,7 +176,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9330_dlink_dir-505.dts

@@ -104,7 +104,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x10000 0x10000>;
 				read-only;

target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts

@@ -93,18 +93,18 @@
 				read-only;
 			};
 
-			partition@1 {
+			partition@40000 {
 				label = "u-boot-env";
 				reg = <0x040000 0x010000>;
 			};
 
-			partition@2 {
+			partition@50000 {
 				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x050000 0xfa0000>;
 			};
 
-			art: partition@3 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -117,6 +117,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -147,7 +151,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_art_0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi

@@ -122,7 +122,7 @@
 				reg = <0x8c0000 0x700000>;
 			};
 
-			art: partition@fc0000 {
+			partition@fc0000 {
 				label = "ART";
 				reg = <0xfc0000 0x040000>;
 				read-only;
@@ -139,6 +139,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -162,5 +166,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9330_pqi_air-pen.dts

@@ -85,7 +85,7 @@
 				reg = <0x040000 0x010000>;
 			};
 
-			art: partition@50000 {
+			partition@50000 {
 				label = "art";
 				reg = <0x050000 0x010000>;
 				read-only;
@@ -99,6 +99,10 @@
 						reg = <0x2 0x6>;
 					};
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					macaddr_art_1002: macaddr@1002 {
 						reg = <0x1002 0x6>;
 					};
@@ -149,7 +153,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_art_2>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_2>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9330_ziking_cpe46b.dts

@@ -76,7 +76,7 @@
 				reg = <0x020000 0x7d0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
@@ -91,6 +91,10 @@
 						reg = <0x0 0x6>;
 						#nvmem-cell-cells = <1>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -114,5 +118,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_8dev_carambola2.dts

@@ -90,7 +90,7 @@
 				reg = <0x50000 0xfa0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -107,6 +107,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -119,6 +123,7 @@
 
 &eth0 {
 	status = "okay";
+
 	nvmem-cells = <&macaddr_art_0>;
 	nvmem-cell-names = "mac-address";
 
@@ -132,11 +137,14 @@
 
 &eth1 {
 	status = "okay";
+
 	nvmem-cells = <&macaddr_art_6>;
 	nvmem-cell-names = "mac-address";
 };
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_arduino_yun.dts

@@ -171,10 +171,20 @@
 				reg = <0xfe0000 0x10000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -193,5 +203,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts

@@ -72,18 +72,18 @@
 				read-only;
 			};
 
-			partition@1 {
+			partition@40000 {
 				label = "u-boot-env";
 				reg = <0x040000 0x010000>;
 			};
 
-			partition@2 {
+			partition@50000 {
 				compatible = "denx,uimage";
 				label = "firmware";
 				reg = <0x050000 0xfa0000>;
 			};
 
-			art: partition@3 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -93,6 +93,10 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					macaddr_art_1002: macaddr@1002 {
 						compatible = "mac-base";
 						reg = <0x1002 0x6>;
@@ -118,5 +122,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_etactica_eg200.dts

@@ -108,7 +108,7 @@
 				reg = <0x50000 0xfa0000>;
 			};
 
-			art: art@ff0000 {
+			art@ff0000 {
 				reg = <0xff0000 0x10000>;
 				read-only;
 
@@ -120,6 +120,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -128,5 +132,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_glinet_6408.dts

@@ -46,10 +46,20 @@
 				label = "firmware";
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				reg = <0x7f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -66,8 +76,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_glinet_6416.dts

@@ -46,10 +46,20 @@
 				label = "firmware";
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				reg = <0xff0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -66,8 +76,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts

@@ -113,7 +113,7 @@
 				reg = <0x050000 0xfa0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -126,6 +126,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -156,5 +160,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts

@@ -107,7 +107,7 @@
 				reg = <0x050000 0xfa0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -120,6 +120,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -129,5 +133,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts

@@ -98,7 +98,7 @@
 				compatible = "tplink,firmware";
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -111,6 +111,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -128,5 +132,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts

@@ -109,10 +109,20 @@
 				read-only;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				reg = <0xff0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -152,8 +162,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
 
-	nvmem-cells = <&macaddr_bdinfo_18a 2>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_bdinfo_18a 2>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_onion_omega.dts

@@ -119,10 +119,20 @@
 				reg = <0x020000 0xfd0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -131,8 +141,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_pisen_ts-d084.dts

@@ -73,10 +73,20 @@
 				label = "firmware";
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				reg = <0x7f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -112,7 +122,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_pisen_wmm003n.dts

@@ -81,10 +81,20 @@
 				label = "firmware";
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				reg = <0x7f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -121,7 +131,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_teltonika_rut230-v1.dts

@@ -160,10 +160,20 @@
 				};
 			};
 
-			art: partition@30000 {
+			partition@30000 {
 				label = "art";
 				reg = <0x30000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 
 			partition@40000 {
@@ -203,7 +213,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_config_0 2>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_config_0 2>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts

@@ -141,10 +141,20 @@
 				read-only;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -172,7 +182,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts

@@ -129,10 +129,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -160,7 +170,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi

@@ -78,10 +78,20 @@
 				label = "firmware";
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -120,7 +130,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_tplink_tl-wr710n-8m.dtsi

@@ -45,10 +45,20 @@
 				label = "firmware";
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				reg = <0x7f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -65,8 +75,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi

@@ -124,10 +124,20 @@
 				label = "firmware";
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -157,7 +167,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts

@@ -56,7 +56,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &art {
@@ -68,5 +69,9 @@
 		macaddr_art_0: macaddr@0 {
 			reg = <0x0 0x6>;
 		};
+
+		cal_art_1000: calibration@1000 {
+			reg = <0x1000 0x440>;
+		};
 	};
 };

target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts

@@ -87,7 +87,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &art {
@@ -99,5 +100,9 @@
 		macaddr_art_0: macaddr@0 {
 			reg = <0x0 0x6>;
 		};
+
+		cal_art_1000: calibration@1000 {
+			reg = <0x1000 0x440>;
+		};
 	};
 };

target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi

@@ -132,7 +132,7 @@
 				reg = <0x8c0000 0x700000>;
 			};
 
-			art: partition@fc0000 {
+			partition@fc0000 {
 				label = "ART";
 				reg = <0xfc0000 0x040000>;
 				read-only;
@@ -149,6 +149,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -172,5 +176,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9341_pcs_cr3000.dts

@@ -118,7 +118,7 @@
 				reg = <0x050000 0x07a0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
@@ -133,6 +133,10 @@
 						reg = <0x0 0x6>;
 						#nvmem-cell-cells = <1>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -142,7 +146,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &eth0 {

target/linux/ath79/dts/ar9341_pisen_wmb001n.dts

@@ -176,7 +176,7 @@
 				read-only;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x10000>;
 				read-only;
@@ -189,6 +189,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -222,5 +226,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts

@@ -87,10 +87,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -115,8 +125,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi

@@ -50,10 +50,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -81,7 +91,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_uboot_1fc00>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts

@@ -67,10 +67,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -87,8 +97,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts

@@ -88,10 +88,20 @@
 				reg = <0x020000 0x7d0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -118,8 +128,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9341_tplink_tl-wr941nd-v5.dts

@@ -77,10 +77,20 @@
 				reg = <0x020000 0x3d0000>;
 			};
 
-			art: partition@3f0000 {
+			partition@3f0000 {
 				label = "art";
 				reg = <0x3f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -97,8 +107,6 @@
 };
 
 &wmac {
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/ar9342_ubnt_wa.dtsi

@@ -73,7 +73,7 @@
 				read-only;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -87,6 +87,10 @@
 						reg = <0x0 0x6>;
 					};
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					cal_art_5000: calibration@5000 {
 						reg = <0x5000 0x844>;
 					};
@@ -99,6 +103,8 @@
 &wmac {
 	status = "okay";
 
-	ieee80211-freq-limit = <2402000 2482000>;
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
+
+	ieee80211-freq-limit = <2402000 2482001>;
 };

target/linux/ath79/dts/ar9342_ubnt_xw.dtsi

@@ -62,7 +62,7 @@
 				read-only;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9342_zyxel_nwa11xx.dtsi

@@ -111,7 +111,7 @@
 				};
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts

@@ -100,7 +100,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x010000 0x010000>;
 				read-only;
@@ -117,6 +117,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -149,11 +153,14 @@
 
 &eth1 {
 	status = "okay";
+
 	nvmem-cells = <&macaddr_art_6>;
 	nvmem-cell-names = "mac-address";
 };
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts

@@ -98,10 +98,20 @@
 				compatible = "denx,uimage";
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -122,7 +132,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &mdio0 {

target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi

@@ -114,7 +114,7 @@
 				reg = <0x70000 0xf80000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x10000>;
 				read-only;
@@ -124,6 +124,10 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					macaddr_art_1002: macaddr@1002 {
 						compatible = "mac-base";
 						reg = <0x1002 0x6>;
@@ -158,7 +162,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &pcie {

target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi

@@ -135,7 +135,7 @@
 				};
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts

@@ -153,7 +153,7 @@
 				read-only;
 			};
 
-			art: partition@fe0000 {
+			partition@fe0000 {
 				label = "art";
 				reg = <0xfe0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9344_openmesh_om5p.dts

@@ -135,7 +135,7 @@
 				reg = <0x850000 0x7a0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "ART";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -152,6 +152,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -177,5 +181,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9344_pcs_cap324.dts

@@ -110,7 +110,7 @@
 				reg = <0x050000 0x0fa0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -125,6 +125,14 @@
 						reg = <0x0 0x6>;
 						#nvmem-cell-cells = <1>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
+					cal_art_5000: calibration@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};
@@ -137,10 +145,8 @@
 	ath9k: wifi@0,0 {
 		compatible = "168c,0030";
 		reg = <0x0000 0 0 0 0>;
-		nvmem-cells = <&macaddr_art_0 (-2)>;
-		nvmem-cell-names = "mac-address";
-		mtd-cal-data = <&art 0x5000>;
-		qca,no-eeprom;
+		nvmem-cells = <&macaddr_art_0 (-2)>, <&cal_art_5000>;
+		nvmem-cell-names = "mac-address", "calibration";
 		ieee80211-freq-limit = <2402000 2482000>;
 		#gpio-cells = <2>;
 		gpio-controller;
@@ -151,9 +157,8 @@
 	status = "okay";
 
 	ieee80211-freq-limit = <4900000 5990000>;
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_art_0 (-1)>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0 (-1)>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };
 
 &mdio0 {

target/linux/ath79/dts/ar9344_pcs_cr5000.dts

@@ -99,7 +99,7 @@
 				reg = <0x050000 0x07a0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
@@ -113,6 +113,10 @@
 						reg = <0x0 0x6>;
 					};
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					macaddr_art_5002: macaddr@5002 {
 						reg = <0x5002 0x6>;
 					};
@@ -218,5 +222,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi

@@ -101,10 +101,20 @@
 				};
 			};
 
-			art: partition@60000 {
+			partition@60000 {
 				label = "art";
-				reg = <0x060000 0x010000>;
+				reg = <0x60000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -117,5 +127,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9344_samsung_wam250.dts

@@ -136,7 +136,7 @@
 				reg = <0x070000 0xf80000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -146,6 +146,10 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+
 					macaddr_art_1002: macaddr@1002 {
 						compatible = "mac-base";
 						reg = <0x1002 0x6>;
@@ -169,5 +173,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi

@@ -93,10 +93,20 @@
 				};
 			};
 
-			art: partition@30000 {
+			partition@30000 {
 				label = "art";
 				reg = <0x30000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 
 			partition@40000 {
@@ -155,9 +165,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_config_0 2>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_config_0 2>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };
 
 &pinmux {

target/linux/ath79/dts/ar9344_tplink_cpe.dtsi

@@ -81,10 +81,20 @@
 				read-only;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -93,9 +103,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_info_8>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };
 
 &eth0 {

target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi

@@ -103,7 +103,7 @@
 				reg = <0x020000 0x7d0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts

@@ -119,10 +119,20 @@
 				reg = <0x020000 0x7d0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -147,10 +157,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_uboot_1fc00 0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };
 
 &eth0 {

target/linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi

@@ -58,7 +58,7 @@
 				reg = <0x070000 0xf80000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts

@@ -114,7 +114,7 @@
 				reg = <0x7e0000 0x10000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0x7f0000 0x10000>;
 				read-only;

target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts

@@ -130,7 +130,8 @@
 				reg = <0x50000 0xfa0000>;
 			};
 
-			art: art@ff0000 {
+			art@ff0000 {
+				label = "art";
 				reg = <0xff0000 0x10000>;
 				read-only;
 
@@ -146,6 +147,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};
@@ -154,7 +159,9 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &pinmux {

target/linux/ath79/dts/qca9531_8dev_carambola3.dts

@@ -72,7 +72,7 @@
 				reg = <0x040000 0x040000>;
 			};
 
-			art: partition@80000 {
+			partition@80000 {
 				label = "art";
 				reg = <0x080000 0x040000>;
 				read-only;
@@ -89,6 +89,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -129,5 +133,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/qca9531_8dev_lima.dts

@@ -63,7 +63,7 @@
 				reg = <0x040000 0x040000>;
 			};
 
-			art: partition@80000 {
+			partition@80000 {
 				label = "art";
 				reg = <0x080000 0x040000>;
 				read-only;
@@ -80,6 +80,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -120,5 +124,6 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/qca9531_alcatel_hh40v.dts

@@ -119,7 +119,7 @@
 				reg = <0x150000 0xea0000>;
 			};
 
-			art: partition@ff0000 {
+			partition@ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;

target/linux/ath79/dts/qca9531_asus_rp-ac51.dts

@@ -103,7 +103,7 @@
 				read-only;
 			};
 
-			art: partition@50000 {
+			partition@50000 {
 				label = "art";
 				reg = <0x050000 0x10000>;
 				read-only;

target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts

@@ -93,7 +93,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x010000 0x010000>;
 				read-only;
@@ -106,6 +106,10 @@
 					macaddr_art_0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -143,7 +147,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_0>;
-	nvmem-cell-names = "mac-address";
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };

target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts

@@ -93,7 +93,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x010000 0x010000>;
 				read-only;

target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts

@@ -108,7 +108,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x010000 0x010000>;
 				read-only;
@@ -125,6 +125,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -165,5 +169,7 @@
 
 &wmac {
 	status = "okay";
-	mtd-cal-data = <&art 0x1000>;
+
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };

target/linux/ath79/dts/qca9531_comfast_cf-e5.dts

@@ -92,7 +92,7 @@
 				read-only;
 			};
 
-			art: partition@10000 {
+			partition@10000 {
 				label = "art";
 				reg = <0x010000 0x010000>;
 				read-only;
@@ -109,6 +109,10 @@
 					macaddr_art_6: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
+
+					cal_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 
@@ -144,7 +148,8 @@
 &wmac {
 	status = "okay";
 
-	mtd-cal-data = <&art 0x1000>;
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &pinmux {