arm64: a37xx: pci: Depends on DM_GPIO

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@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Andre Heider <a.heider@gmail.com>

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index c19d09bc417e0e35882e69a315691deb9dbd2fb5..dd1cc652290f5795b479c4cf48d167cd78472123 100644 (file)
--- 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 8996be53095f6408c0d894f71947f68bfc7c62e5..b2c417701f294ed15cdff8f37022a52156b7cc98 100644 (file)
--- 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;
 }