Re: [PATCH 2/2] PCI: imx6: Add code to request/control "pcie_aux" clock for i.MX8MQ

Andrey Smirnov
2019-03-01T01:16:37Z

On Thu, Feb 28, 2019 at 1:24 PM Trent Piepho <tpiepho@impinj.com> wrote:
>
> On Tue, 2019-02-12 at 10:36 +0100, Lucas Stach wrote:
> > Am Montag, den 11.02.2019, 17:51 -0800 schrieb Andrey Smirnov:
> > > PCIe IP block has additional clock, "pcie_aux", that needs to be
> > > controlled by the driver. Add code to support that.
>
> This breaks iMX7d.
>

Ugh, my bad, sorry about that.

> > >
> > > @@ -1049,6 +1059,12 @@ static int imx6_pcie_probe(struct platform_device *pdev)
> > > dev_err(dev, "Failed to get PCIE APPS reset control\n");
> > > return PTR_ERR(imx6_pcie->apps_reset);
> > > }
> > > +
> > > + imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux");
> > > + if (IS_ERR(imx6_pcie->pcie_aux)) {
> > > + dev_err(dev, "pcie_aux clock source missing or invalid\n");
> > > + return PTR_ERR(imx6_pcie->pcie_aux);
> > > + }
> > > break;
> > > default:
> > > break;
>
> One can't see enough context in the patch above, but in linux-next this
> section is under
>
> case IMX7D:
> case IMX8MQ:
>
> It's being applied to imx7d and not just imx8mq and so breaks because
> imx7d dts files don't have this clock. Not sure if this is a bug in
> this commit or some kind of merge/rebase mistake.
>

This is just a regular bug, I spaced out and missed the fact that this
path is shared between the two. I'll submit a patch moving "pci_aux"
clock request into a i.MX8MQ specific patch shortly.

Thanks,
Andrey Smirnov