dm: gpio: Allow control of GPIO uclass in SPL

[oweals/u-boot.git] / drivers / spi / atmel_spi.c

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 4701b79f161f46b38c1cd39c4580e91248e08740..f076e92a93c59e01c99428c61a8adeca46446709 100644 (file)
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2007 Atmel Corporation
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <clk.h>
@@ -18,14 +17,12 @@
 #ifdef CONFIG_DM_SPI
 #include <asm/arch/at91_spi.h>
 #endif
-#ifdef CONFIG_DM_GPIO
+#if CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm/gpio.h>
 #endif
 
 #include "atmel_spi.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #ifndef CONFIG_DM_SPI
 
 static int spi_has_wdrbt(struct atmel_spi_slave *slave)
@@ -37,11 +34,6 @@ static int spi_has_wdrbt(struct atmel_spi_slave *slave)
        return (ATMEL_SPI_VERSION_REV(ver) >= 0x210);
 }
 
-void spi_init()
-{
-
-}
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                        unsigned int max_hz, unsigned int mode)
 {
@@ -236,7 +228,9 @@ struct atmel_spi_priv {
        unsigned int freq;              /* Default frequency */
        unsigned int mode;
        ulong bus_clk_rate;
+#if CONFIG_IS_ENABLED(DM_GPIO)
        struct gpio_desc cs_gpios[MAX_CS_COUNT];
+#endif
 };
 
 static int atmel_spi_claim_bus(struct udevice *dev)
@@ -291,6 +285,7 @@ static int atmel_spi_release_bus(struct udevice *dev)
 
 static void atmel_spi_cs_activate(struct udevice *dev)
 {
+#if CONFIG_IS_ENABLED(DM_GPIO)
        struct udevice *bus = dev_get_parent(dev);
        struct atmel_spi_priv *priv = dev_get_priv(bus);
        struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
@@ -300,10 +295,12 @@ static void atmel_spi_cs_activate(struct udevice *dev)
                return;
 
        dm_gpio_set_value(&priv->cs_gpios[cs], 0);
+#endif
 }
 
 static void atmel_spi_cs_deactivate(struct udevice *dev)
 {
+#if CONFIG_IS_ENABLED(DM_GPIO)
        struct udevice *bus = dev_get_parent(dev);
        struct atmel_spi_priv *priv = dev_get_priv(bus);
        struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
@@ -313,6 +310,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev)
                return;
 
        dm_gpio_set_value(&priv->cs_gpios[cs], 1);
+#endif
 }
 
 static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen,
@@ -394,8 +392,8 @@ out:
                 * Wait until the transfer is completely done before
                 * we deactivate CS.
                 */
-               wait_for_bit(__func__, &reg_base->sr,
-                            ATMEL_SPI_SR_TXEMPTY, true, 1000, false);
+               wait_for_bit_le32(&reg_base->sr,
+                                 ATMEL_SPI_SR_TXEMPTY, true, 1000, false);
 
                atmel_spi_cs_deactivate(dev);
        }
@@ -462,19 +460,22 @@ static int atmel_spi_enable_clk(struct udevice *bus)
 static int atmel_spi_probe(struct udevice *bus)
 {
        struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus);
-       struct atmel_spi_priv *priv = dev_get_priv(bus);
-       int i, ret;
+       int ret;
 
        ret = atmel_spi_enable_clk(bus);
        if (ret)
                return ret;
 
-       bus_plat->regs = (struct at91_spi *)dev_get_addr(bus);
+       bus_plat->regs = (struct at91_spi *)devfdt_get_addr(bus);
+
+#if CONFIG_IS_ENABLED(DM_GPIO)
+       struct atmel_spi_priv *priv = dev_get_priv(bus);
+       int i;
 
        ret = gpio_request_list_by_name(bus, "cs-gpios", priv->cs_gpios,
                                        ARRAY_SIZE(priv->cs_gpios), 0);
        if (ret < 0) {
-               error("Can't get %s gpios! Error: %d", bus->name, ret);
+               pr_err("Can't get %s gpios! Error: %d", bus->name, ret);
                return ret;
        }
 
@@ -485,6 +486,7 @@ static int atmel_spi_probe(struct udevice *bus)
                dm_gpio_set_dir_flags(&priv->cs_gpios[i],
                                      GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
        }
+#endif
 
        writel(ATMEL_SPI_CR_SWRST, &bus_plat->regs->cr);