Commit 4e5db798 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/tegra' 

- Switch from devm_gpiod_get_from_of_node() to devm_fwnode_gpiod_get()
  (Dmitry Torokhov)

* remotes/lorenzo/pci/tegra:
  PCI: tegra: Switch to using devm_fwnode_gpiod_get
parents 008ee711 16e3f407

drivers/pci/controller/pci-tegra.c

+5 −4
Original line number Diff line number Diff line
@@ -2197,8 +2197,9 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) 
		 * and in this case fall back to using AFI per port register

		 * to toggle PERST# SFIO line.

		 */

		rp->reset_gpio = devm_gpiod_get_from_of_node(dev, port,

							     "reset-gpios", 0,

		rp->reset_gpio = devm_fwnode_gpiod_get(dev,

						       of_fwnode_handle(port),

						       "reset",

						       GPIOD_OUT_LOW,

						       label);

		if (IS_ERR(rp->reset_gpio)) {