mediatek: dts: fix the broken memory node

Add the missing "device_type" property to fix the memory node. The
Linux kernel can not get the memory size without it. Though u-boot
can automatically fixup the memory node by adding the "device_type"
and "reg" properties if the CONFIG_ARCH_FIXUP_FDT_MEMORY symbol is
enabled, it's better not to rely on this optional feature. This
patch also adds the reg address for the memory node name to follow
the naming rules.

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19741
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
index b8fac373a0a843b58b71139b8e2341071136a0db..8f24690a3c83e6740fe38c22cb71b32cc32cf8ef 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
+++ b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
@@ -11,8 +11,9 @@
                label-mac-device = &gmac0;
        };
 
-       memory {
-               reg = <0 0x40000000 0 0x0F000000>;
+       memory@40000000 {
+               reg = <0 0x40000000 0 0x0f000000>;
+               device_type = "memory";
        };
 
        rtkgsw: rtkgsw@0 {

diff --git a/target/linux/mediatek/dts/mt7622-buffalo-wsr-3200ax4s.dts b/target/linux/mediatek/dts/mt7622-buffalo-wsr-3200ax4s.dts
index 82cc970fddaec7a58e077f80cf9fded01b2db331..dee8c77341ede9be9589b081875990eb012c4fb0 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-buffalo-wsr-3200ax4s.dts
+++ b/target/linux/mediatek/dts/mt7622-buffalo-wsr-3200ax4s.dts
@@ -7,8 +7,9 @@
        model = "Buffalo WSR-3200AX4S";
        compatible = "buffalo,wsr-3200ax4s", "mediatek,mt7622";
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x1f000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
index 8bd58bfe851f4a9848276b7b693477273ddcd4f8..ae92fedc58940ac1d1f554381bf02dedff1e9def 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
+++ b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-ax3200-a1.dtsi
@@ -45,8 +45,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
index 7fe5d02e1a7fb5102675de198947ced640c91e59..5f8bb3ded8d5e9dde191d5b388548aa7cbe59bd2 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
@@ -134,8 +134,9 @@
                enable-active-high;
        };
 
-       memory {
-               reg = <0 0x40000000 0 0x3F000000>;
+       memory@40000000 {
+               reg = <0 0x40000000 0 0x3f000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
index 2bf4a33a50c840cec9f115db17a7e2caa712acaf..b437fe1b3a1c51bc312357532255e93df43a4122 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
@@ -25,8 +25,9 @@
                bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8 swiotlb=512";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x1f000000>;
+               device_type = "memory";
        };
 
        leds {

diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
index 48b25f7a4a0452ba35743bbd3668bc20e4184fa1..882ab841a7e110a572d3423cc000b40017721f63 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
@@ -80,8 +80,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
index ab512e789414b76a049c5eb074e26fde75160cef..63997432233a76381071f9b1b3c80a9bbbf5eb27 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
+++ b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
@@ -108,8 +108,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
index 24ed92788ef911664e302121f46dc0e7024a0ca9..0344d3dc6ef2403efa2d65569692b43622f12df7 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
+++ b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
@@ -71,8 +71,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7622-smartrg-SDG-841-t6.dts b/target/linux/mediatek/dts/mt7622-smartrg-SDG-841-t6.dts
index 05fd74a7d302bf309dc97a2363ff5e800997af3f..8cf18f5e07407d0a959d508e5677638825d65734 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-smartrg-SDG-841-t6.dts
+++ b/target/linux/mediatek/dts/mt7622-smartrg-SDG-841-t6.dts
@@ -90,8 +90,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0x0 0x40000000 0x0 0x40000000>;
+               device_type = "memory";
        };
 
        reserved-memory {

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
index 783b0c388e6827369b9b2c0fa29b68d042aebf03..f23b15196886b9404c1a7df8db076ace93e6783a 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
@@ -45,8 +45,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x3f000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
index ebc8731bc70831df284fe08431a9e726f7749fa6..d3187cc383bbbf19d8f80ad31ab1d94218a7468b 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
+++ b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
@@ -26,8 +26,9 @@
                bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512 ubi.block=0,fit root=/dev/fit0";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x8000000>;
+               device_type = "memory";
        };
 
        leds {

diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
index 8f7598fc7c83d4941c2b90113e10ae0129e1f2b1..1cf13ff6a9fd28186dab4e01757be23ad2cc6bad 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
+++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
@@ -20,8 +20,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>; // 256mb
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts b/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
index 2b0d39b2c26f3bc715470455ba287864f28379f5..651d6461c704b390f4084e9992de90fe145127fa 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
@@ -25,6 +25,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-asus-rt-ax52.dts b/target/linux/mediatek/dts/mt7981b-asus-rt-ax52.dts
index 34cc8ee1317c4116e9f57c1308cf0c98debbe59c..604d318eaeadb6b5971c34943e7f822c770bc95a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-asus-rt-ax52.dts
+++ b/target/linux/mediatek/dts/mt7981b-asus-rt-ax52.dts
@@ -19,8 +19,9 @@
                bootargs-override = "";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
index 11ff28b19f2a05fd3a94433fc12550aeec0f6d73..285c721d769217443e19820912b244718706fedd 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
+++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
@@ -24,8 +24,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
index 91644746a65ab0e5d938a058807c7db07eeb93c5..2029537518a708aec179af6d13a54e2885ffc964 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
@@ -24,6 +24,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
index a6803fe7daea52ef0236123c5b02a9780de9bba1..36e77eb2c8cd9a0d71a1dc670efb1f6df34ecd10 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
@@ -27,8 +27,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-creatlentem-clt-r30b1-common.dtsi b/target/linux/mediatek/dts/mt7981b-creatlentem-clt-r30b1-common.dtsi
index 90d9ea04a13a95fbf637aa3be5bba17ed45886e5..17b820252f07c0adce44b59964759f7c408fff05 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-creatlentem-clt-r30b1-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-creatlentem-clt-r30b1-common.dtsi
@@ -55,8 +55,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
index 2719b1765604c0d4863eaae494ba6de1064daa40..fd08f724b5d1fc382ae71314fe3b824f6be94b16 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
+++ b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
@@ -22,8 +22,9 @@
                rootdisk = <&firmware>;
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index dc62eeefd1515873c2a32897d218900e57f5bac9..2f141b8c7a7a457968ac7734a9192291cb9d1d5b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -25,8 +25,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
index 3f58ae42a19ef189c175ca6e2a8d0a355ce9bbb5..4c1bae087c9c0a5eb8abe971d3be56ef0a2375b2 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-huasifei-wh3000.dts
@@ -60,6 +60,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
index a571d9afde8dcf44306ee40b0d4d7d01280b24d1..0045c452a7f4a34ef18d0254765ce14dfa0ccf5c 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
@@ -26,8 +26,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-mercusys-mr80x-v3.dts b/target/linux/mediatek/dts/mt7981b-mercusys-mr80x-v3.dts
index 377c1c71fd50df547256c39c58dd099b40699759..0db7a61f0dfabeb49626af2c5d90983e2c52ccee 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-mercusys-mr80x-v3.dts
+++ b/target/linux/mediatek/dts/mt7981b-mercusys-mr80x-v3.dts
@@ -22,8 +22,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts b/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
index 5865d9f1a78ab9cf55a10be38a3cbe9c0dc46c4a..707ec2b4ee96a6bf3bea3dcfbc46057c307d008e 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
+++ b/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
@@ -26,6 +26,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
index 61465d90116c2df56ce734127638c3c94cfcf61c..4c3f80ed5e1cce0a55615123d2cf4785aa7d0e05 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
@@ -25,6 +25,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        beeper {

diff --git a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
index d1a24db38a184caf73b329e096434dee12553aba..18a569daf8f09ac5a9ce53aa564b83f74720a92a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
+++ b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts
@@ -22,8 +22,9 @@
                rootdisk = <&ubi_fit_volume>;
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index db7fa5e870ca1faa592b5f66e8e57aab514291d0..67ea2ff4c5a6f7394c3701543d78cafc6a048ed3 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -25,8 +25,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
index 9b41774b88aeda6233852c69834b16beb3e71fc7..38fb371d8a2ee420fa10add21dea51824f21cfd4 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
@@ -108,8 +108,9 @@
                };
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 };
 

diff --git a/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts b/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
index af6fa90d7e0a538b9fdc93143a88118248b37413..5815f84912f33e3815068ccebe12ff8edcfb5d1d 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
@@ -23,8 +23,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
index ceb238bde2f190750687cf6d00dbbd5985989965..4ff39064d5e1f4b7fd538fd91c108c50dfe71249 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
@@ -19,8 +19,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
index c0f7fff8010b11acbe4764b525d7c442a493c190..80dd203560592a50c55ac41a6c90bad663c0d52a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
@@ -22,8 +22,9 @@
                bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dts
index 67b1eef41183b43adea71cc3eca230dc125543fd..ee066cf53885f374c6e5604753ed1efd7310c347 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dts
@@ -22,8 +22,9 @@
                bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
index d46497ec3315f694d0269968b953004dc53ab752..c80f80e1cf7187db9b01f6de1140c661dff3a8ba 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
@@ -19,8 +19,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory@0 {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi b/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
index 8b35ce25178ee9e741ecab79d8b0151ed183b5ae..f0df58847328834c0c20f9fac628787cf36e557c 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
@@ -12,8 +12,9 @@
                bootargs = "dm-mod.create=\"acer,,,ro,0 1 zero 1 0 0 0\" rootfstype=squashfs,ext4 rootwait root=/dev/mmcblk0p6 fstools_ignore_partname=1";
        };
 
-       memory@0 {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
index 7e0c05618f5e25c73d27444467aa95956362a7a3..d213c7679375cc04ce585d2524844131e915ab1a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
@@ -26,8 +26,9 @@
                bootargs-override = "";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
index f05511839863eb897dd148f5dccd75d6a06ecfe9..712584a3af73ea1ab37ad77d9df6840d7c89e105 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
@@ -25,8 +25,9 @@
                bootargs-override = "";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
index 4d5c8410a3cdc060b9b9111a257e29e6e89673e1..e0faaaa11b50a62821452c80af30bfff45e8807c 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
@@ -25,8 +25,9 @@
                bootargs-override = "";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
index f39fd96596ca51f7e8662c5f572306a7a0f96d02..6808db80feb6a3a94ebecb1072ddf4a488fff4a8 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
+++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
@@ -32,8 +32,9 @@
                rootdisk-spim-nand = <&nand_rootdisk>;
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x80000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts b/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
index 10c53596e50240aa42b48bd010331d63435958e7..97a96aadea2b856445cec4fbe027ca3d8d5ed4bf 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
+++ b/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
@@ -26,6 +26,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts b/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
index 286c24a9f1a65feb048014a7039a11972b31ad0b..a318ad1ae48acf824e9f7826c834329b4a1f6e1b 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
+++ b/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
@@ -30,6 +30,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
index 3af77929718e48ca9ecb99783d7c392c89cd132e..786c5eb312ff8346868b800e5ed0f310ef78bb1a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
@@ -28,6 +28,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
index 484c93d4a78c36d46e52213021bb126832d54140..6ab0f497c35492f2043d81d3aafd0c89b8d745c6 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
@@ -26,8 +26,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x10000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts b/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
index 9f40fec043e7e2befbcc45045a3996ae599d4721..3628ad00e116db08fcbcdb1a29c879f2293988e9 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
+++ b/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
@@ -25,6 +25,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts b/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
index 841501c7cf5fc2afcf5773dc1ef3081caa3a984c..12f03e1fdadca75d44dbdd0f54ad3ac0aaf76ead 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
+++ b/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
@@ -25,6 +25,7 @@
 
        memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        gpio-keys {

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index 1649b0775de02f9e3235020d8377b95c8414e0c1..0056f6f2246b5fff1720026dc8eb9c39cb269f55 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -22,8 +22,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts b/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
index e3d3aa37b2be9836438a3930ffc0b69c776aff3a..c2ed7c9a28452fc72699a2ad87eace9dc010dfe9 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
@@ -26,8 +26,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index fe3e760914720ca465afcc7e77c6f17c36254239..33754343938a7164dd2d3ec153d54f96863cfd5f 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -20,8 +20,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
index b68f386e8bcf83c450f31ccf4df77506cfde8764..86c08138aca967434cbec8591d6ec0689682815c 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
@@ -23,8 +23,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index 20e9146e2a3ae468a762ccec8ab143d4e8d50093..c2a0ef2ab0029b81ea2238aad4ee402e5d8da4e6 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -27,8 +27,9 @@
                bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
index 5522c58af21ed4c2d651014b39e2ee534801978d..964c17e8212048e7145d5e2c8aaef5ad554fb1e8 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
@@ -21,8 +21,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts b/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
index 44a5e21e7c28326330b20c3d99a4706aab9a8d2e..12e264073d02e0c883f3364b09b1dcb9e2f04b5b 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
+++ b/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
@@ -24,8 +24,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        keys {

diff --git a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
index a0a88047267ba6d7bba7bbac22f5ca2db0070f1b..a8eeebda6c88477e95ea3edfb555814e597831dc 100644 (file)
--- a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
+++ b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
@@ -27,8 +27,9 @@
                bootargs = "console=ttyS0,115200n1 pci=pcie_bus_perf root=PARTLABEL=rootfs";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0x0 0x40000000 0x0 0x40000000>;
+               device_type = "memory";
        };
 
        reserved-memory {

diff --git a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
index 20e7a3839c6b8a25283964e59a24c09a61a8a036..1d916d760fd528343d8a0c250da80a74055384e5 100644 (file)
--- a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
+++ b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
@@ -86,8 +86,9 @@
                led-upgrade = &led_status_blue;
        };
 
-       memory {
+       memory@40000000 {
                reg = <0x0 0x40000000 0x0 0x40000000>;
+               device_type = "memory";
        };
 
        cpus {

diff --git a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
index 6fca59d3ef9d985acd6bd9477afc444b3add6ab5..28bcc155dfb61c50c572797f7db565ec4bf506e5 100644 (file)
--- a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
+++ b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7981-rfb.dts
@@ -20,8 +20,9 @@
                bootargs-append = " root=/dev/fit0 rootwait";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x20000000>;
+               device_type = "memory";
        };
 
        reg_3p3v: regulator-3p3v {

diff --git a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
index 26d560bd4bcb11b1fce82aec0a97ae1842037cdb..0b6df172148750461c0e48832a52fcc85297403d 100644 (file)
--- a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
+++ b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
@@ -19,8 +19,9 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                reg = <0 0x40000000 0 0x40000000>;
+               device_type = "memory";
        };
 
        reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch b/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
index 23bc2ea2032b6b0020721efcde6c75bfa3bc7cee..f968ac15cfe8eb51abcc196c6628a516b964f248 100644 (file)
--- a/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
+++ b/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
@@ -811,7 +811,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb.dts
-@@ -0,0 +1,470 @@
+@@ -0,0 +1,471 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/*
 + * Copyright (C) 2022 MediaTek Inc.
@@ -836,8 +836,9 @@ Signed-off-by: Daniel Golle <[email protected]>
 +                          pci=pcie_bus_perf";
 +      };
 +
-+      memory {
++      memory@40000000 {
 +              reg = <0 0x40000000 0 0x40000000>;
++              device_type = "memory";
 +      };
 +
 +      reg_1p8v: regulator-1p8v {

diff --git a/target/linux/mediatek/patches-6.12/189-arm64-dts-mediatek-mt7988a-complete-bpi-r4.patch b/target/linux/mediatek/patches-6.12/189-arm64-dts-mediatek-mt7988a-complete-bpi-r4.patch
index a8b7a7413489848611702857e2ec735b7b15c071..8eccb6f8f10b3578ac4d70beb0b203df609f9a9a 100644 (file)
--- a/target/linux/mediatek/patches-6.12/189-arm64-dts-mediatek-mt7988a-complete-bpi-r4.patch
+++ b/target/linux/mediatek/patches-6.12/189-arm64-dts-mediatek-mt7988a-complete-bpi-r4.patch
@@ -194,7 +194,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
        };
  
        fan: pwm-fan {
-@@ -50,6 +54,141 @@
+@@ -50,6 +54,142 @@
                rate-select0-gpios = <&pio 21 GPIO_ACTIVE_LOW>;
                maximum-power-milliwatt = <3000>;
        };
@@ -210,8 +210,9 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
 +              led-upgrade = &led_green;
 +      };
 +
-+      memory {
++      memory@40000000 {
 +              reg = <0x00 0x40000000 0x00 0x10000000>;
++              device_type = "memory";
 +      };
 +
 +      /* SFP1 cage (WAN) */
@@ -336,7 +337,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
  };
  
  &cci {
-@@ -174,6 +313,10 @@
+@@ -174,6 +314,10 @@
        color = <LED_COLOR_ID_GREEN>;
  };
  
@@ -347,7 +348,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
  &i2c0 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
-@@ -265,6 +408,14 @@
+@@ -265,6 +409,14 @@
                        #size-cells = <0>;
                        reg = <1>;
                };
@@ -362,7 +363,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
        };
  };
  
-@@ -364,34 +515,6 @@
+@@ -364,34 +516,6 @@
                };
        };
  
@@ -397,7 +398,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
        i2p5gbe_led0_pins: 2p5gbe-led0-pins {
                mux {
                        function = "led";
-@@ -399,13 +522,6 @@
+@@ -399,13 +523,6 @@
                };
        };
  
@@ -411,7 +412,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
        mmc0_pins_emmc_45: mmc0-emmc-45-pins {
                mux {
                        function = "flash";
-@@ -427,40 +543,12 @@
+@@ -427,40 +544,12 @@
                };
        };
  
@@ -452,7 +453,7 @@ Subject: [PATCH 32/32] WIP: add BPi-R4
  };
  
  &pwm {
-@@ -500,6 +588,32 @@
+@@ -500,6 +589,32 @@
                        reg = <0x0 0x200000>;
                        read-only;
                };