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 88538c8b0a6c4b5dce935a1aa7598317e58f8cf9..5ee8ba5cd9b814b50b1178889cca6bd8f2781476 100644 (file)
--- 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 14c615b67c14b719237abdb7a351b95b6b613a91..fae5d0ebfa8aa3cffb174ca313724710b4f8862c 100644 (file)
--- 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 b5a67c725bf109863cddc798660fdf07027cf923..02ecedda72e84362ac3eafbfcdd016dd30050ef7 100644 (file)
--- 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 a28d274493d8ccf67e0f4a3a71eb3c4225ae47e3..c378a302d4b5e4b6d2aa5689e4984f7768bf350d 100644 (file)
--- 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";
 +                                              };
 +                                      };
 +