[U-Boot] [PATCH 03/34] spi: davinci: Full dm conversion

Adam Ford
2018-11-20T14:45:44Z

On Tue, Nov 20, 2018 at 6:48 AM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> davinci_spi now support dt along with platform data,
> respective boards need to switch into dm for the same.
>
> Cc: Adam Ford <aford173@gmail.com>
> Cc: Vitaly Andrianov <vitalya@ti.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Peter Howard <phoward@gme.net.au>
> Cc: Tom Rini <trini@konsulko.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

I applied the whole series to origin/master, but the atmel driver
didn't apply with git am, so I skipped it.

With that caveat, I tested this on the da850 EVM and I found no
issues, so you can mark me as

Tested-By: Adam Ford <aford173@gmail.com> #da850evm

> ---
> Makefile | 9 +++
> drivers/spi/Makefile | 2 +-
> drivers/spi/davinci_spi.c | 157 --------------------------------------
> drivers/spi/spi.c | 35 +++++++++
> 4 files changed, 45 insertions(+), 158 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 552687db53..d06cb5c287 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -917,6 +917,15 @@ ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y)
> @echo "(possibly in a subsequent patch in your series)"
> @echo "before sending patches to the mailing list."
> @echo "===================================================="
> +endif
> +ifeq ($(CONFIG_DM_SPI),)
> +ifeq ($(CONFIG_DAVINCI_SPI),y)
> + @echo "===================== WARNING ======================"
> + @echo "This board uses SPI driver from drivers/spi/ without"
> + @echo "enabling CONFIG_DM_SPI. Please enable CONFIG_DM_SPI"
> + @echo "otherwise SPI on this board, cannot work."
> + @echo "===================================================="
> +endif
> endif
> @# Check that this build does not use CONFIG options that we do not
> @# know about unless they are in Kconfig. All the existing CONFIG
> diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
> index 7242ea7e40..cf5a5cccc0 100644
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@ -6,6 +6,7 @@
> # There are many options which enable SPI, so make this library available
> ifdef CONFIG_DM_SPI
> obj-y += spi-uclass.o
> +obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o
> obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o
> obj-$(CONFIG_SOFT_SPI) += soft_spi.o
> obj-$(CONFIG_SPI_MEM) += spi-mem.o
> @@ -22,7 +23,6 @@ obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o
> obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o
> obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
> obj-$(CONFIG_CF_SPI) += cf_spi.o
> -obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o
> obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o
> obj-$(CONFIG_EXYNOS_SPI) += exynos_spi.o
> obj-$(CONFIG_FSL_DSPI) += fsl_dspi.o
> diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
> index 4d2c106440..c1646f6cdc 100644
> --- a/drivers/spi/davinci_spi.c
> +++ b/drivers/spi/davinci_spi.c
> @@ -52,41 +52,6 @@
> /* SPIDEF */
> #define SPIDEF_CSDEF0_MASK BIT(0)
>
> -#ifndef CONFIG_DM_SPI
> -#define SPI0_BUS 0
> -#define SPI0_BASE CONFIG_SYS_SPI_BASE
> -/*
> - * Define default SPI0_NUM_CS as 1 for existing platforms that uses this
> - * driver. Platform can configure number of CS using CONFIG_SYS_SPI0_NUM_CS
> - * if more than one CS is supported and by defining CONFIG_SYS_SPI0.
> - */
> -#ifndef CONFIG_SYS_SPI0
> -#define SPI0_NUM_CS 1
> -#else
> -#define SPI0_NUM_CS CONFIG_SYS_SPI0_NUM_CS
> -#endif
> -
> -/*
> - * define CONFIG_SYS_SPI1 when platform has spi-1 device (bus #1) and
> - * CONFIG_SYS_SPI1_NUM_CS defines number of CS on this bus
> - */
> -#ifdef CONFIG_SYS_SPI1
> -#define SPI1_BUS 1
> -#define SPI1_NUM_CS CONFIG_SYS_SPI1_NUM_CS
> -#define SPI1_BASE CONFIG_SYS_SPI1_BASE
> -#endif
> -
> -/*
> - * define CONFIG_SYS_SPI2 when platform has spi-2 device (bus #2) and
> - * CONFIG_SYS_SPI2_NUM_CS defines number of CS on this bus
> - */
> -#ifdef CONFIG_SYS_SPI2
> -#define SPI2_BUS 2
> -#define SPI2_NUM_CS CONFIG_SYS_SPI2_NUM_CS
> -#define SPI2_BASE CONFIG_SYS_SPI2_BASE
> -#endif
> -#endif
> -
> DECLARE_GLOBAL_DATA_PTR;
>
> /* davinci spi register set */
> @@ -119,9 +84,6 @@ struct davinci_spi_regs {
>
> /* davinci spi slave */
> struct davinci_spi_slave {
> -#ifndef CONFIG_DM_SPI
> - struct spi_slave slave;
> -#endif
> struct davinci_spi_regs *regs;
> unsigned int freq; /* current SPI bus frequency */
> unsigned int mode; /* current SPI mode used */
> @@ -343,124 +305,6 @@ out:
> return 0;
> }
>
> -#ifndef CONFIG_DM_SPI
> -
> -static inline struct davinci_spi_slave *to_davinci_spi(struct spi_slave *slave)
> -{
> - return container_of(slave, struct davinci_spi_slave, slave);
> -}
> -
> -int spi_cs_is_valid(unsigned int bus, unsigned int cs)
> -{
> - int ret = 0;
> -
> - switch (bus) {
> - case SPI0_BUS:
> - if (cs < SPI0_NUM_CS)
> - ret = 1;
> - break;
> -#ifdef CONFIG_SYS_SPI1
> - case SPI1_BUS:
> - if (cs < SPI1_NUM_CS)
> - ret = 1;
> - break;
> -#endif
> -#ifdef CONFIG_SYS_SPI2
> - case SPI2_BUS:
> - if (cs < SPI2_NUM_CS)
> - ret = 1;
> - break;
> -#endif
> - default:
> - /* Invalid bus number. Do nothing */
> - break;
> - }
> - return ret;
> -}
> -
> -void spi_cs_activate(struct spi_slave *slave)
> -{
> - /* do nothing */
> -}
> -
> -void spi_cs_deactivate(struct spi_slave *slave)
> -{
> - /* do nothing */
> -}
> -
> -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
> - unsigned int max_hz, unsigned int mode)
> -{
> - struct davinci_spi_slave *ds;
> -
> - if (!spi_cs_is_valid(bus, cs))
> - return NULL;
> -
> - ds = spi_alloc_slave(struct davinci_spi_slave, bus, cs);
> - if (!ds)
> - return NULL;
> -
> - switch (bus) {
> - case SPI0_BUS:
> - ds->regs = (struct davinci_spi_regs *)SPI0_BASE;
> - break;
> -#ifdef CONFIG_SYS_SPI1
> - case SPI1_BUS:
> - ds->regs = (struct davinci_spi_regs *)SPI1_BASE;
> - break;
> -#endif
> -#ifdef CONFIG_SYS_SPI2
> - case SPI2_BUS:
> - ds->regs = (struct davinci_spi_regs *)SPI2_BASE;
> - break;
> -#endif
> - default: /* Invalid bus number */
> - return NULL;
> - }
> -
> - ds->freq = max_hz;
> - ds->mode = mode;
> -
> - return &ds->slave;
> -}
> -
> -void spi_free_slave(struct spi_slave *slave)
> -{
> - struct davinci_spi_slave *ds = to_davinci_spi(slave);
> -
> - free(ds);
> -}
> -
> -int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
> - const void *dout, void *din, unsigned long flags)
> -{
> - struct davinci_spi_slave *ds = to_davinci_spi(slave);
> -
> - ds->cur_cs = slave->cs;
> -
> - return __davinci_spi_xfer(ds, bitlen, dout, din, flags);
> -}
> -
> -int spi_claim_bus(struct spi_slave *slave)
> -{
> - struct davinci_spi_slave *ds = to_davinci_spi(slave);
> -
> -#ifdef CONFIG_SPI_HALF_DUPLEX
> - ds->half_duplex = true;
> -#else
> - ds->half_duplex = false;
> -#endif
> - return __davinci_spi_claim_bus(ds, ds->slave.cs);
> -}
> -
> -void spi_release_bus(struct spi_slave *slave)
> -{
> - struct davinci_spi_slave *ds = to_davinci_spi(slave);
> -
> - __davinci_spi_release_bus(ds);
> -}
> -
> -#else
> static int davinci_spi_set_speed(struct udevice *bus, uint max_hz)
> {
> struct davinci_spi_slave *ds = dev_get_priv(bus);
> @@ -579,4 +423,3 @@ U_BOOT_DRIVER(davinci_spi) = {
> .ops = &davinci_spi_ops,
> .priv_auto_alloc_size = sizeof(struct davinci_spi_slave),
> };
> -#endif
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 22910de0dd..ba1d1b082d 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -38,3 +38,38 @@ void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
>
> return ptr;
> }
> +
> +#if !defined(CONFIG_DM_SPI) && defined(CONFIG_DAVINCI_SPI)
> +void spi_cs_activate(struct spi_slave *slave)
> +{
> +}
> +
> +void spi_cs_deactivate(struct spi_slave *slave)
> +{
> +}
> +
> +struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
> + unsigned int max_hz, unsigned int mode)
> +{
> + return NULL;
> +}
> +
> +void spi_free_slave(struct spi_slave *slave)
> +{
> +}
> +
> +int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
> + const void *dout, void *din, unsigned long flags)
> +{
> + return 0;
> +}
> +
> +int spi_claim_bus(struct spi_slave *slave)
> +{
> + return 0;
> +}
> +
> +void spi_release_bus(struct spi_slave *slave)
> +{
> +}
> +#endif
> --
> 2.18.0.321.gffc6fa0e3
>