Commit 11f71f0c authored Jan 22, 2021 by Chen-Yu Tsai Committed by Greg Kroah-Hartman Aug 19, 2024

PCI: rockchip: Make 'ep-gpios' DT property optional

[ Upstream commit 58adbfb3ebec460e8b58875c682bafd866808e80 ]

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().

[bhelgaas: tidy whitespace]
Link: https://lore.kernel.org/r/20210121162321.4538-2-wens@kernel.org


Fixes: e77f847d ("PCI: rockchip: Add Rockchip PCIe controller support")
Fixes: 956cd99b ("PCI: rockchip: Separate common code from RC driver")
Fixes: 964bac94 ("PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Stable-dep-of: 840b7a5edf88 ("PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio")
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2b2d2b87

drivers/pci/controller/pcie-rockchip.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -120,11 +120,11 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
	}		}

	if (rockchip->is_rc) {		if (rockchip->is_rc) {
	rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);		rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep",
	if (IS_ERR(rockchip->ep_gpio)) {		GPIOD_OUT_HIGH);
	dev_err(dev, "missing ep-gpios property in node\n");		if (IS_ERR(rockchip->ep_gpio))
	return PTR_ERR(rockchip->ep_gpio);		return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio),
	}		"failed to get ep GPIO\n");
	}		}

	rockchip->aclk_pcie = devm_clk_get(dev, "aclk");		rockchip->aclk_pcie = devm_clk_get(dev, "aclk");