mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 10:43:43 +00:00
Revert "MIPS: pci: lantiq: restore reset gpio polarity"
This reverts commit 277a036312
.
While fixing old boards with broken DTs, this change will break
newer ones with correct gpio polarity annotation.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
parent
ce5cdd3b05
commit
6e5aee08bd
@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platform_device *pdev)
|
|||||||
clk_disable(clk_external);
|
clk_disable(clk_external);
|
||||||
|
|
||||||
/* setup reset gpio used by pci */
|
/* setup reset gpio used by pci */
|
||||||
reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS);
|
reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
|
||||||
|
GPIOD_OUT_LOW);
|
||||||
error = PTR_ERR_OR_ZERO(reset_gpio);
|
error = PTR_ERR_OR_ZERO(reset_gpio);
|
||||||
if (error) {
|
if (error) {
|
||||||
dev_err(&pdev->dev, "failed to request gpio: %d\n", error);
|
dev_err(&pdev->dev, "failed to request gpio: %d\n", error);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
gpiod_set_consumer_name(reset_gpio, "pci_reset");
|
gpiod_set_consumer_name(reset_gpio, "pci_reset");
|
||||||
gpiod_direction_output(reset_gpio, 1);
|
|
||||||
|
|
||||||
/* enable auto-switching between PCI and EBU */
|
/* enable auto-switching between PCI and EBU */
|
||||||
ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);
|
ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);
|
||||||
@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platform_device *pdev)
|
|||||||
|
|
||||||
/* toggle reset pin */
|
/* toggle reset pin */
|
||||||
if (reset_gpio) {
|
if (reset_gpio) {
|
||||||
gpiod_set_value_cansleep(reset_gpio, 0);
|
gpiod_set_value_cansleep(reset_gpio, 1);
|
||||||
wmb();
|
wmb();
|
||||||
mdelay(1);
|
mdelay(1);
|
||||||
gpiod_set_value_cansleep(reset_gpio, 1);
|
gpiod_set_value_cansleep(reset_gpio, 0);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user