Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a2eae23 authored by Russell King's avatar Russell King Committed by Bjorn Helgaas
Browse files

PCI: mvebu: Use gpio_set_value_cansleep() 



We are in a context where we can sleep, and the PCIe reset gpio may be on
an I2C expander.  Use the cansleep() variant when setting the GPIO value.

Tested-by: Willy Tarreau <w@1wt.eu> (Iomega iConnect Kirkwood, MiraBox Armada 370)
Tested-by: Andrew Lunn <andrew@lunn.ch> (D-Link DIR664 Kirkwood)
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (Armada XP GP)
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3884d846

drivers/pci/host/pci-mvebu.c

+2 −2
Original line number Diff line number Diff line
@@ -1111,8 +1111,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
			of_property_read_u32(child, "reset-delay-us",

					     &reset_udelay);



			gpio_set_value(port->reset_gpio,

				       (port->reset_active_low) ? 1 : 0);

			gpio_set_value_cansleep(port->reset_gpio,

						!!port->reset_active_low);

			msleep(reset_udelay/1000);

		}