diff mbox series

[v4,13/14] PCI: imx6: Add i.MX8MM PCIe EP support

Message ID 1664269036-16142-14-git-send-email-hongxing.zhu@nxp.com (mailing list archive)
State Superseded
Delegated to: Lorenzo Pieralisi
Headers show
Series Add i.MX PCIe EP mode support | expand

Commit Message

Richard Zhu Sept. 27, 2022, 8:57 a.m. UTC
Add i.MX8MM PCIe EP support.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Info Skymem Sept. 27, 2022, 9:55 a.m. UTC | #1
Hi,
thank you for your information.

On our website you can find email addresses of companies and people.
https://www.skymem.info

In short, it’s like Google for emails.

Best regards,
Robert,
Skymem team


On Tue, Sep 27, 2022 at 11:54 AM Info Skymem <info@skymem.com> wrote:
>
> Hi,
> thank you for your information.
>
> On our website you can find email addresses of companies and people.
> https://www.skymem.info
>
> In short, it’s like Google for emails.
>
> Best regards,
> Robert,
> Skymem team
>
> On Tue, Sep 27, 2022 at 11:31 AM Richard Zhu <hongxing.zhu@nxp.com> wrote:
>>
>> Add i.MX8MM PCIe EP support.
>>
>> Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
>> ---
>>  drivers/pci/controller/dwc/pci-imx6.c | 17 +++++++++++++++++
>>  1 file changed, 17 insertions(+)
>>
>> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
>> index 777ad946ec7f..907a36e18842 100644
>> --- a/drivers/pci/controller/dwc/pci-imx6.c
>> +++ b/drivers/pci/controller/dwc/pci-imx6.c
>> @@ -53,6 +53,7 @@ enum imx6_pcie_variants {
>>         IMX8MM,
>>         IMX8MP,
>>         IMX8MQ_EP,
>> +       IMX8MM_EP,
>>  };
>>
>>  #define IMX6_PCIE_FLAG_IMX6_PHY                        BIT(0)
>> @@ -156,6 +157,7 @@ static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
>>         WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ &&
>>                 imx6_pcie->drvdata->variant != IMX8MQ_EP &&
>>                 imx6_pcie->drvdata->variant != IMX8MM &&
>> +               imx6_pcie->drvdata->variant != IMX8MM_EP &&
>>                 imx6_pcie->drvdata->variant != IMX8MP);
>>         return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14;
>>  }
>> @@ -319,6 +321,7 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
>>  {
>>         switch (imx6_pcie->drvdata->variant) {
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 /*
>>                  * The PHY initialization had been done in the PHY
>> @@ -577,6 +580,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
>>         case IMX7D:
>>                 break;
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MQ:
>>         case IMX8MQ_EP:
>>         case IMX8MP:
>> @@ -623,6 +627,7 @@ static void imx6_pcie_disable_ref_clk(struct imx6_pcie *imx6_pcie)
>>                                    IMX7D_GPR12_PCIE_PHY_REFCLK_SEL);
>>                 break;
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MQ:
>>         case IMX8MQ_EP:
>>         case IMX8MP:
>> @@ -694,6 +699,7 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
>>                 reset_control_assert(imx6_pcie->pciephy_reset);
>>                 fallthrough;
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 reset_control_assert(imx6_pcie->apps_reset);
>>                 break;
>> @@ -771,6 +777,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
>>                 break;
>>         case IMX6Q:             /* Nothing to do */
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 break;
>>         }
>> @@ -822,6 +829,7 @@ static void imx6_pcie_ltssm_enable(struct device *dev)
>>         case IMX8MQ:
>>         case IMX8MQ_EP:
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 reset_control_deassert(imx6_pcie->apps_reset);
>>                 break;
>> @@ -843,6 +851,7 @@ static void imx6_pcie_ltssm_disable(struct device *dev)
>>         case IMX8MQ:
>>         case IMX8MQ_EP:
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 reset_control_assert(imx6_pcie->apps_reset);
>>                 break;
>> @@ -1094,6 +1103,7 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie,
>>
>>         switch (imx6_pcie->drvdata->variant) {
>>         case IMX8MQ_EP:
>> +       case IMX8MM_EP:
>>                 pcie_dbi2_offset = SZ_1M;
>>                 break;
>>         default:
>> @@ -1306,6 +1316,7 @@ static int imx6_pcie_probe(struct platform_device *pdev)
>>                 }
>>                 break;
>>         case IMX8MM:
>> +       case IMX8MM_EP:
>>         case IMX8MP:
>>                 imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux");
>>                 if (IS_ERR(imx6_pcie->pcie_aux))
>> @@ -1471,6 +1482,11 @@ static const struct imx6_pcie_drvdata drvdata[] = {
>>                 .mode = DW_PCIE_EP_TYPE,
>>                 .gpr = "fsl,imx8mq-iomuxc-gpr",
>>         },
>> +       [IMX8MM_EP] = {
>> +               .variant = IMX8MM_EP,
>> +               .mode = DW_PCIE_EP_TYPE,
>> +               .gpr = "fsl,imx8mm-iomuxc-gpr",
>> +       },
>>  };
>>
>>  static const struct of_device_id imx6_pcie_of_match[] = {
>> @@ -1482,6 +1498,7 @@ static const struct of_device_id imx6_pcie_of_match[] = {
>>         { .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], },
>>         { .compatible = "fsl,imx8mp-pcie", .data = &drvdata[IMX8MP], },
>>         { .compatible = "fsl,imx8mq-pcie-ep", .data = &drvdata[IMX8MQ_EP], },
>> +       { .compatible = "fsl,imx8mm-pcie-ep", .data = &drvdata[IMX8MM_EP], },
>>         {},
>>  };
>>
>> --
>> 2.25.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff mbox series

Patch

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 777ad946ec7f..907a36e18842 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -53,6 +53,7 @@  enum imx6_pcie_variants {
 	IMX8MM,
 	IMX8MP,
 	IMX8MQ_EP,
+	IMX8MM_EP,
 };
 
 #define IMX6_PCIE_FLAG_IMX6_PHY			BIT(0)
@@ -156,6 +157,7 @@  static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
 	WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ &&
 		imx6_pcie->drvdata->variant != IMX8MQ_EP &&
 		imx6_pcie->drvdata->variant != IMX8MM &&
+		imx6_pcie->drvdata->variant != IMX8MM_EP &&
 		imx6_pcie->drvdata->variant != IMX8MP);
 	return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14;
 }
@@ -319,6 +321,7 @@  static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
 {
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		/*
 		 * The PHY initialization had been done in the PHY
@@ -577,6 +580,7 @@  static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
 	case IMX7D:
 		break;
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MQ:
 	case IMX8MQ_EP:
 	case IMX8MP:
@@ -623,6 +627,7 @@  static void imx6_pcie_disable_ref_clk(struct imx6_pcie *imx6_pcie)
 				   IMX7D_GPR12_PCIE_PHY_REFCLK_SEL);
 		break;
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MQ:
 	case IMX8MQ_EP:
 	case IMX8MP:
@@ -694,6 +699,7 @@  static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 		reset_control_assert(imx6_pcie->pciephy_reset);
 		fallthrough;
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		reset_control_assert(imx6_pcie->apps_reset);
 		break;
@@ -771,6 +777,7 @@  static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 		break;
 	case IMX6Q:		/* Nothing to do */
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		break;
 	}
@@ -822,6 +829,7 @@  static void imx6_pcie_ltssm_enable(struct device *dev)
 	case IMX8MQ:
 	case IMX8MQ_EP:
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		reset_control_deassert(imx6_pcie->apps_reset);
 		break;
@@ -843,6 +851,7 @@  static void imx6_pcie_ltssm_disable(struct device *dev)
 	case IMX8MQ:
 	case IMX8MQ_EP:
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		reset_control_assert(imx6_pcie->apps_reset);
 		break;
@@ -1094,6 +1103,7 @@  static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie,
 
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX8MQ_EP:
+	case IMX8MM_EP:
 		pcie_dbi2_offset = SZ_1M;
 		break;
 	default:
@@ -1306,6 +1316,7 @@  static int imx6_pcie_probe(struct platform_device *pdev)
 		}
 		break;
 	case IMX8MM:
+	case IMX8MM_EP:
 	case IMX8MP:
 		imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux");
 		if (IS_ERR(imx6_pcie->pcie_aux))
@@ -1471,6 +1482,11 @@  static const struct imx6_pcie_drvdata drvdata[] = {
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mq-iomuxc-gpr",
 	},
+	[IMX8MM_EP] = {
+		.variant = IMX8MM_EP,
+		.mode = DW_PCIE_EP_TYPE,
+		.gpr = "fsl,imx8mm-iomuxc-gpr",
+	},
 };
 
 static const struct of_device_id imx6_pcie_of_match[] = {
@@ -1482,6 +1498,7 @@  static const struct of_device_id imx6_pcie_of_match[] = {
 	{ .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], },
 	{ .compatible = "fsl,imx8mp-pcie", .data = &drvdata[IMX8MP], },
 	{ .compatible = "fsl,imx8mq-pcie-ep", .data = &drvdata[IMX8MQ_EP], },
+	{ .compatible = "fsl,imx8mm-pcie-ep", .data = &drvdata[IMX8MM_EP], },
 	{},
 };