diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:24 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:24 -0600 |
| commit | ce96d1d7b8eaf5d21e2537826e86a33882638fb5 (patch) | |
| tree | 7f6058d2e477de6f1ba951d399b0e69d5d3545a0 /drivers | |
| parent | 4ab5718c3146114a54bbde3d5aafa19db66c2ea8 (diff) | |
| parent | 8e61744de4d34162467b0b3e49aa9de8bf817180 (diff) | |
| download | linux-ce96d1d7b8eaf5d21e2537826e86a33882638fb5.tar.bz2 | |
Merge branch 'pci/rockchip'
- Make 'ep-gpios' DT property optional (Chen-Yu Tsai)
- Add FriendlyARM NanoPi M4B to rockchip DT binding (Chen-Yu Tsai)
* pci/rockchip:
dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
PCI: rockchip: Make 'ep-gpios' DT property optional
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/pcie-rockchip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 904dec0d3a88..990a00e08bc5 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -82,7 +82,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) } rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, - "mgmt-sticky"); + "mgmt-sticky"); if (IS_ERR(rockchip->mgmt_sticky_rst)) { if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) dev_err(dev, "missing mgmt-sticky reset property in node\n"); @@ -118,11 +118,11 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) } if (rockchip->is_rc) { - rockchip->ep_gpio = devm_gpiod_get(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); - } + rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", + GPIOD_OUT_HIGH); + if (IS_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"); |