From: Chen-Yu Tsai <[email protected]>
The Rockchip PCIe controller DT binding clearly states that ep-gpios is
an optional property. And indeed there are boards that don't require it.
Make the driver follow the binding by using devm_gpiod_get_optional()
instead of devm_gpiod_get().
Fixes: e77f847df54c ("PCI: rockchip: Add Rockchip PCIe controller support")
Fixes: 956cd99b35a8 ("PCI: rockchip: Separate common code from RC driver")
Fixes: 964bac9455be ("PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT")
Signed-off-by: Chen-Yu Tsai <[email protected]>
---
drivers/pci/controller/pcie-rockchip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
index 904dec0d3a88..c95950e9004f 100644
--- a/drivers/pci/controller/pcie-rockchip.c
+++ b/drivers/pci/controller/pcie-rockchip.c
@@ -118,7 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
}
if (rockchip->is_rc) {
- rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);
+ rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH);
if (IS_ERR(rockchip->ep_gpio)) {
dev_err(dev, "missing ep-gpios property in node\n");
return PTR_ERR(rockchip->ep_gpio);
--
2.29.1
Run "git log --oneline drivers/pci/controller/pcie-rockchip.c" (or
even just look at the Fixes: commits you mention) and follow the
convention, e.g.,
PCI: rockchip: Make 'ep-gpios' DT property optional
Also, you used 'ep_gpio' (singular, with an underline) in the subject
but 'ep-gpios' (plural, with hyphen) in the commit log. The error
message and Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt
both say 'ep-gpios' (plural, with hyphen).
Please fix so this is all consistent. Details matter.
On Mon, Nov 16, 2020 at 03:52:12PM +0800, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <[email protected]>
>
> The Rockchip PCIe controller DT binding clearly states that ep-gpios is
> an optional property. And indeed there are boards that don't require it.
>
> Make the driver follow the binding by using devm_gpiod_get_optional()
> instead of devm_gpiod_get().
>
> Fixes: e77f847df54c ("PCI: rockchip: Add Rockchip PCIe controller support")
> Fixes: 956cd99b35a8 ("PCI: rockchip: Separate common code from RC driver")
> Fixes: 964bac9455be ("PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT")
> Signed-off-by: Chen-Yu Tsai <[email protected]>
> ---
> drivers/pci/controller/pcie-rockchip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
> index 904dec0d3a88..c95950e9004f 100644
> --- a/drivers/pci/controller/pcie-rockchip.c
> +++ b/drivers/pci/controller/pcie-rockchip.c
> @@ -118,7 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
> }
>
> if (rockchip->is_rc) {
> - rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);
> + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH);
> if (IS_ERR(rockchip->ep_gpio)) {
> dev_err(dev, "missing ep-gpios property in node\n");
> return PTR_ERR(rockchip->ep_gpio);
> --
> 2.29.1
>
On Tue, Nov 17, 2020 at 12:42 AM Bjorn Helgaas <[email protected]> wrote:
>
> Run "git log --oneline drivers/pci/controller/pcie-rockchip.c" (or
> even just look at the Fixes: commits you mention) and follow the
> convention, e.g.,
>
> PCI: rockchip: Make 'ep-gpios' DT property optional
>
> Also, you used 'ep_gpio' (singular, with an underline) in the subject
> but 'ep-gpios' (plural, with hyphen) in the commit log. The error
> message and Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt
> both say 'ep-gpios' (plural, with hyphen).
'ep_gpio' refers to the variable used within the driver. But reading it
again, it does seem kind of weird. I will rewrite it to be more consistent.
ChenYu
> Please fix so this is all consistent. Details matter.
>
> On Mon, Nov 16, 2020 at 03:52:12PM +0800, Chen-Yu Tsai wrote:
> > From: Chen-Yu Tsai <[email protected]>
> >
> > The Rockchip PCIe controller DT binding clearly states that ep-gpios is
> > an optional property. And indeed there are boards that don't require it.
> >
> > Make the driver follow the binding by using devm_gpiod_get_optional()
> > instead of devm_gpiod_get().
> >
> > Fixes: e77f847df54c ("PCI: rockchip: Add Rockchip PCIe controller support")
> > Fixes: 956cd99b35a8 ("PCI: rockchip: Separate common code from RC driver")
> > Fixes: 964bac9455be ("PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT")
> > Signed-off-by: Chen-Yu Tsai <[email protected]>
> > ---
> > drivers/pci/controller/pcie-rockchip.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
> > index 904dec0d3a88..c95950e9004f 100644
> > --- a/drivers/pci/controller/pcie-rockchip.c
> > +++ b/drivers/pci/controller/pcie-rockchip.c
> > @@ -118,7 +118,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
> > }
> >
> > if (rockchip->is_rc) {
> > - rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);
> > + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH);
> > if (IS_ERR(rockchip->ep_gpio)) {
> > dev_err(dev, "missing ep-gpios property in node\n");
> > return PTR_ERR(rockchip->ep_gpio);
> > --
> > 2.29.1
> >