[PATCH] arm64: dts: rockchip: fix include reference

[PATCH] arm64: dts: rockchip: fix include reference

[Arnd Bergmann]

The way we handle include paths for DT has changed a bit, which
broke a file that had an unconventional way to reference a common
header file:

arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:10: fatal error: include/dt-bindings/input/linux-event-codes.h: No such file or directory

This removes the leading "include/" from the path name, which fixes it.

Fixes: d5d332d3f7e8 ("devicetree: Move include prefixes from arch to separate directory")
Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
---
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
index 658bb9dc9dfd..7bd31066399b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
@@ -44,7 +44,7 @@
 
 /dts-v1/;
 #include "rk3399-gru.dtsi"
-#include <include/dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/input/linux-event-codes.h>
 
 /*
  * Kevin-specific things
-- 
2.9.0

Re: [PATCH] arm64: dts: rockchip: fix include reference

[Heiko Stuebner]

Hi Arnd,

Am Freitag, 19. Mai 2017, 14:14:34 CEST schrieb Arnd Bergmann:
> The way we handle include paths for DT has changed a bit, which
> broke a file that had an unconventional way to reference a common
> header file:
> 
> arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:10: fatal error: include/dt-bindings/input/linux-event-codes.h: No such file or directory
> 
> This removes the leading "include/" from the path name, which fixes it.
> 
> Fixes: d5d332d3f7e8 ("devicetree: Move include prefixes from arch to separate directory")
> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>

This mimics the patch from Ian Campbell [0], which I also pointed at in
the "devicetree: Move include prefixes from arch to separate directory"
thread and I had originally hoped that both would get applied together.

In any case, both patches look good, so this as well gets a
Reviewed-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>

The other one also got a
Reviewed-by: Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>

It seems I don't have any other fixes for 4.12 at the moment, so
do you want to apply any of the two yourself, or should this make
a round through my tree? (Both ways are fine by me)


Heiko

[0] https://patchwork.kernel.org/patch/9724957/

> ---
>  arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
> index 658bb9dc9dfd..7bd31066399b 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
> @@ -44,7 +44,7 @@
>  
>  /dts-v1/;
>  #include "rk3399-gru.dtsi"
> -#include <include/dt-bindings/input/linux-event-codes.h>
> +#include <dt-bindings/input/linux-event-codes.h>
>  
>  /*
>   * Kevin-specific things
> 

Re: [PATCH] arm64: dts: rockchip: fix include reference

[Arnd Bergmann]

On Fri, May 19, 2017 at 2:47 PM, Heiko Stuebner <heiko@sntech.de> wrote:
> Hi Arnd,
>
> Am Freitag, 19. Mai 2017, 14:14:34 CEST schrieb Arnd Bergmann:
>> The way we handle include paths for DT has changed a bit, which
>> broke a file that had an unconventional way to reference a common
>> header file:
>>
>> arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:10: fatal error: include/dt-bindings/input/linux-event-codes.h: No such file or directory
>>
>> This removes the leading "include/" from the path name, which fixes it.
>>
>> Fixes: d5d332d3f7e8 ("devicetree: Move include prefixes from arch to separate directory")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> This mimics the patch from Ian Campbell [0], which I also pointed at in
> the "devicetree: Move include prefixes from arch to separate directory"
> thread and I had originally hoped that both would get applied together.
>
> In any case, both patches look good, so this as well gets a
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
>
> The other one also got a
> Reviewed-by: Brian Norris <briannorris@chromium.org>
>
> It seems I don't have any other fixes for 4.12 at the moment, so
> do you want to apply any of the two yourself, or should this make
> a round through my tree? (Both ways are fine by me)
>
>
> Heiko
>
> [0] https://patchwork.kernel.org/patch/9724957/

Ok, thanks!

I already applied my version to the fixes branch as I saw that we have
the build regression after Olof applied his patch.

      Arnd

[PATCH] arm64: dts: rockchip: fix include reference

[Arnd Bergmann]

On Fri, May 19, 2017 at 2:47 PM, Heiko Stuebner <heiko@sntech.de> wrote:
> Hi Arnd,
>
> Am Freitag, 19. Mai 2017, 14:14:34 CEST schrieb Arnd Bergmann:
>> The way we handle include paths for DT has changed a bit, which
>> broke a file that had an unconventional way to reference a common
>> header file:
>>
>> arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:10: fatal error: include/dt-bindings/input/linux-event-codes.h: No such file or directory
>>
>> This removes the leading "include/" from the path name, which fixes it.
>>
>> Fixes: d5d332d3f7e8 ("devicetree: Move include prefixes from arch to separate directory")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> This mimics the patch from Ian Campbell [0], which I also pointed at in
> the "devicetree: Move include prefixes from arch to separate directory"
> thread and I had originally hoped that both would get applied together.
>
> In any case, both patches look good, so this as well gets a
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
>
> The other one also got a
> Reviewed-by: Brian Norris <briannorris@chromium.org>
>
> It seems I don't have any other fixes for 4.12 at the moment, so
> do you want to apply any of the two yourself, or should this make
> a round through my tree? (Both ways are fine by me)
>
>
> Heiko
>
> [0] https://patchwork.kernel.org/patch/9724957/

Ok, thanks!

I already applied my version to the fixes branch as I saw that we have
the build regression after Olof applied his patch.

      Arnd