lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 0/3] PCIE support for i.MX8MQ
    [+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.

    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

    \
     
     \ /
      Last update: 2018-12-14 21:39    [W:3.579 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site