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 <li...@armlinux.org.uk> > Reported-by: Omar Sandoval <osan...@osandov.com> > Cc: Heiko Stuebner <he...@sntech.de> > Cc: Rob Herring <robh...@kernel.org> > Cc: Mark Rutland <mark.rutl...@arm.com> > Cc: Russell King <li...@armlinux.org.uk> > Cc: Catalin Marinas <catalin.mari...@arm.com> > Cc: Will Deacon <will.dea...@arm.com> > Cc: Mikael Starvik <star...@axis.com> > Cc: Jesper Nilsson <jesper.nils...@axis.com> > Cc: James Hogan <james.ho...@imgtec.com> > Cc: Ralf Baechle <r...@linux-mips.org> > Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> > Cc: Paul Mackerras <pau...@samba.org> > Cc: Michael Ellerman <m...@ellerman.id.au> > Cc: Frank Rowand <frowand.l...@gmail.com> > Cc: linux-arch <linux-a...@vger.kernel.org> > Signed-off-by: Olof Johansson <o...@lixom.net>
change itself looks good to me and also works, so Reviewed-by: Heiko Stuebner <he...@sntech.de> Tested-by: Heiko Stuebner <he...@sntech.de> 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 <include/dt-bindings/input/linux-event-codes.h> 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