From f216b5de30d79c23798d3af9995bd588d01d6391 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 25 Feb 2016 09:30:03 -0800 Subject: [PATCH] ARM64: dts: Use C pre-processor for includes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change the dtsi include code to use the C pre-processor #include instead of the device tree /include/. This brings all ZynqMP device trees inline with each other. Signed-off-by: Alistair Francis Reviewed-by: Sören Brinkmann Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-ep108.dts | 4 ++-- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 5 +++-- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 5 +++-- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/zynqmp-ep108.dts b/arch/arm/dts/zynqmp-ep108.dts index 6a5ebe78916..924d1b1be52 100644 --- a/arch/arm/dts/zynqmp-ep108.dts +++ b/arch/arm/dts/zynqmp-ep108.dts @@ -10,8 +10,8 @@ /dts-v1/; -/include/ "zynqmp.dtsi" -/include/ "zynqmp-ep108-clk.dtsi" +#include "zynqmp.dtsi" +#include "zynqmp-ep108-clk.dtsi" / { model = "ZynqMP EP108"; diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts index 91d01536fdb..c68a41bea79 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts @@ -10,8 +10,9 @@ /dts-v1/; -/include/ "zynqmp.dtsi" -/include/ "zynqmp-clk.dtsi" +#include "zynqmp.dtsi" +#include "zynqmp-clk.dtsi" + / { model = "ZynqMP zc1751-xm015-dc1 RevA"; compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp"; diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts index 26c6de6ce53..3fdfcc8a11a 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts @@ -10,8 +10,9 @@ /dts-v1/; -/include/ "zynqmp.dtsi" -/include/ "zynqmp-clk.dtsi" +#include "zynqmp.dtsi" +#include "zynqmp-clk.dtsi" + / { model = "ZynqMP zc1751-xm016-dc2 RevA"; compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp"; diff --git a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts index 4198e0006a5..d754f9f9040 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts @@ -11,8 +11,8 @@ /dts-v1/; -/include/ "zynqmp.dtsi" -/include/ "zynqmp-clk.dtsi" +#include "zynqmp.dtsi" +#include "zynqmp-clk.dtsi" / { model = "ZynqMP zc1751-xm019-dc5 RevA"; compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp"; -- 2.47.3