From 563b85bd88772c8949d10f7fa8e39a20280b1aac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Wed, 19 Aug 2020 15:57:06 +0200 Subject: [PATCH] arm64: a37xx: pci: Make PCIe Reset GPIO DT compatible with Linux kernel DT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change active-high to active-low and change DT property name from reset-gpio to reset-gpios. This format of gpio reset is used by pci-aardvark driver in Linux kernel. Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese Reviewed-by: Konstantin Porotchkin Tested-by: Andre Heider --- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- drivers/pci/pci-aardvark.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts index 1b219c423b..1b1b66b94d 100644 --- a/arch/arm/dts/armada-3720-db.dts +++ b/arch/arm/dts/armada-3720-db.dts @@ -159,6 +159,6 @@ &pcie0 { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>; - reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts index 50381e979e..2ace52e812 100644 --- a/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts @@ -145,6 +145,6 @@ &pcie0 { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>; - reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index 0f0a6ce65d..974270cc8c 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -172,6 +172,6 @@ &pcie0 { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>; - reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; status = "disabled"; }; diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index 711b930d0f..5b3f23c184 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -616,7 +616,7 @@ static int pcie_advk_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct gpio_desc reset_gpio; - gpio_request_by_name(dev, "reset-gpio", 0, &reset_gpio, + gpio_request_by_name(dev, "reset-gpios", 0, &reset_gpio, GPIOD_IS_OUT); /* * Issue reset to add-in card through the dedicated GPIO. @@ -633,9 +633,9 @@ static int pcie_advk_probe(struct udevice *dev) */ if (dm_gpio_is_valid(&reset_gpio)) { dev_dbg(pcie->dev, "Toggle PCIE Reset GPIO ...\n"); - dm_gpio_set_value(&reset_gpio, 0); - mdelay(200); dm_gpio_set_value(&reset_gpio, 1); + mdelay(200); + dm_gpio_set_value(&reset_gpio, 0); } #else dev_dbg(pcie->dev, "PCIE Reset on GPIO support is missing\n"); -- 2.39.5