summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-03-03 19:40:43 -0300
committerShawn Guo <shawnguo@kernel.org>2018-03-08 16:48:50 +0800
commit55cd3e8b68c6dc8bcc29a83cf65a6c3376393254 (patch)
tree2a5c7149cd114f6af4b5e128cb7a6ce5a8db9241 /arch/arm
parent4217fcc59178a19c5472775c1fe1f489ac66cab1 (diff)
downloadop-kernel-dev-55cd3e8b68c6dc8bcc29a83cf65a6c3376393254.zip
op-kernel-dev-55cd3e8b68c6dc8bcc29a83cf65a6c3376393254.tar.gz
ARM: dts: vf610m4: 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')
-rw-r--r--arch/arm/boot/dts/vf610m4.dtsi9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
index 1474bd3..5d52af2 100644
--- a/arch/arm/boot/dts/vf610m4.dtsi
+++ b/arch/arm/boot/dts/vf610m4.dtsi
@@ -42,10 +42,17 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "vfxxx.dtsi"
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ chosen { };
+ aliases { };
+ memory { device_type = "memory"; reg = <0 0>; };
+};
+
&mscm_ir {
interrupt-parent = <&nvic>;
};
OpenPOWER on IntegriCloud