Commit c0b0d540 authored Apr 11, 2018 by Sean Wang Committed by Matthias Brugger May 11, 2018

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



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: Sean Wang <sean.wang@mediatek.com>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

parent 1cf30709

arch/arm/boot/dts/mt7623.dtsi

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,11 +15,12 @@
		#include <dt-bindings/phy/phy.h>
		#include <dt-bindings/reset/mt2701-resets.h>
		#include <dt-bindings/thermal/thermal.h>
		#include "skeleton64.dtsi"

		/ {
		compatible = "mediatek,mt7623";
		interrupt-parent = <&sysirq>;
		#address-cells = <2>;
		#size-cells = <2>;

		cpu_opp_table: opp-table {
		compatible = "operating-points-v2";

arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@
		};

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

arch/arm/boot/dts/mt7623n-rfb.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		};

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