From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932919AbbJNP5T (ORCPT ); Wed, 14 Oct 2015 11:57:19 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:62672 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964785AbbJNP5L (ORCPT ); Wed, 14 Oct 2015 11:57:11 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Mark Rutland , Ian Campbell , devicetree@vger.kernel.org, Lorenzo Pieralisi , Russell King , arm@kernel.org, Pawel Moll , linux-kbuild@vger.kernel.org, Catalin Marinas , Kumar Gala , Liviu Dudau , linux-kernel@vger.kernel.org, Will Deacon , Rob Herring , Kristina Martsenko , Frank Rowand , Sudeep Holla , Olof Johansson , Kevin Hilman Subject: Re: [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm Date: Wed, 14 Oct 2015 17:56:27 +0200 Message-ID: <19050561.IRVkypnnKH@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151012153750.GE7452@leverpostej> References: <1444046032-31310-1-git-send-email-ian.campbell@citrix.com> <20151012153750.GE7452@leverpostej> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:iHNZI66UtpTja/BnUcZsx9BW5syREnpaEOeGQ6Du1EYfTwNJq2y egL46FfHbJgzUHWwvi3IiVv75YENi0OYKqNkQYvzHtWIK7icF/VWL2Oe4f1z0jd/YXM0nmU K/fTN6NYKui0aZM/TX0rQ2I/wgUy7Zh0xzObTmrRhc3CWIfkxz3ErW+Whmqb1OvJo9m/SWd oKoiXcP1+7IJiCWCQorsQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:NI7nrewH858=:myaopvuuMXrzFjfLJMtj9L JyL6gQiGKNJ8mc+JiuAqwEGf9PKWKBpqoj2pj8c3MhdCwCb9SfG9wjfU0MrIv0ltczrEhZERb JMAoVTW+CQ5IKPleV8zroDr/171OXKAX0VjNrW7LYR8Z67TDic9XHvlrv7/bVlCHHm2aTpFnb 6Mw8bEs/CSHt39SIBJm22z65S3srBA1zbH29vj/ks8wIBYk9+VwGdsxp9/72mmZAfEfAo/n7r iX+Zcvtwhw7WKSisVJ1Q2kE8Mx8D9pOqr2cbfaMLojnup7VP1CjvRm9nSvuR9SqkTw3PIFhal bT6qOlH3t+4TATsB3D/sBqoa7eNuq/RNYhW9Zi2baPEh7H8ibV7F5Dzt7/9pMPcAst1LlsNNW 3PNOWnygRCJfPIg/S0aWT3RSWCuoeOjY7EuxRA/PnJNboxUXH5KugPmGdZgO3nEwtnEH/Mjf4 nFgsmlU9oed21jd3H4dbqN1Fqa5P+IondKqJn+FL5BGZtZrBRkj37w0nsdQTTD7upn3Lcsxcp ExVntviqP/zUS4QeBwauXS1dj3jP0uB3NtV2LyCCU6NHtn/wbcge5OP9k3CLGU0PcH8BJEVYd WFaaKenFcpbDuzltVKLsvWMGJekJcmXksT7T+cU/gIL2RfoSnTyHn12RPhABQ0UuqMWT2nI/N QJayMfwR6fW0JJC6mLLMtts5N7yLK0mjoPqvSyw4DXKmVcJVtzHgaM4PA4F3yWbaXXUXNCp/q cH7PDXjO9Dohh94Z Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 12 October 2015 16:37:50 Mark Rutland wrote: > 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 > Acked-by: Mark Rutland > Applied to next/dt, thanks! Arnd