]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: vf610m4: Remove skeleton.dtsi inclusion
authorFabio Estevam <fabio.estevam@nxp.com>
Sat, 3 Mar 2018 22:40:43 +0000 (19:40 -0300)
committerShawn Guo <shawnguo@kernel.org>
Thu, 8 Mar 2018 08:48:50 +0000 (16:48 +0800)
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>
arch/arm/boot/dts/vf610m4.dtsi

index 1474bd34d0f1b68334d8c3c360e5fe7a8f55ec50..5d52af2939a33c6a7a28b875ae1dcf66a30aacb4 100644 (file)
  *     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>;
 };