[PATCH] arm64: a37xx: pci: Depends on DM_GPIO

[Stefan Roese]

On 25.08.20 10:45, Pali Rohár wrote:
> For proper initialization of aardvark pci driver it is required to
> de-assert reset GPIO. So depeneds on DM_GPIO option.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   drivers/pci/Kconfig        |  1 +
>   drivers/pci/pci-aardvark.c | 10 ++--------
>   2 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> index 5e0a39396b..db70ccc288 100644
> --- a/drivers/pci/Kconfig
> +++ b/drivers/pci/Kconfig
> @@ -30,6 +30,7 @@ config PCI_AARDVARK
>   	bool "Enable Aardvark PCIe driver"
>   	default n
>   	depends on DM_PCI
> +	depends on DM_GPIO
>   	depends on ARMADA_3700
>   	help
>   	  Say Y here if you want to enable PCIe controller support on
> diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c
> index 8996be5309..b2c417701f 100644
> --- a/drivers/pci/pci-aardvark.c
> +++ b/drivers/pci/pci-aardvark.c
> @@ -148,9 +148,7 @@ struct pcie_advk {
>   	void           *base;
>   	int            first_busno;
>   	struct udevice *dev;
> -#if CONFIG_IS_ENABLED(DM_GPIO)
>   	struct gpio_desc reset_gpio;
> -#endif
>   };
>   
>   static inline void advk_writel(struct pcie_advk *pcie, uint val, uint reg)
> @@ -616,7 +614,6 @@ static int pcie_advk_probe(struct udevice *dev)
>   {
>   	struct pcie_advk *pcie = dev_get_priv(dev);
>   
> -#if CONFIG_IS_ENABLED(DM_GPIO)
>   	gpio_request_by_name(dev, "reset-gpios", 0, &pcie->reset_gpio,
>   			     GPIOD_IS_OUT);
>   	/*
> @@ -637,10 +634,9 @@ static int pcie_advk_probe(struct udevice *dev)
>   		dm_gpio_set_value(&pcie->reset_gpio, 1);
>   		mdelay(200);
>   		dm_gpio_set_value(&pcie->reset_gpio, 0);
> +	} else {
> +		dev_warn(pcie->dev, "PCIE Reset on GPIO support is missing\n");
>   	}
> -#else
> -	dev_dbg(pcie->dev, "PCIE Reset on GPIO support is missing\n");
> -#endif /* DM_GPIO */
>   
>   	pcie->first_busno = dev->seq;
>   	pcie->dev = pci_get_controller(dev);
> @@ -650,12 +646,10 @@ static int pcie_advk_probe(struct udevice *dev)
>   
>   static int pcie_advk_remove(struct udevice *dev)
>   {
> -#if CONFIG_IS_ENABLED(DM_GPIO)
>   	struct pcie_advk *pcie = dev_get_priv(dev);
>   
>   	if (dm_gpio_is_valid(&pcie->reset_gpio))
>   		dm_gpio_set_value(&pcie->reset_gpio, 1);
> -#endif /* DM_GPIO */
>   
>   	return 0;
>   }
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de