diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2016-10-17 13:47:29 +0200 |
|---|---|---|
| committer | Sudeep Holla <sudeep.holla@arm.com> | 2016-10-17 14:48:32 +0200 |
| commit | 7f43049b40505cf21a01667a6ad42e6a3df6e4de (patch) | |
| tree | a8a611f7cb6952ef17043297fc64c4bf93c53b50 /arch/arm | |
| parent | Linux 4.9-rc1 (diff) | |
| download | linux-7f43049b40505cf21a01667a6ad42e6a3df6e4de.tar.xz linux-7f43049b40505cf21a01667a6ad42e6a3df6e4de.zip | |
ARM: dts: mps2: remove skeleton.dtsi include and fix unit address warnings
Removale of skeleton.dtsi allows us also to fix the following
warning from the dts compiler:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges
property, but no unit name
by adding proper unit addresses to the memory nodes.
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/mps2-an385.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mps2-an399.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/mps2.dtsi | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/mps2-an385.dts b/arch/arm/boot/dts/mps2-an385.dts index 31c374d72a6f..aebbebfc25d1 100644 --- a/arch/arm/boot/dts/mps2-an385.dts +++ b/arch/arm/boot/dts/mps2-an385.dts @@ -59,7 +59,7 @@ stdout-path = "serial0:9600n8"; }; - memory { + memory@21000000 { device_type = "memory"; reg = <0x21000000 0x1000000>; }; diff --git a/arch/arm/boot/dts/mps2-an399.dts b/arch/arm/boot/dts/mps2-an399.dts index 5e7e5ca2edbf..349abf70b2a5 100644 --- a/arch/arm/boot/dts/mps2-an399.dts +++ b/arch/arm/boot/dts/mps2-an399.dts @@ -59,7 +59,7 @@ stdout-path = "serial0:9600n8"; }; - memory { + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x1000000>; }; diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi index efb8a03cb970..23467390558d 100644 --- a/arch/arm/boot/dts/mps2.dtsi +++ b/arch/arm/boot/dts/mps2.dtsi @@ -42,10 +42,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" / { + #address-cells = <1>; + #size-cells = <1>; + oscclk0: clk-osc0 { compatible = "fixed-clock"; #clock-cells = <0>; |