mediatek: apply bootloader work-around for affected ASUS devices

Apply "u-boot-dont-touch-spi-nand" to ASUS RT-AX59U, ASUS TUF-AX4200 as
well as ASUS TUF-AX6000 routers to prevent U-Boot from wiping MTD
child nodes from DT.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 4387de94454913aa79bb88971eabcf1bfca78141)

diff --git a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
index 0034ad8284b1bdb5747111a1b29fdb5ed5e0dc67..7e0c05618f5e25c73d27444467aa95956362a7a3 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
@@ -210,7 +210,7 @@
        status = "okay";
 
        spi_nand: flash@0 {
-               compatible = "spi-nand";
+               compatible = "u-boot-dont-touch-spi-nand";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -224,7 +224,7 @@
                 * Device Tree and by that also deletes all additional properties
                 * needed for UBI and NVMEM-on-UBI.
                 * Prevent this from happening by tricking the loader to delete and
-                * replace a bait node instead.
+                * replace a bait node instead (works with older bootloaders).
                 */
                partitions: dummy {
                        compatible = "u-boot-dummy-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
index e40602fa215e1a677b534c85b767e824af041518..4ed65a8ee708a7172b3eb7bb655759458c59a77c 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
@@ -209,7 +209,7 @@
        status = "okay";
 
        spi_nand_flash: flash@0 {
-               compatible = "spi-nand";
+               compatible = "u-boot-dont-touch-spi-nand";
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0>;
@@ -223,7 +223,7 @@
                 * Device Tree and by that also deletes all additional properties
                 * needed for UBI and NVMEM-on-UBI.
                 * Prevent this from happening by tricking the loader to delete and
-                * replace a bait node instead.
+                * replace a bait node instead (works with older bootloaders).
                 */
                partitions: dummy {
                        compatible = "u-boot-dummy-partitions";

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
index 957d8deebb192a3b71ec82e6278fc08bac795bcb..9a0f7594c92c24c73290f1bd7c10b75d3de30e22 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
@@ -231,7 +231,7 @@
        status = "okay";
 
        spi_nand_flash: flash@0 {
-               compatible = "spi-nand";
+               compatible = "u-boot-dont-touch-spi-nand";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -245,7 +245,7 @@
                 * Device Tree and by that also deletes all additional properties
                 * needed for UBI and NVMEM-on-UBI.
                 * Prevent this from happening by tricking the loader to delete and
-                * replace a bait node instead.
+                * replace a bait node instead (works with older bootloaders).
                 */
                partitions: dummy {
                        compatible = "u-boot-dummy-partitions";