From: Frank Li <Frank.Li@nxp.com>
To: "Minghuan Lian" <minghuan.Lian@nxp.com>,
"Mingkai Hu" <mingkai.hu@nxp.com>, "Roy Zang" <roy.zang@nxp.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
linuxppc-dev@lists.ozlabs.org (open list:PCI DRIVER FOR
FREESCALE LAYERSCAPE),
linux-pci@vger.kernel.org (open list:PCI DRIVER FOR FREESCALE
LAYERSCAPE),
linux-arm-kernel@lists.infradead.org (moderated list:PCI DRIVER
FOR FREESCALE LAYERSCAPE),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/1] PCI: layerscape(ep): Implement common 'dbi' reg-names for dbi_base
Date: Thu, 29 Feb 2024 14:45:58 -0500 [thread overview]
Message-ID: <20240229194559.709182-1-Frank.Li@nxp.com> (raw)
Apply 'dbi' as the primary name for dbi_base register space in line with
Designware common binding. Attempt resource acquisition using 'dbi' first
via platform_get_resource_byname(). If encountering older device tree
files, gracefully fallback to 'regs', issuing a warning message.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/pci/controller/dwc/pci-layerscape-ep.c | 7 ++++++-
drivers/pci/controller/dwc/pci-layerscape.c | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
index 1f6ee1460ec2a..92d4750611d07 100644
--- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
+++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
@@ -259,7 +259,12 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
pcie->pci = pci;
pcie->ls_epc = ls_epc;
- dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
+ dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
+ if (!dbi_base) {
+ dev_warn(dev, "Please update your dtb, reg-names 'regs' should be 'dbi'");
+ dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
+ }
+
pci->dbi_base = devm_pci_remap_cfg_resource(dev, dbi_base);
if (IS_ERR(pci->dbi_base))
return PTR_ERR(pci->dbi_base);
diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
index ee6f525681337..1985086f6a1f3 100644
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -345,7 +345,12 @@ static int ls_pcie_probe(struct platform_device *pdev)
pcie->pci = pci;
pci->pp.ops = pcie->drvdata->ops;
- dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
+ dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
+ if (!dbi_base) {
+ dev_err(dev, "Please update your dtb, reg-names 'regs' should be 'dbi'");
+ dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
+ }
+
pci->dbi_base = devm_pci_remap_cfg_resource(dev, dbi_base);
if (IS_ERR(pci->dbi_base))
return PTR_ERR(pci->dbi_base);
--
2.34.1
reply other threads:[~2024-02-29 19:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240229194559.709182-1-Frank.Li@nxp.com \
--to=frank.li@nxp.com \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lpieralisi@kernel.org \
--cc=minghuan.Lian@nxp.com \
--cc=mingkai.hu@nxp.com \
--cc=robh@kernel.org \
--cc=roy.zang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®