From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752202AbbJLPiR (ORCPT ); Mon, 12 Oct 2015 11:38:17 -0400 Received: from foss.arm.com ([217.140.101.70]:48122 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbbJLPiO (ORCPT ); Mon, 12 Oct 2015 11:38:14 -0400 Date: Mon, 12 Oct 2015 16:37:50 +0100 From: Mark Rutland To: Ian Campbell Cc: linux-kernel@vger.kernel.org, Rob Herring , Pawel Moll , Kumar Gala , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Russell King , Catalin Marinas , Will Deacon , Kristina Martsenko , Kevin Hilman , Frank Rowand , Olof Johansson , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org, linux-kbuild@vger.kernel.org Subject: Re: [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm Message-ID: <20151012153750.GE7452@leverpostej> References: <1444046032-31310-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1444046032-31310-1-git-send-email-ian.campbell@citrix.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 05, 2015 at 12:53:52PM +0100, Ian Campbell wrote: > Commit 9ccd608070b6 "arm64: dts: add device tree for ARM SMM-A53x2 on > LogicTile Express 20MG" added a new dts file to arch/arm64 which > included "../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi", i.e. a > .dtsi supplied by arch/arm. > > Unfortunately this causes some issues for the split device tree > repository[0], since things get moved around there. In that context > the new .dts ends up at src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts > while the include is at src/arm/vexpress-v2m-rs1.dtsi. > > The sharing of the .dtsi is legitimate since the baseboard is the same > for various vexpress systems whatever processor they use. > > Previously I attempted to resolve this by creating a shared location > for such things but we have been unable to come to a consensus on > where that should be. > > Instead this patch simply replaces the use of ../../ in the dts > /include/ with a symlink in arch/arm64/boot/dts/arm pointing to the > file arch/arm/boot/dts. > > Since the split device tree repo will shortly be required to flatten > symlinks for other reasons this will cause the dtsi file to appear in > both src/arm and src/arm64 in the split repo, which is an improvement > on not building for arm64 now. > > [0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/ > > Signed-off-by: Ian Campbell > Cc: Rob Herring > Cc: Pawel Moll > Cc: Mark Rutland > Cc: Kumar Gala > Cc: Liviu Dudau > Cc: Sudeep Holla > Cc: Lorenzo Pieralisi > Cc: Russell King > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Kristina Martsenko > Cc: Kevin Hilman > Cc: Frank Rowand > Cc: Olof Johansson > Cc: devicetree@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: arm@kernel.org > Cc: linux-kbuild@vger.kernel.org > --- > For more on flattening symlinks see > http://thread.gmane.org/gmane.linux.kernel.input/45646/focus=45742 > --- > arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +- > arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > create mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi > > diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts > index 5b1d018..bb3c26d 100644 > --- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts > +++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts > @@ -186,6 +186,6 @@ > <0 0 41 &gic GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>, > <0 0 42 &gic GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; > > - /include/ "../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi" > + /include/ "vexpress-v2m-rs1.dtsi" > }; > }; > diff --git a/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi b/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi > new file mode 120000 > index 0000000..68fd0f8 > --- /dev/null > +++ b/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi > @@ -0,0 +1 @@ > +../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi > \ No newline at end of file I was under the impression that there was some reason symlinks of this fashion were discouraged, but I don't know the details, and I don't have strong feelings either way. This solves a problem, and we don't seem to have a better solution. So to that end: Acked-by: Mark Rutland Thanks, Mark.