[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20181217111133.GB14261@e107981-ln.cambridge.arm.com>
Date: Mon, 17 Dec 2018 11:11:33 +0000
From: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
To: Bjorn Helgaas <helgaas@...nel.org>
Cc: Andrey Smirnov <andrew.smirnov@...il.com>,
"A.s. Dong" <aisheng.dong@....com>,
Mark Rutland <mark.rutland@....com>,
Richard Zhu <hongxing.zhu@....com>,
linux-arm-kernel@...ts.infradead.org,
Rob Herring <robh@...nel.org>, linux-pci@...r.kernel.org,
linux-kernel@...r.kernel.org,
Fabio Estevam <fabio.estevam@....com>,
devicetree@...r.kernel.org, linux-imx@....com,
Leonard Crestez <leonard.crestez@....com>, cphealy@...il.com,
l.stach@...gutronix.de, Trent Piepho <tpiepho@...inj.com>
Subject: Re: [PATCH v2 0/3] PCIE support for i.MX8MQ
On Fri, Dec 14, 2018 at 02:38:29PM -0600, Bjorn Helgaas 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. Lorenzo, if you update your pci/dwc branch,
> I'll rebuild my "next" branch.
Sorry about that, I missed it.
I dropped Andrey's patches from pci/dwc waiting for him/Lucas to agree
on a way forward.
Thanks,
Lorenzo
> If you want to tweak the switch statements and/or IMX8 checks, you
> could do that at the same time.
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/?h=next
Powered by blists - more mailing lists