Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76aa7591 authored by Ian Campbell's avatar Ian Campbell Committed by Arnd Bergmann
Browse files

ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm

The ../../../arm... style cross-references added by commit 9d56c22a
("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.") do not work in the
context of the split device-tree repository[0] (where the directory
structure differs). As with commit 8ee57b81 ("ARM64: dts: vexpress: Use
a symlink to vexpress-v2m-rs1.dtsi from arch=arm") use symlinks instead.

[0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/



Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Lee Jones <lee@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rpi-kernel@lists.infradead.org
Cc: arm@kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6b7b554d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
../../../../arm/boot/dts/bcm2835-rpi.dtsi
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
/dts-v1/;
#include "bcm2837.dtsi"
#include "../../../../arm/boot/dts/bcm2835-rpi.dtsi"
#include "../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"

/ {
	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
+1 −1
Original line number Diff line number Diff line
#include "../../../../arm/boot/dts/bcm283x.dtsi"
#include "bcm283x.dtsi"

/ {
	compatible = "brcm,bcm2836";
+1 −0
Original line number Diff line number Diff line
../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
../../../../arm/boot/dts/bcm283x.dtsi
 No newline at end of file