Commit f810961e authored by Sean Wang's avatar Sean Wang Committed by Greg Kroah-Hartman

arm: dts: mt7623: fix invalid memory node being generated

commit c0b0d540 upstream.

Below two wrong nodes in existing DTS files would cause a fail boot since
in fact the address 0 is not the correct place the memory device locates
at.

memory {
        device_type = "memory";
        reg = <0x0 0x0 0x0 0x0>;
};

memory@80000000 {
        reg = <0x0 0x80000000 0x0 0x40000000>;
};

In order to avoid having a memory node starting at address 0, we can't
include file skeleton64.dtsi and instead need to explicitly manually
define a few of properties the DTS relies on such as #address-cells
and #size-cells in root node and device_type in the node memory@80000000.

Cc: stable@vger.kernel.org
Fixes: 31ac0d69 ("ARM: dts: mediatek: add MT7623 basic support")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18be8bd3
...@@ -22,11 +22,12 @@ ...@@ -22,11 +22,12 @@
#include <dt-bindings/phy/phy.h> #include <dt-bindings/phy/phy.h>
#include <dt-bindings/reset/mt2701-resets.h> #include <dt-bindings/reset/mt2701-resets.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
#include "skeleton64.dtsi"
/ { / {
compatible = "mediatek,mt7623"; compatible = "mediatek,mt7623";
interrupt-parent = <&sysirq>; interrupt-parent = <&sysirq>;
#address-cells = <2>;
#size-cells = <2>;
cpu_opp_table: opp_table { cpu_opp_table: opp_table {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
......
...@@ -100,6 +100,7 @@ red { ...@@ -100,6 +100,7 @@ red {
}; };
memory@80000000 { memory@80000000 {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
}; };
......
...@@ -47,6 +47,7 @@ cpu3 { ...@@ -47,6 +47,7 @@ cpu3 {
}; };
memory@80000000 { memory@80000000 {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment