On Thu, Jan 24, 2019 at 12:15:20PM -0800, Andrey Smirnov wrote:
> PCIE PHY IP block on i.MX7D differs from the one used on i.MX6 family,
> so none of the code in current implementation of imx6_setup_phy_mpll()
> is applicable.
So :) ? Add a conclusive statement to the commit log.
Lorenzo
> Tested-by: Trent Piepho <tpiepho@xxxxxxxxxx>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> Reviewed-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Fabio Estevam <fabio.estevam@xxxxxxx>
> Cc: Chris Healy <cphealy@xxxxxxxxx>
> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Cc: Leonard Crestez <leonard.crestez@xxxxxxx>
> Cc: "A.s. Dong" <aisheng.dong@xxxxxxx>
> Cc: Richard Zhu <hongxing.zhu@xxxxxxx>
> Cc: linux-imx@xxxxxxx
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx
> ---
> drivers/pci/controller/dwc/pci-imx6.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index efff3d5e9162..c55d93c1187d 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -41,8 +41,11 @@ enum imx6_pcie_variants {
> IMX7D,
> };
>
> +#define IMX6_PCIE_FLAG_IMX6_PHY BIT(0)
> +
> struct imx6_pcie_drvdata {
> enum imx6_pcie_variants variant;
> + u32 flags;
> };
>
> struct imx6_pcie {
> @@ -256,6 +259,9 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie)
> {
> u32 tmp;
>
> + if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))
> + return;
> +
> pcie_phy_read(imx6_pcie, PHY_RX_OVRD_IN_LO, &tmp);
> tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
> PHY_RX_OVRD_IN_LO_RX_PLL_EN);
> @@ -573,6 +579,9 @@ static int imx6_setup_phy_mpll(struct imx6_pcie *imx6_pcie)
> int mult, div;
> u32 val;
>
> + if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))
> + return 0;
> +
> switch (phy_rate) {
> case 125000000:
> /*
> @@ -1088,12 +1097,15 @@ static void imx6_pcie_shutdown(struct platform_device *pdev)
> static const struct imx6_pcie_drvdata drvdata[] = {
> [IMX6Q] = {
> .variant = IMX6Q,
> + .flags = IMX6_PCIE_FLAG_IMX6_PHY,
> },
> [IMX6SX] = {
> .variant = IMX6SX,
> + .flags = IMX6_PCIE_FLAG_IMX6_PHY,
> },
> [IMX6QP] = {
> .variant = IMX6QP,
> + .flags = IMX6_PCIE_FLAG_IMX6_PHY,
> },
> [IMX7D] = {
> .variant = IMX7D,
> --
> 2.20.1
>
