From: Mark Rutland <mark.rutland@arm.com>
To: Ian Campbell <ijc@hellion.org.uk>
Cc: devicetree@vger.kernel.org, arm@kernel.org,
Stephen Warren <swarren@wwwdotorg.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Lee Jones <lee@kernel.org>, Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>,
Rob Herring <robh+dt@kernel.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Frank Rowand <frowand.list@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-rpi-kernel@lists.infradead.org
Subject: Re: [PATCH v2 2/2] ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm
Date: Wed, 3 Aug 2016 15:54:02 +0100 [thread overview]
Message-ID: <20160803145402.GB29054@leverpostej> (raw)
In-Reply-To: <1470233565-30154-2-git-send-email-ijc@hellion.org.uk>
On Wed, Aug 03, 2016 at 03:12:45PM +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[0] (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.
>
> [0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/
>
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
As this matches what we did in 8ee57b8182c4, and no longer involves
raising skeletons back from the dead:
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
> new file mode 120000
> index 0000000..3937b77
> --- /dev/null
> +++ b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
> @@ -0,0 +1 @@
> +../../../../arm/boot/dts/bcm2835-rpi.dtsi
> \ No newline at end of file
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
> index 6f47dd2..7841b72 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
> @@ -1,7 +1,7 @@
> /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";
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi
> index f2a31d0..8216bbb 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi
> +++ b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi
> @@ -1,4 +1,4 @@
> -#include "../../../../arm/boot/dts/bcm283x.dtsi"
> +#include "bcm283x.dtsi"
>
> / {
> compatible = "brcm,bcm2836";
> diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
> new file mode 120000
> index 0000000..dca7c05
> --- /dev/null
> +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
> @@ -0,0 +1 @@
> +../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
> \ No newline at end of file
> diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
> new file mode 120000
> index 0000000..5f54e4c
> --- /dev/null
> +++ b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
> @@ -0,0 +1 @@
> +../../../../arm/boot/dts/bcm283x.dtsi
> \ No newline at end of file
> --
> 2.8.1
>
next prev parent reply other threads:[~2016-08-03 14:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-03 14:12 [PATCH v2 1/2] ARM: dts: Remove use of skeleton.dtsi from bcm283x.dtsi Ian Campbell
2016-08-03 14:12 ` [PATCH v2 2/2] ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm Ian Campbell
2016-08-03 14:54 ` Mark Rutland [this message]
2016-08-03 14:48 ` [PATCH v2 1/2] ARM: dts: Remove use of skeleton.dtsi from bcm283x.dtsi Mark Rutland
2016-08-09 10:48 ` Ian Campbell
[not found] ` <1470739709.4745.23.camel-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
2016-08-18 7:21 ` Ian Campbell
[not found] ` <1471504916.6295.32.camel-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
2016-08-18 10:23 ` Mark Rutland
2016-08-23 10:09 ` Arnd Bergmann
2016-09-09 14:45 ` Ian Campbell
[not found] ` <1473432356.28111.60.camel-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
2016-09-09 15:47 ` Arnd Bergmann
2016-09-09 16:21 ` Ian Campbell
2016-08-03 16:57 ` Stefan Wahren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160803145402.GB29054@leverpostej \
--to=mark.rutland@arm.com \
--cc=arm@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=eric@anholt.net \
--cc=frowand.list@gmail.com \
--cc=ijc@hellion.org.uk \
--cc=kraxel@redhat.com \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=robh+dt@kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).