| Message ID | 20230712103916.1631-3-wsa+renesas@sang-engineering.com |
|---|---|
| State | New |
| Headers | show |
| Series | KingFisher: support regulators for PCIe | expand |
On Wed, Jul 12, 2023 at 12:39:16PM +0200, Wolfram Sang wrote: > The KingFisher board has regulators. They just need to be en-/disabled, > so we can leave the handling to devm. Order variables in reverse-xmas > while we are here. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Krzysztof or Lorenzo may fix this up for you, but: s/add support/Add support/ in subject to match history and recast commit log to say what the patch *does* ("enable optional regulators using devm, so devm will automatically disable them when the driver releases the device"), not *what needs to be done*. > --- > drivers/pci/controller/pcie-rcar-host.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c > index 88975e40ee2f..7aecc114af4f 100644 > --- a/drivers/pci/controller/pcie-rcar-host.c > +++ b/drivers/pci/controller/pcie-rcar-host.c > @@ -29,6 +29,7 @@ > #include <linux/phy/phy.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > +#include <linux/regulator/consumer.h> > > #include "pcie-rcar.h" > > @@ -953,14 +954,20 @@ static const struct of_device_id rcar_pcie_of_match[] = { > {}, > }; > > +/* Design note 346 from Linear Technology says order is not important */ > +static const char * const rcar_pcie_supplies[] = { > + "vpcie12v", "vpcie3v3", "vpcie1v5" > +}; > + > static int rcar_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > + struct pci_host_bridge *bridge; > struct rcar_pcie_host *host; > struct rcar_pcie *pcie; > + unsigned int i; > u32 data; > int err; > - struct pci_host_bridge *bridge; > > bridge = devm_pci_alloc_host_bridge(dev, sizeof(*host)); > if (!bridge) > @@ -971,6 +978,13 @@ static int rcar_pcie_probe(struct platform_device *pdev) > pcie->dev = dev; > platform_set_drvdata(pdev, host); > > + for (i = 0; i < ARRAY_SIZE(rcar_pcie_supplies); i++) { > + err = devm_regulator_get_enable_optional(dev, rcar_pcie_supplies[i]); > + if (err < 0 && err != -ENODEV) > + return dev_err_probe(dev, err, "can't enable regulator %s\n", > + rcar_pcie_supplies[i]); > + } > + > pm_runtime_enable(pcie->dev); > err = pm_runtime_get_sync(pcie->dev); > if (err < 0) { > -- > 2.30.2 >
On Thu, Jul 13, 2023 at 10:34:01AM -0500, Bjorn Helgaas wrote: > On Wed, Jul 12, 2023 at 12:39:16PM +0200, Wolfram Sang wrote: > > The KingFisher board has regulators. They just need to be en-/disabled, > > so we can leave the handling to devm. Order variables in reverse-xmas > > while we are here. > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Krzysztof or Lorenzo may fix this up for you, but: > s/add support/Add support/ in subject to match history > and recast commit log to say what the patch *does* ("enable optional > regulators using devm, so devm will automatically disable them when > the driver releases the device"), not *what needs to be done*. I will fix the commit messages and resend. But frankly, except the latter is a tad more explicit, they both qualify for "what needs to be done" for me *shrug* Still, thanks for the review, I appreciate it!
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index 88975e40ee2f..7aecc114af4f 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -29,6 +29,7 @@ #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/regulator/consumer.h> #include "pcie-rcar.h" @@ -953,14 +954,20 @@ static const struct of_device_id rcar_pcie_of_match[] = { {}, }; +/* Design note 346 from Linear Technology says order is not important */ +static const char * const rcar_pcie_supplies[] = { + "vpcie12v", "vpcie3v3", "vpcie1v5" +}; + static int rcar_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct pci_host_bridge *bridge; struct rcar_pcie_host *host; struct rcar_pcie *pcie; + unsigned int i; u32 data; int err; - struct pci_host_bridge *bridge; bridge = devm_pci_alloc_host_bridge(dev, sizeof(*host)); if (!bridge) @@ -971,6 +978,13 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie->dev = dev; platform_set_drvdata(pdev, host); + for (i = 0; i < ARRAY_SIZE(rcar_pcie_supplies); i++) { + err = devm_regulator_get_enable_optional(dev, rcar_pcie_supplies[i]); + if (err < 0 && err != -ENODEV) + return dev_err_probe(dev, err, "can't enable regulator %s\n", + rcar_pcie_supplies[i]); + } + pm_runtime_enable(pcie->dev); err = pm_runtime_get_sync(pcie->dev); if (err < 0) {