From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755634AbdEMQTQ (ORCPT ); Sat, 13 May 2017 12:19:16 -0400 Received: from gloria.sntech.de ([95.129.55.99]:35896 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752031AbdEMQTO (ORCPT ); Sat, 13 May 2017 12:19:14 -0400 From: Heiko Stuebner To: Olof Johansson Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , Mark Rutland , Russell King , Catalin Marinas , Will Deacon , Mikael Starvik , Jesper Nilsson , James Hogan , Ralf Baechle , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frank Rowand , linux-arch Subject: Re: [PATCH] devicetree: Move include prefixes from arch to separate directory Date: Sat, 13 May 2017 18:18:23 +0200 Message-ID: <5321739.niXTlG4pZX@phil> User-Agent: KMail/5.2.3 (Linux/4.9.0-2-amd64; KDE/5.28.0; x86_64; ; ) In-Reply-To: <1494646471-24624-1-git-send-email-olof@lixom.net> References: <1494646471-24624-1-git-send-email-olof@lixom.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Olof, Am Freitag, 12. Mai 2017, 20:34:31 CEST schrieb Olof Johansson: > We use a directory under arch/$ARCH/boot/dts as an include path > that has links outside of the subtree to find dt-bindings from under > include/dt-bindings. That's been working well, but new DT architectures > haven't been adding them by default. > > Recently there's been a desire to share some of the DT material between > arm and arm64, which originally caused developers to create symlinks or > relative includes between the subtrees. This isn't ideal -- it breaks > if the DT files aren't stored in the exact same hierarchy as the kernel > tree, and generally it's just icky. > > As a somewhat cleaner solution we decided to add a $ARCH/ prefix link > once, and allow DTS files to reference dtsi (and dts) files in other > architectures that way. > > Original approach was to create these links under each architecture, > but it lead to the problem of recursive symlinks. > > As a remedy, move the include link directories out of the architecture > trees into a common location. At the same time, they can now share one > directory and one dt-bindings/ link as well. > > Fixes: 4027494ae6e3 ('ARM: dts: add arm/arm64 include symlinks') > Reported-by: Russell King > Reported-by: Omar Sandoval > Cc: Heiko Stuebner > Cc: Rob Herring > Cc: Mark Rutland > Cc: Russell King > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Mikael Starvik > Cc: Jesper Nilsson > Cc: James Hogan > Cc: Ralf Baechle > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: Michael Ellerman > Cc: Frank Rowand > Cc: linux-arch > Signed-off-by: Olof Johansson change itself looks good to me and also works, so Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner But we also have an overlooked glitch in the new rk3399-gru devicetrees that surfaces with this patch applied. ../arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:57: fatal error: include/dt-bindings/input/linux-event-codes.h: File or directory not found #include so need the patch from Ian Campbell "arm64: dts: rockchip: Drop explicit "include/" prefix from #include" [0] in front to not cause other build breakage. So if applicable, both patches should go in together, with the gru patch in front and I've added my Reviewed-by there if someone else is doing it. Heiko [0] https://www.spinics.net/lists/arm-kernel/msg580835.html