Re: [PATCH v5] dtb: Create a common home for cross-architecture dtsi files.

Ian Campbell
2015-08-16T09:01:24Z

On Fri, 2015-08-14 at 16:21 -0500, Rob Herring wrote:
> +arm-soc

I could've sworn I did the same at one point. Obviously not.

>
> On Tue, Aug 11, 2015 at 5:07 AM, Ian Campbell <
> ian.campbell@citrix.com> wrote:
> > On Mon, 2015-08-03 at 17:06 +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.
> >
> > Hi Grant,
> >
> > Do you think there is any chance of getting this into 4.2-rc$NEXT
> > or shall
> > we wait until 4.3? I'm assuming this should go via the DT tree, but
> > maybe
> > it should go via an ARM tree?
>
> I was assuming this would go thru the arm-soc tree which is why I
> acked it. It is getting a bit late for 4.2 at this point, but I guess
> the standalone tree remains broken for these platforms until this is
> done.

Correct.

> Probably not such a big deal in grand scheme of things.

I guess not. FWIW I've not pushed since the breakage started happening,
so the split tree isn't broken, but it's also now however many weeks
behind. Once 4.3-rc1 arrives with this fixed I'll push all the 4.2-rcN
and 4.2 as well.

Ian.