* [PATCH v2 0/2] KingFisher: support regulators for PCIe
@ 2023-05-10 19:02 Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 1/2] dt-bindings: PCI: rcar-pci-host: add optional regulators Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 2/2] PCI: rcar-host: add support for " Wolfram Sang
0 siblings, 2 replies; 4+ messages in thread
From: Wolfram Sang @ 2023-05-10 19:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Wolfram Sang, devicetree, linux-kernel, linux-pci, Marek Vasut,
Yoshihiro Shimoda
Here are the patches to make PCIe cards work in the slot CN15 on a
KingFisher board. Look at the patches for a changelog, please.
Wolfram
Wolfram Sang (2):
dt-bindings: PCI: rcar-pci-host: add optional regulators
PCI: rcar-host: add support for optional regulators
.../devicetree/bindings/pci/rcar-pci-host.yaml | 11 +++++++++++
drivers/pci/controller/pcie-rcar-host.c | 18 +++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] dt-bindings: PCI: rcar-pci-host: add optional regulators
2023-05-10 19:02 [PATCH v2 0/2] KingFisher: support regulators for PCIe Wolfram Sang
@ 2023-05-10 19:02 ` Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 2/2] PCI: rcar-host: add support for " Wolfram Sang
1 sibling, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2023-05-10 19:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Wolfram Sang, Geert Uytterhoeven, Krzysztof Kozlowski,
Marek Vasut, Yoshihiro Shimoda, Bjorn Helgaas, Lorenzo Pieralisi,
Krzysztof Wilczyński, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-pci, devicetree, linux-kernel
Support regulators found on the e.g. KingFisher board for miniPCIe and
add a 12v regulator while we are here.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes since v1:
* added tags (Thanks Geert and Krzysztof!)
.../devicetree/bindings/pci/rcar-pci-host.yaml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml
index 8fdfbc763d70..b6a7cb32f61e 100644
--- a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml
+++ b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml
@@ -68,6 +68,15 @@ properties:
phy-names:
const: pcie
+ vpcie1v5-supply:
+ description: The 1.5v regulator to use for PCIe.
+
+ vpcie3v3-supply:
+ description: The 3.3v regulator to use for PCIe.
+
+ vpcie12v-supply:
+ description: The 12v regulator to use for PCIe.
+
required:
- compatible
- reg
@@ -121,5 +130,7 @@ examples:
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ vpcie3v3-supply = <&pcie_3v3>;
+ vpcie12v-supply = <&pcie_12v>;
};
};
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] PCI: rcar-host: add support for optional regulators
2023-05-10 19:02 [PATCH v2 0/2] KingFisher: support regulators for PCIe Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 1/2] dt-bindings: PCI: rcar-pci-host: add optional regulators Wolfram Sang
@ 2023-05-10 19:02 ` Wolfram Sang
2023-05-11 7:11 ` Geert Uytterhoeven
1 sibling, 1 reply; 4+ messages in thread
From: Wolfram Sang @ 2023-05-10 19:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Wolfram Sang, Marek Vasut, Yoshihiro Shimoda, Lorenzo Pieralisi,
Krzysztof Wilczyński, Rob Herring, Bjorn Helgaas, linux-pci,
linux-kernel
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(-)
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
index e80e56b2a842..119c894a995c 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"
@@ -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) {
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] PCI: rcar-host: add support for optional regulators
2023-05-10 19:02 ` [PATCH v2 2/2] PCI: rcar-host: add support for " Wolfram Sang
@ 2023-05-11 7:11 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2023-05-11 7:11 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-renesas-soc, Marek Vasut, Yoshihiro Shimoda,
Lorenzo Pieralisi, Krzysztof Wilczyński, Rob Herring,
Bjorn Helgaas, linux-pci, linux-kernel
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
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-11 7:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-10 19:02 [PATCH v2 0/2] KingFisher: support regulators for PCIe Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 1/2] dt-bindings: PCI: rcar-pci-host: add optional regulators Wolfram Sang
2023-05-10 19:02 ` [PATCH v2 2/2] PCI: rcar-host: add support for " Wolfram Sang
2023-05-11 7:11 ` Geert Uytterhoeven
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.