From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: Robin Murphy <robin.murphy@arm.com>
Cc: shawn.lin@rock-chips.com, andrew.murray@arm.com,
bhelgaas@google.com, heiko@sntech.de, lgirdwood@gmail.com,
broonie@kernel.org, linux-pci@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/2] PCI: rockchip: Make some regulators non-optional
Date: Wed, 20 Nov 2019 17:05:32 +0000 [thread overview]
Message-ID: <20191120170532.GC3279@e121166-lin.cambridge.arm.com> (raw)
In-Reply-To: <1eebc002101931012d337cda23d18f85b0326361.1573908530.git.robin.murphy@arm.com>
On Sat, Nov 16, 2019 at 12:54:19PM +0000, Robin Murphy wrote:
> The 0V9 and 1V8 supplies power the PCIe block in the SoC itself, and
> are thus fundamental to PCIe being usable at all. As such, it makes
> sense to treat them as non-optional and rely on dummy regulators if
> not explicitly described.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> ---
> drivers/pci/controller/pcie-rockchip-host.c | 69 ++++++++-------------
> 1 file changed, 25 insertions(+), 44 deletions(-)
Applied to pci/rockchip, thanks.
Lorenzo
> diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
> index ef8e677ce9d1..68525f8ac4d9 100644
> --- a/drivers/pci/controller/pcie-rockchip-host.c
> +++ b/drivers/pci/controller/pcie-rockchip-host.c
> @@ -620,19 +620,13 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
> dev_info(dev, "no vpcie3v3 regulator found\n");
> }
>
> - rockchip->vpcie1v8 = devm_regulator_get_optional(dev, "vpcie1v8");
> - if (IS_ERR(rockchip->vpcie1v8)) {
> - if (PTR_ERR(rockchip->vpcie1v8) != -ENODEV)
> - return PTR_ERR(rockchip->vpcie1v8);
> - dev_info(dev, "no vpcie1v8 regulator found\n");
> - }
> + rockchip->vpcie1v8 = devm_regulator_get(dev, "vpcie1v8");
> + if (IS_ERR(rockchip->vpcie1v8))
> + return PTR_ERR(rockchip->vpcie1v8);
>
> - rockchip->vpcie0v9 = devm_regulator_get_optional(dev, "vpcie0v9");
> - if (IS_ERR(rockchip->vpcie0v9)) {
> - if (PTR_ERR(rockchip->vpcie0v9) != -ENODEV)
> - return PTR_ERR(rockchip->vpcie0v9);
> - dev_info(dev, "no vpcie0v9 regulator found\n");
> - }
> + rockchip->vpcie0v9 = devm_regulator_get(dev, "vpcie0v9");
> + if (IS_ERR(rockchip->vpcie0v9))
> + return PTR_ERR(rockchip->vpcie0v9);
>
> return 0;
> }
> @@ -658,27 +652,22 @@ static int rockchip_pcie_set_vpcie(struct rockchip_pcie *rockchip)
> }
> }
>
> - if (!IS_ERR(rockchip->vpcie1v8)) {
> - err = regulator_enable(rockchip->vpcie1v8);
> - if (err) {
> - dev_err(dev, "fail to enable vpcie1v8 regulator\n");
> - goto err_disable_3v3;
> - }
> + err = regulator_enable(rockchip->vpcie1v8);
> + if (err) {
> + dev_err(dev, "fail to enable vpcie1v8 regulator\n");
> + goto err_disable_3v3;
> }
>
> - if (!IS_ERR(rockchip->vpcie0v9)) {
> - err = regulator_enable(rockchip->vpcie0v9);
> - if (err) {
> - dev_err(dev, "fail to enable vpcie0v9 regulator\n");
> - goto err_disable_1v8;
> - }
> + err = regulator_enable(rockchip->vpcie0v9);
> + if (err) {
> + dev_err(dev, "fail to enable vpcie0v9 regulator\n");
> + goto err_disable_1v8;
> }
>
> return 0;
>
> err_disable_1v8:
> - if (!IS_ERR(rockchip->vpcie1v8))
> - regulator_disable(rockchip->vpcie1v8);
> + regulator_disable(rockchip->vpcie1v8);
> err_disable_3v3:
> if (!IS_ERR(rockchip->vpcie3v3))
> regulator_disable(rockchip->vpcie3v3);
> @@ -897,8 +886,7 @@ static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)
>
> rockchip_pcie_disable_clocks(rockchip);
>
> - if (!IS_ERR(rockchip->vpcie0v9))
> - regulator_disable(rockchip->vpcie0v9);
> + regulator_disable(rockchip->vpcie0v9);
>
> return ret;
> }
> @@ -908,12 +896,10 @@ static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev)
> struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
> int err;
>
> - if (!IS_ERR(rockchip->vpcie0v9)) {
> - err = regulator_enable(rockchip->vpcie0v9);
> - if (err) {
> - dev_err(dev, "fail to enable vpcie0v9 regulator\n");
> - return err;
> - }
> + err = regulator_enable(rockchip->vpcie0v9);
> + if (err) {
> + dev_err(dev, "fail to enable vpcie0v9 regulator\n");
> + return err;
> }
>
> err = rockchip_pcie_enable_clocks(rockchip);
> @@ -939,8 +925,7 @@ static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev)
> err_pcie_resume:
> rockchip_pcie_disable_clocks(rockchip);
> err_disable_0v9:
> - if (!IS_ERR(rockchip->vpcie0v9))
> - regulator_disable(rockchip->vpcie0v9);
> + regulator_disable(rockchip->vpcie0v9);
> return err;
> }
>
> @@ -1081,10 +1066,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> regulator_disable(rockchip->vpcie12v);
> if (!IS_ERR(rockchip->vpcie3v3))
> regulator_disable(rockchip->vpcie3v3);
> - if (!IS_ERR(rockchip->vpcie1v8))
> - regulator_disable(rockchip->vpcie1v8);
> - if (!IS_ERR(rockchip->vpcie0v9))
> - regulator_disable(rockchip->vpcie0v9);
> + regulator_disable(rockchip->vpcie1v8);
> + regulator_disable(rockchip->vpcie0v9);
> err_set_vpcie:
> rockchip_pcie_disable_clocks(rockchip);
> return err;
> @@ -1108,10 +1091,8 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
> regulator_disable(rockchip->vpcie12v);
> if (!IS_ERR(rockchip->vpcie3v3))
> regulator_disable(rockchip->vpcie3v3);
> - if (!IS_ERR(rockchip->vpcie1v8))
> - regulator_disable(rockchip->vpcie1v8);
> - if (!IS_ERR(rockchip->vpcie0v9))
> - regulator_disable(rockchip->vpcie0v9);
> + regulator_disable(rockchip->vpcie1v8);
> + regulator_disable(rockchip->vpcie0v9);
>
> return 0;
> }
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-11-20 17:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-16 12:54 [PATCH 1/2] PCI: rockchip: Make some regulators non-optional Robin Murphy
2019-11-16 12:54 ` [PATCH 2/2] PCI: rockchip: Simplify optional regulator handling Robin Murphy
2019-11-18 11:59 ` Mark Brown
2019-11-18 12:20 ` Robin Murphy
2019-11-18 12:39 ` Andrew Murray
2019-11-18 13:10 ` Robin Murphy
2019-11-18 13:17 ` Andrew Murray
2019-11-18 14:24 ` Bjorn Helgaas
2019-11-18 18:15 ` Lorenzo Pieralisi
2019-11-18 18:38 ` Mark Brown
2019-11-18 11:57 ` [PATCH 1/2] PCI: rockchip: Make some regulators non-optional Mark Brown
2019-11-18 12:28 ` Andrew Murray
2019-11-20 17:05 ` Lorenzo Pieralisi [this message]
2020-11-07 11:36 ` Qu Wenruo
2020-11-07 11:57 ` Qu Wenruo
2020-11-07 12:47 ` Robin Murphy
2020-11-07 12:54 ` Qu Wenruo
2020-11-07 13:30 ` Qu Wenruo
2020-11-09 12:00 ` Robin Murphy
2020-11-09 12:38 ` Qu Wenruo
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=20191120170532.GC3279@e121166-lin.cambridge.arm.com \
--to=lorenzo.pieralisi@arm.com \
--cc=andrew.murray@arm.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robin.murphy@arm.com \
--cc=shawn.lin@rock-chips.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;
as well as URLs for NNTP newsgroup(s).