From: Ryder Lee <ryder.lee@mediatek.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>
Subject: [PATCH 3/3] PCI: mediatek: make some properties optioanl
Date: Mon, 19 Jun 2017 18:00:00 +0800 [thread overview]
Message-ID: <1497866400-41844-4-git-send-email-ryder.lee@mediatek.com> (raw)
In-Reply-To: <1497866400-41844-1-git-send-email-ryder.lee@mediatek.com>
Some properties for PCIe controller are optional and therefore change
to use *optional* function.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
drivers/pci/host/pcie-mediatek.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index d256263..91a6328 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -306,18 +306,15 @@ static int mtk_pcie_parse_ports(struct mtk_pcie *pcie,
}
snprintf(name, sizeof(name), "pcie-rst%d", index);
- port->reset = devm_reset_control_get(dev, name);
- if (IS_ERR(port->reset)) {
- dev_err(dev, "failed to get port%d reset\n", index);
+ port->reset = devm_reset_control_get_optional(dev, name);
+ if (PTR_ERR(port->reset) == -EPROBE_DEFER)
return PTR_ERR(port->reset);
- }
+ /* some platforms may use default PHY setting */
snprintf(name, sizeof(name), "pcie-phy%d", index);
- port->phy = devm_phy_get(dev, name);
- if (IS_ERR(port->phy)) {
- dev_err(dev, "failed to get port%d phy\n", index);
+ port->phy = devm_phy_optional_get(dev, name);
+ if (IS_ERR(port->phy))
return PTR_ERR(port->phy);
- }
port->index = index;
port->pcie = pcie;
@@ -345,8 +342,10 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
pcie->free_ck = devm_clk_get(dev, "free_ck");
if (IS_ERR(pcie->free_ck)) {
- dev_err(dev, "failed to get free_ck\n");
- return PTR_ERR(pcie->free_ck);
+ if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ pcie->free_ck = NULL;
}
if (dev->pm_domain) {
--
1.9.1
next prev parent reply other threads:[~2017-06-19 10:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 9:59 [PATCH 0/3] change powerup logic for MediaTek PCIe controller Ryder Lee
2017-06-19 9:59 ` [PATCH 1/3] PCI: mediatek: modify controller powerup logic Ryder Lee
2017-06-19 9:59 ` [PATCH 2/3] PCI: mediatek: turn off subsys power if no link up detected Ryder Lee
2017-06-19 10:00 ` Ryder Lee [this message]
2017-06-28 19:50 ` [PATCH 0/3] change powerup logic for MediaTek PCIe controller Bjorn Helgaas
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=1497866400-41844-4-git-send-email-ryder.lee@mediatek.com \
--to=ryder.lee@mediatek.com \
--cc=bhelgaas@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
/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
Powered by JetHome