Message ID | 20241031080655.3879139-4-hongxing.zhu@nxp.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | A bunch of changes to refine i.MX PCIe driver | expand |
On Thu, Oct 31, 2024 at 04:06:48PM +0800, Richard Zhu wrote: > Since dbi2 and atu regs are added for i.MX8M PCIes. Fetch the dbi2 and iATU > base addresses from DT directly, and remove the useless codes. > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > --- Need declear not compatible broken for upstreams' dts because not dts enable EP function in upstream tree. > drivers/pci/controller/dwc/pci-imx6.c | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 73cb69ba8933..d21f7d2e79dc 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1114,7 +1114,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > struct platform_device *pdev) > { > int ret; > - unsigned int pcie_dbi2_offset; > struct dw_pcie_ep *ep; > struct dw_pcie *pci = imx_pcie->pci; > struct dw_pcie_rp *pp = &pci->pp; > @@ -1124,25 +1123,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > ep = &pci->ep; > ep->ops = &pcie_ep_ops; > > - switch (imx_pcie->drvdata->variant) { > - case IMX8MQ_EP: > - case IMX8MM_EP: > - case IMX8MP_EP: > - pcie_dbi2_offset = SZ_1M; > - break; > - default: > - pcie_dbi2_offset = SZ_4K; > - break; > - } > - > - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; > - > - /* > - * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining > - * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC > - * core code can fetch that from DT. But once all platform DTs were fixed, this and the > - * above "dbi_base2" setting should be removed. > - */ > if (device_property_match_string(dev, "reg-names", "dbi2") >= 0) > pci->dbi_base2 = NULL; > > -- > 2.37.1 >
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 73cb69ba8933..d21f7d2e79dc 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1114,7 +1114,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, struct platform_device *pdev) { int ret; - unsigned int pcie_dbi2_offset; struct dw_pcie_ep *ep; struct dw_pcie *pci = imx_pcie->pci; struct dw_pcie_rp *pp = &pci->pp; @@ -1124,25 +1123,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, ep = &pci->ep; ep->ops = &pcie_ep_ops; - switch (imx_pcie->drvdata->variant) { - case IMX8MQ_EP: - case IMX8MM_EP: - case IMX8MP_EP: - pcie_dbi2_offset = SZ_1M; - break; - default: - pcie_dbi2_offset = SZ_4K; - break; - } - - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; - - /* - * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining - * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC - * core code can fetch that from DT. But once all platform DTs were fixed, this and the - * above "dbi_base2" setting should be removed. - */ if (device_property_match_string(dev, "reg-names", "dbi2") >= 0) pci->dbi_base2 = NULL;
Since dbi2 and atu regs are added for i.MX8M PCIes. Fetch the dbi2 and iATU base addresses from DT directly, and remove the useless codes. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 20 -------------------- 1 file changed, 20 deletions(-)