Commit bf2b3312 authored by Fabio Estevam's avatar Fabio Estevam Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Use gpiod_set_value_cansleep() to allow reset via expanders 



The reset GPIO can be connected to a I2C or SPI IO expander, which may
sleep, so it is safer to use the gpiod_set_value_cansleep() variant
instead.

Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent 62f9ee98

drivers/pci/host/pcie-rockchip.c

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
	int err, i;

	u32 status;



	gpiod_set_value(rockchip->ep_gpio, 0);

	gpiod_set_value_cansleep(rockchip->ep_gpio, 0);



	err = reset_control_assert(rockchip->aclk_rst);

	if (err) {
@@ -688,7 +688,7 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
	rockchip_pcie_write(rockchip, PCIE_CLIENT_LINK_TRAIN_ENABLE,

			    PCIE_CLIENT_CONFIG);



	gpiod_set_value(rockchip->ep_gpio, 1);

	gpiod_set_value_cansleep(rockchip->ep_gpio, 1);



	/* 500ms timeout value should be enough for Gen1/2 training */

	err = readl_poll_timeout(rockchip->apb_base + PCIE_CLIENT_BASIC_STATUS1,