From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 6 Oct 2024 19:41:45 +0000 (-0700)
Subject: mediatek: fix wrong compatible string
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3da8e385e0fde0b70d67964ef321482ab27bf95f;p=openwrt%2Fstaging%2Fblocktrron.git

mediatek: fix wrong compatible string

The u-boot,env driver does not have layout in compatible.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16616
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
index 88538c8b0a..5ee8ba5cd9 100644
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
@@ -38,14 +38,14 @@
 				ubi-volume-ubootenv {
 					volname = "ubootenv";
 					nvmem-layout {
-						compatible = "u-boot,env-redundant-bool-layout";
+						compatible = "u-boot,env-redundant-bool";
 					};
 				};
 
 				ubi-volume-ubootenv2 {
 					volname = "ubootenv2";
 					nvmem-layout {
-						compatible = "u-boot,env-redundant-bool-layout";
+						compatible = "u-boot,env-redundant-bool";
 					};
 				};
 
diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
index 14c615b67c..fae5d0ebfa 100644
--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
+++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
@@ -349,14 +349,14 @@
 				ubi-volume-ubootenv {
 					volname = "ubootenv";
 					nvmem-layout {
-						compatible = "u-boot,env-redundant-bool-layout";
+						compatible = "u-boot,env-redundant-bool";
 					};
 				};
 
 				ubi-volume-ubootenv2 {
 					volname = "ubootenv2";
 					nvmem-layout {
-						compatible = "u-boot,env-redundant-bool-layout";
+						compatible = "u-boot,env-redundant-bool";
 					};
 				};
 
diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
index b5a67c725b..02ecedda72 100644
--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
+++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso
@@ -44,14 +44,14 @@
 							ubi-volume-ubootenv {
 								volname = "ubootenv";
 								nvmem-layout {
-									compatible = "u-boot,env-redundant-bool-layout";
+									compatible = "u-boot,env-redundant-bool";
 								};
 							};
 
 							ubi-volume-ubootenv2 {
 								volname = "ubootenv2";
 								nvmem-layout {
-									compatible = "u-boot,env-redundant-bool-layout";
+									compatible = "u-boot,env-redundant-bool";
 								};
 							};
 
diff --git a/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch b/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
index a28d274493..c378a302d4 100644
--- a/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
+++ b/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
@@ -85,14 +85,14 @@
 +					ubi-volume-ubootenv {
 +						volname = "ubootenv";
 +						nvmem-layout {
-+							compatible = "u-boot,env-redundant-bool-layout";
++							compatible = "u-boot,env-redundant-bool";
 +						};
 +					};
 +
 +					ubi-volume-ubootenv2 {
 +						volname = "ubootenv2";
 +						nvmem-layout {
-+							compatible = "u-boot,env-redundant-bool-layout";
++							compatible = "u-boot,env-redundant-bool";
 +						};
 +					};
 +