[v2,2/2] PCI: rcar-host: add support for optional regulators
Commit Message
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>
---
Changes since v1:
* use unsigned int for i
* use reverse-xmas for variable declaration
* really bail out now on error
Thank you, Geert, for the review!
drivers/pci/controller/pcie-rcar-host.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
Comments
Hi Wolfram,
On Wed, May 10, 2023 at 9:06 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> 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>
> ---
> Changes since v1:
>
> * use unsigned int for i
> * use reverse-xmas for variable declaration
> * really bail out now on error
Thanks for the update!
> --- a/drivers/pci/controller/pcie-rcar-host.c
> +++ b/drivers/pci/controller/pcie-rcar-host.c
> @@ -992,6 +999,15 @@ 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) {
> + dev_err_probe(dev, err, "error enabling regulator %s\n",
> + rcar_pcie_supplies[i]);
> + return err;
dev_err_probe() was designed for daisy-chaining, so please use
return dev_err_probe(...);
instead.
> + }
> + }
> +
> pm_runtime_enable(pcie->dev);
> err = pm_runtime_get_sync(pcie->dev);
> if (err < 0) {
Gr{oetje,eeting}s,
Geert
@@ -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"
@@ -974,14 +975,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)
@@ -992,6 +999,15 @@ 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) {
+ dev_err_probe(dev, err, "error enabling regulator %s\n",
+ rcar_pcie_supplies[i]);
+ return err;
+ }
+ }
+
pm_runtime_enable(pcie->dev);
err = pm_runtime_get_sync(pcie->dev);
if (err < 0) {