[PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference

[PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference

[Masahiro Yamada]

This series depends on Olof's
"devicetree: Move include prefixes from arch to separate directory"
https://patchwork.kernel.org/patch/9724995/

1/5: clean-up of unused include path
2/5: Fixup of last three DT files in ARM (needed for 4/5)
3/5: Fixup of last three DT files in PowerPC (needed for 4/5)
4/5: Remove arch/$(SRCARCH)/boot/dts include path
5/5: Make DT cross-arch reference available for /include/ directive


Masahiro Yamada (5):
  of: remove drivers/of/testcase-data from include search path for CPP
  ARM: dts: use #include "..." to include DT in the same directory
  powerpc: dts: use #include "..." to include DT in the same directory
  of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
  of: add scripts/dtc/include-prefixes to search path for both CPP and
    DTC

 arch/arm/boot/dts/imx6q-zii-rdu2.dts  | 4 ++--
 arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
 arch/arm/boot/dts/versatile-pb.dts    | 2 +-
 arch/powerpc/boot/dts/ac14xx.dts      | 2 +-
 arch/powerpc/boot/dts/mpc5121ads.dts  | 2 +-
 arch/powerpc/boot/dts/pdm360ng.dts    | 2 +-
 scripts/Makefile.lib                  | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.7.4

[PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory

[Masahiro Yamada]

Most of DT files in ARM use #include "..." to make pre-processor
include DT in the same directory, but we have 3 exceptional files
that use #include <...> for that.

They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
path from dtc_cpp_flags.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/boot/dts/imx6q-zii-rdu2.dts  | 4 ++--
 arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
 arch/arm/boot/dts/versatile-pb.dts    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
index b2d3466..6be8a1e 100644
--- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
@@ -41,8 +41,8 @@
 
 /dts-v1/;
 
-#include <imx6q.dtsi>
-#include <imx6qdl-zii-rdu2.dtsi>
+#include "imx6q.dtsi"
+#include "imx6qdl-zii-rdu2.dtsi"
 
 / {
 	model = "ZII RDU2 Board";
diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 882b3bd..547a766 100644
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -41,8 +41,8 @@
 
 /dts-v1/;
 
-#include <imx6qp.dtsi>
-#include <imx6qdl-zii-rdu2.dtsi>
+#include "imx6qp.dtsi"
+#include "imx6qdl-zii-rdu2.dtsi"
 
 / {
 	model = "ZII RDU2+ Board";
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 33a8eb2..06e2331 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -1,4 +1,4 @@
-#include <versatile-ab.dts>
+#include "versatile-ab.dts"
 
 / {
 	model = "ARM Versatile PB";
-- 
2.7.4

[PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory

[Shawn Guo]

Hi Masahiro,

On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
> Most of DT files in ARM use #include "..." to make pre-processor
> include DT in the same directory, but we have 3 exceptional files
> that use #include <...> for that.
> 
> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
> path from dtc_cpp_flags.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  arch/arm/boot/dts/imx6q-zii-rdu2.dts  | 4 ++--
>  arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--

I see this patch depends on nothing and can be applied immediately.  But
versatile-pb.dts is not really in my charge.  In case you want to get
this series merged by arm-soc folks, here is my ACK:

Acked-by: Shawn Guo <shawnguo@kernel.org>

Or you need to split versatile-pb.dts out, and then I can take it.

Shawn

>  arch/arm/boot/dts/versatile-pb.dts    | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> index b2d3466..6be8a1e 100644
> --- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>  
>  /dts-v1/;
>  
> -#include <imx6q.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>  
>  / {
>  	model = "ZII RDU2 Board";
> diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> index 882b3bd..547a766 100644
> --- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>  
>  /dts-v1/;
>  
> -#include <imx6qp.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6qp.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>  
>  / {
>  	model = "ZII RDU2+ Board";
> diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
> index 33a8eb2..06e2331 100644
> --- a/arch/arm/boot/dts/versatile-pb.dts
> +++ b/arch/arm/boot/dts/versatile-pb.dts
> @@ -1,4 +1,4 @@
> -#include <versatile-ab.dts>
> +#include "versatile-ab.dts"
>  
>  / {
>  	model = "ARM Versatile PB";
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory

[Masahiro Yamada]

Hi Shawn,

2017-05-15 22:10 GMT+09:00 Shawn Guo <shawnguo@kernel.org>:
> Hi Masahiro,
>
> On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
>> Most of DT files in ARM use #include "..." to make pre-processor
>> include DT in the same directory, but we have 3 exceptional files
>> that use #include <...> for that.
>>
>> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
>> path from dtc_cpp_flags.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>>  arch/arm/boot/dts/imx6q-zii-rdu2.dts  | 4 ++--
>>  arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
>
> I see this patch depends on nothing and can be applied immediately.  But
> versatile-pb.dts is not really in my charge.  In case you want to get
> this series merged by arm-soc folks, here is my ACK:
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
>
> Or you need to split versatile-pb.dts out, and then I can take it.
>
> Shawn


This is needed for 4/5:
https://patchwork.kernel.org/patch/9726697/

Probably, no need to rush for this series.

So, perhaps we can apply DT changes for v4.13 (by splitting per-platform),
then Makefile changes for 4.14.

I will wait for comments for a while (if any).





-- 
Best Regards
Masahiro Yamada

[PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory

[Masahiro Yamada]

Hi Shawn,

2017-05-15 22:10 GMT+09:00 Shawn Guo <shawnguo@kernel.org>:
> Hi Masahiro,
>
> On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
>> Most of DT files in ARM use #include "..." to make pre-processor
>> include DT in the same directory, but we have 3 exceptional files
>> that use #include <...> for that.
>>
>> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
>> path from dtc_cpp_flags.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>>  arch/arm/boot/dts/imx6q-zii-rdu2.dts  | 4 ++--
>>  arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
>
> I see this patch depends on nothing and can be applied immediately.  But
> versatile-pb.dts is not really in my charge.  In case you want to get
> this series merged by arm-soc folks, here is my ACK:
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
>
> Or you need to split versatile-pb.dts out, and then I can take it.
>
> Shawn

I split it out.

Please pick up the imx6 one.  Thanks!


-- 
Best Regards
Masahiro Yamada