2017-06-09 09:04:33

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Hi

(+Anatolij Gustschin <[email protected]>)


Ping.
I am not 100% sure who is responsible for this,
but somebody, could take a look at this patch, please?


2017-05-24 14:12 GMT+09:00 Masahiro Yamada <[email protected]>:
> Most of DT files in PowerPC use #include "..." to make pre-processor
> include DT in the same directory, but we have 3 exceptional files
> that use #include <...> for that.
>
> Fix them to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from
> dtc_cpp_flags.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/powerpc/boot/dts/ac14xx.dts | 2 +-
> arch/powerpc/boot/dts/mpc5121ads.dts | 2 +-
> arch/powerpc/boot/dts/pdm360ng.dts | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
> index 27fcabc2f857..83bcfd865167 100644
> --- a/arch/powerpc/boot/dts/ac14xx.dts
> +++ b/arch/powerpc/boot/dts/ac14xx.dts
> @@ -10,7 +10,7 @@
> */
>
>
> -#include <mpc5121.dtsi>
> +#include "mpc5121.dtsi"
>
> / {
> model = "ac14xx";
> diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
> index 75888ce2c792..73c30621429b 100644
> --- a/arch/powerpc/boot/dts/mpc5121ads.dts
> +++ b/arch/powerpc/boot/dts/mpc5121ads.dts
> @@ -9,7 +9,7 @@
> * option) any later version.
> */
>
> -#include <mpc5121.dtsi>
> +#include "mpc5121.dtsi"
>
> / {
> model = "mpc5121ads";
> diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
> index 0cec7244abe7..445b88114009 100644
> --- a/arch/powerpc/boot/dts/pdm360ng.dts
> +++ b/arch/powerpc/boot/dts/pdm360ng.dts
> @@ -13,7 +13,7 @@
> * option) any later version.
> */
>
> -#include <mpc5121.dtsi>
> +#include "mpc5121.dtsi"
>
> / {
> model = "pdm360ng";
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html



--
Best Regards
Masahiro Yamada


2017-06-13 10:21:49

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Masahiro Yamada <[email protected]> writes:

> Hi
>
> (+Anatolij Gustschin <[email protected]>)
>
>
> Ping.
> I am not 100% sure who is responsible for this,
> but somebody, could take a look at this patch, please?

Have you tested it actually works?

It sounds reasonable, and if it behaves as you describe there is no
change in behaviour, right?

cheers

> 2017-05-24 14:12 GMT+09:00 Masahiro Yamada <[email protected]>:
>> Most of DT files in PowerPC use #include "..." to make pre-processor
>> include DT in the same directory, but we have 3 exceptional files
>> that use #include <...> for that.
>>
>> Fix them to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from
>> dtc_cpp_flags.
>>
>> Signed-off-by: Masahiro Yamada <[email protected]>
>> ---
>>
>> arch/powerpc/boot/dts/ac14xx.dts | 2 +-
>> arch/powerpc/boot/dts/mpc5121ads.dts | 2 +-
>> arch/powerpc/boot/dts/pdm360ng.dts | 2 +-
>> 3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
>> index 27fcabc2f857..83bcfd865167 100644
>> --- a/arch/powerpc/boot/dts/ac14xx.dts
>> +++ b/arch/powerpc/boot/dts/ac14xx.dts
>> @@ -10,7 +10,7 @@
>> */
>>
>>
>> -#include <mpc5121.dtsi>
>> +#include "mpc5121.dtsi"
>>
>> / {
>> model = "ac14xx";
>> diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
>> index 75888ce2c792..73c30621429b 100644
>> --- a/arch/powerpc/boot/dts/mpc5121ads.dts
>> +++ b/arch/powerpc/boot/dts/mpc5121ads.dts
>> @@ -9,7 +9,7 @@
>> * option) any later version.
>> */
>>
>> -#include <mpc5121.dtsi>
>> +#include "mpc5121.dtsi"
>>
>> / {
>> model = "mpc5121ads";
>> diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
>> index 0cec7244abe7..445b88114009 100644
>> --- a/arch/powerpc/boot/dts/pdm360ng.dts
>> +++ b/arch/powerpc/boot/dts/pdm360ng.dts
>> @@ -13,7 +13,7 @@
>> * option) any later version.
>> */
>>
>> -#include <mpc5121.dtsi>
>> +#include "mpc5121.dtsi"
>>
>> / {
>> model = "pdm360ng";
>> --
>> 2.7.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe devicetree" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> Best Regards
> Masahiro Yamada

2017-06-13 13:10:52

by Anatolij Gustschin

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

On Tue, 13 Jun 2017 20:21:45 +1000
Michael Ellerman [email protected] wrote:

>Masahiro Yamada <[email protected]> writes:
...
>> Ping.
>> I am not 100% sure who is responsible for this,
>> but somebody, could take a look at this patch, please?
>
>Have you tested it actually works?
>
>It sounds reasonable, and if it behaves as you describe there is no
>change in behaviour, right?

yes, these dtbs build with this patch and I've tested with
mpc5121ads.dtb.

Thanks,
Anatolij

2017-06-14 05:55:08

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Hi.


2017-06-13 19:21 GMT+09:00 Michael Ellerman <[email protected]>:
> Masahiro Yamada <[email protected]> writes:
>
>> Hi
>>
>> (+Anatolij Gustschin <[email protected]>)
>>
>>
>> Ping.
>> I am not 100% sure who is responsible for this,
>> but somebody, could take a look at this patch, please?
>
> Have you tested it actually works?
>
> It sounds reasonable, and if it behaves as you describe there is no
> change in behaviour, right?


I do not have access to hardware,
but it is pretty easy to test this patch.


$ make O=foo ARCH=powerpc CROSS_COMPILE=powerpc-linux- dts/ac14xx.dtb

gave me the DTB output.

The binary comparison matched with/without this patch,
so I am sure there is no change in behavior.

Likewise for mpc5121ads and pdm360ng.


Double-check by Anatolij was very appreciated.




--
Best Regards
Masahiro Yamada

2017-06-14 06:45:21

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Masahiro Yamada <[email protected]> writes:
> 2017-06-13 19:21 GMT+09:00 Michael Ellerman <[email protected]>:
>> Masahiro Yamada <[email protected]> writes:
>>>
>>> (+Anatolij Gustschin <[email protected]>)
>>>
>>> Ping.
>>> I am not 100% sure who is responsible for this,
>>> but somebody, could take a look at this patch, please?
>>
>> Have you tested it actually works?
>>
>> It sounds reasonable, and if it behaves as you describe there is no
>> change in behaviour, right?
>
> I do not have access to hardware,
> but it is pretty easy to test this patch.
>
> $ make O=foo ARCH=powerpc CROSS_COMPILE=powerpc-linux- dts/ac14xx.dtb
>
> gave me the DTB output.
>
> The binary comparison matched with/without this patch,
> so I am sure there is no change in behavior.
>
> Likewise for mpc5121ads and pdm360ng.

Thanks.

Acked-by: Michael Ellerman <[email protected]>


cheers

2017-06-21 01:40:09

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

2017-06-14 15:45 GMT+09:00 Michael Ellerman <[email protected]>:
> Masahiro Yamada <[email protected]> writes:
>> 2017-06-13 19:21 GMT+09:00 Michael Ellerman <[email protected]>:
>>> Masahiro Yamada <[email protected]> writes:
>>>>
>>>> (+Anatolij Gustschin <[email protected]>)
>>>>
>>>> Ping.
>>>> I am not 100% sure who is responsible for this,
>>>> but somebody, could take a look at this patch, please?
>>>
>>> Have you tested it actually works?
>>>
>>> It sounds reasonable, and if it behaves as you describe there is no
>>> change in behaviour, right?
>>
>> I do not have access to hardware,
>> but it is pretty easy to test this patch.
>>
>> $ make O=foo ARCH=powerpc CROSS_COMPILE=powerpc-linux- dts/ac14xx.dtb
>>
>> gave me the DTB output.
>>
>> The binary comparison matched with/without this patch,
>> so I am sure there is no change in behavior.
>>
>> Likewise for mpc5121ads and pdm360ng.
>
> Thanks.
>
> Acked-by: Michael Ellerman <[email protected]>
>
>

I have not seen it in linux-next yet.

Who will pick it up?



--
Best Regards
Masahiro Yamada

2017-06-21 09:49:02

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Masahiro Yamada <[email protected]> writes:
> 2017-06-14 15:45 GMT+09:00 Michael Ellerman <[email protected]>:
>>
>> Acked-by: Michael Ellerman <[email protected]>
>
> I have not seen it in linux-next yet.
>
> Who will pick it up?

In the original patch you said:

Fix them to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from
dtc_cpp_flags.

So I assumed there was a series somewhere that did that and included
this patch.

But if there isn't then I can just merge it.

cheers

2017-06-21 09:52:40

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

2017-06-21 18:48 GMT+09:00 Michael Ellerman <[email protected]>:
> Masahiro Yamada <[email protected]> writes:
>> 2017-06-14 15:45 GMT+09:00 Michael Ellerman <[email protected]>:
>>>
>>> Acked-by: Michael Ellerman <[email protected]>
>>
>> I have not seen it in linux-next yet.
>>
>> Who will pick it up?
>
> In the original patch you said:
>
> Fix them to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from
> dtc_cpp_flags.
>
> So I assumed there was a series somewhere that did that and included
> this patch.
>
> But if there isn't then I can just merge it.
>

Yes, please apply.


At first, I sent a series including ARM, PowerPC, Makefile changes,
but I decided to split per-subsystem after all.

Sorry for confusion.



--
Best Regards
Masahiro Yamada

2017-06-30 05:19:08

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Hi Michael,

Ping. Please apply this patch.

I need this to clean up Makefiles in the next development cycle.



2017-06-21 18:52 GMT+09:00 Masahiro Yamada <[email protected]>:
> 2017-06-21 18:48 GMT+09:00 Michael Ellerman <[email protected]>:
>> Masahiro Yamada <[email protected]> writes:
>>> 2017-06-14 15:45 GMT+09:00 Michael Ellerman <[email protected]>:
>>>>
>>>> Acked-by: Michael Ellerman <[email protected]>
>>>
>>> I have not seen it in linux-next yet.
>>>
>>> Who will pick it up?
>>
>> In the original patch you said:
>>
>> Fix them to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from
>> dtc_cpp_flags.
>>
>> So I assumed there was a series somewhere that did that and included
>> this patch.
>>
>> But if there isn't then I can just merge it.
>>
>
> Yes, please apply.
>
>
> At first, I sent a series including ARM, PowerPC, Makefile changes,
> but I decided to split per-subsystem after all.
>
> Sorry for confusion.
>
>
>
> --
> Best Regards
> Masahiro Yamada



--
Best Regards
Masahiro Yamada

2017-07-03 12:35:21

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc: dts: use #include "..." to include local DT

Masahiro Yamada <[email protected]> writes:

> Hi Michael,
>
> Ping. Please apply this patch.
>
> I need this to clean up Makefiles in the next development cycle.

Sorry for some reason it didn't land in patchwork, so I keep forgetting
about it.

Have merged it now for 4.13.

cheers