On Thu, Sep 24, 2020 at 11:57:31AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the pci tree got a conflict in: > > arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi > > between commit: > > f7d48ffcfc6e ("arm64: dts: layerscape: Add label to pcie nodes") > > from the imx-mxs tree and commit: > > c9443b6500ff ("arm64: dts: layerscape: Add PCIe EP node for ls1088a") > > from the pci tree. It should go through imx-mxs -> arm-soc, not pci tree. Shawn > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi > index ff5805206a28,f21dd143ab6d..000000000000 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi > @@@ -517,7 -499,18 +517,18 @@@ > status = "disabled"; > }; > > + pcie-ep@3400000 { > + compatible = "fsl,ls1088a-pcie-ep","fsl,ls-pcie-ep"; > + reg = <0x00 0x03400000 0x0 0x00100000 > + 0x20 0x00000000 0x8 0x00000000>; > + reg-names = "regs", "addr_space"; > + num-ib-windows = <24>; > + num-ob-windows = <128>; > + max-functions = /bits/ 8 <2>; > + status = "disabled"; > + }; > + > - pcie@3500000 { > + pcie2: pcie@3500000 { > compatible = "fsl,ls1088a-pcie"; > reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ > 0x28 0x00000000 0x0 0x00002000>; /* configuration space */ > @@@ -543,7 -536,17 +554,17 @@@ > status = "disabled"; > }; > > + pcie-ep@3500000 { > + compatible = "fsl,ls1088a-pcie-ep","fsl,ls-pcie-ep"; > + reg = <0x00 0x03500000 0x0 0x00100000 > + 0x28 0x00000000 0x8 0x00000000>; > + reg-names = "regs", "addr_space"; > + num-ib-windows = <6>; > + num-ob-windows = <8>; > + status = "disabled"; > + }; > + > - pcie@3600000 { > + pcie3: pcie@3600000 { > compatible = "fsl,ls1088a-pcie"; > reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ > 0x30 0x00000000 0x0 0x00002000>; /* configuration space */