Re: [PATCH v3 2/2] ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm
From: Olof Johansson
Date: Mon Oct 03 2016 - 01:57:30 EST
On Thu, Aug 18, 2016 at 11:42:06AM +0100, Ian Campbell wrote:
> The ../../../arm... style cross-references added by commit 9d56c22a7861
> ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.") do not work in the
> context of the split device-tree repository (where the directory
> structure differs). As with commit 8ee57b8182c4 ("ARM64: dts: vexpress: Use
> a symlink to vexpress-v2m-rs1.dtsi from arch=arm") use symlinks instead.
>  https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/
> Signed-off-by: Ian Campbell <ijc@xxxxxxxxxxxxxx>
> Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
> Cc: Will Deacon <will.deacon@xxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> Cc: Frank Rowand <frowand.list@xxxxxxxxx>
> Cc: Eric Anholt <eric@xxxxxxxxxx>
> Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
> Cc: Lee Jones <lee@xxxxxxxxxx>
> Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-rpi-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: arm@xxxxxxxxxx
> v2: No more need for skeleton.dtsi since this was cleaned up in the previous
> v3: Collected tags
I still think this is fundamentally the wrong approach. We shouldn't have
created these file links in the first place.
I'd rather have something like this in our tree:
arch/arm64/boot/dts/include/arm -> ../../../../arm/boot/dts
arch/arm64/boot/dts/include/arm64 -> ../..
arch/arm/boot/dts/include/arm64 -> ../../../../arm64/boot/dts
arch/arm/boot/dts/include/arm -> ../..
That way you can include by using <arm/bcm2835-rpi.dtsi> instead.
You'll populate another (or the same) directory with links as appropriate
in your out-of-tree version of the DT contents.
No more symlinked files, and still a clear way of showing that you're
referencing contents out of the other architecture.
Considerably cleaner, isn't it?