summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/vf500.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-03-03 19:40:40 -0300
committerShawn Guo <shawnguo@kernel.org>2018-03-08 16:48:24 +0800
commitc06f616d35c96e429183cfdbd755f66383862e32 (patch)
treee998ca40c318f1c021fbf901c449092c103774f0 /arch/arm/boot/dts/vf500.dtsi
parentde25b9bb4a40c571718180a870e6d3087da11f80 (diff)
downloadlwn-c06f616d35c96e429183cfdbd755f66383862e32.tar.gz
lwn-c06f616d35c96e429183cfdbd755f66383862e32.zip
ARM: dts: vf500: Remove skeleton.dtsi inclusion
Since commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated") the inclusion of skeleton.dtsi is deprecated, so remove it as this file will eventually go away someday. Move its content to the SoC dtsi file, so that the resultant dtb is the same. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/vf500.dtsi')
-rw-r--r--arch/arm/boot/dts/vf500.dtsi7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index 348bcd30c0f7..1e3b479be62e 100644
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -39,11 +39,16 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
#include "vfxxx.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ chosen { };
+ aliases { };
+ memory { device_type = "memory"; reg = <0 0>; };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;