On Mon, Dec 17, 2018 at 11:12:58AM +0100, Lucas Stach wrote:
> Am Freitag, den 14.12.2018, 21:25 -0800 schrieb Andrey Smirnov:
> > > On Fri, Dec 14, 2018 at 12:38 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> > >
> > > [+cc Trent]
> > >
> > > On Thu, Dec 06, 2018 at 12:15:50PM +0000, Lorenzo Pieralisi wrote:
> > > > On Wed, Dec 05, 2018 at 11:35:42PM -0800, Andrey Smirnov wrote:
> > > > > Everyone:
> > > > >
> > > > > This series contains changes I made in order to enable support of PCIE
> > > > > IP block on i.MX8MQ SoCs (full tree can be found at [github-v2]).
> > > > >
> > > > > NOTE: The last patch have a Kconfig symbol depenency on [imx8mq-kconfig].
> > > > >
> > > > > Changes since [v1]:
> > > > >
> > > > > - Driver changed to use single "fsl,controller-id" property to
> > > > > distinguish between two intances of PCIE IP block
> > > > >
> > > > > - All code pertaining to L1SS was dropped to simplify the patch
> > > > >
> > > > > - Documented additions to DT bindings
> > > > >
> > > > > Feedback is welcome!
> > > > >
> > > > > Thanks,
> > > > > Andrey Smirnov
> > > >
> > > > Andrey,
> > > >
> > > > I have applied the patches, ...
> > >
> > > When I merged your pci/dwc branch, I noticed what looks like a merge
> > > conflict between these commits:
> > >
> > > d123765b58ee ("PCI: dwc: Adjust Kconfig to allow IMX6 PCIe host on IMX7")
> > > 1a059d994189 ("PCI: imx: Add support for i.MX8MQ")
> > >
> > > d123765b58ee added SOC_IMX7D:
> > >
> > > - depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
> > > + depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
> > >
> > > and 1a059d994189 added SOC_IMX8MQ but dropped SOC_IMX7D again, which looks
> > > like a mistake:
> > >
> > > - depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
> > > + depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
> > >
> > > So my "next" branch[1] (current head 7053eeb009e0) is:
> > >
> > > config PCI_IMX6
> > > bool "Freescale i.MX6/7 PCIe controller"
> > > depends on SOC_IMX8MQ || SOC_IMX6Q || (ARM && COMPILE_TEST)
> > > depends on PCI_MSI_IRQ_DOMAIN
> > > select PCIE_DW_HOST
> > >
> > > which I think is wrong.
> >
> > Yeah, this is definitely wrong, should be SOC_IMX8MQ || SOC_IMX6Q ||
> > SOC_IMX7D || (ARM && COMPILE_TEST)
>
> arm-soc would like to see the SOC_IMX8MQ option removed, so let's try
> to not add any more things that depend on this. Please use (ARM64 &&
> MACH_MXC) or something to that tune instead.
Patch series dropped from the PCI queue, waiting for the discussion
and related follow-up patches to settle.
Lorenzo
