ks2_evm: Switch to DM_SPL, SPL_OF_CONTROL
PATCH 1/2 ks2_evm: Switch to DM_SPL, SPL_OF_CONTROL
This would make SPL build to DM_SPL, SPL_OF_CONTROL.
Build fine with warnings, but not tested.
Cc Vitaly Andrianov <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
--- configs/k2e_evm_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2hk_evm_defconfig | 2 ++ configs/k2l_evm_defconfig | 2 ++ include/configs/ti_armv7_keystone2.h | 4 ---- 5 files changed, 8 insertions(+), 4 deletions(-)
configs/k2e_evm_defconfig +2 -0
@@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y
configs/k2g_evm_defconfig +2 -0
@@ -34,6 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice" CONFIG_DTB_RESELECT=y
@@ -41,6 +42,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_MISC=y
configs/k2hk_evm_defconfig +2 -0
@@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y
configs/k2l_evm_defconfig +2 -0
@@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2l-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y
include/configs/ti_armv7_keystone2.h +0 -4
@@ -77,10 +77,6 @@#define CONFIG_SYS_SPI2 #define CONFIG_SYS_SPI2_BASE KS2_SPI2_BASE#define CONFIG_SYS_SPI2_NUM_CS 4 -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#endif /* Network Configuration */ #define CONFIG_BOOTP_DEFAULT
Signature · 1 line
2.25.1
PATCH 2/2 spi: davinci: Drop non-dm code
Now all boards which are using davinci SPI driver have moved to SPL_DM so drop the unneeded non-dm code.
Cc Adam Ford <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
--- drivers/spi/davinci_spi.c | 157 --------------------------- include/configs/ti_armv7_keystone2.h | 9 -- 2 files changed, 166 deletions(-)
drivers/spi/davinci_spi.c +0 -157
@@ -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
include/configs/ti_armv7_keystone2.h +0 -9
@@ -68,15 +68,6 @@/* SPI Configuration */ #define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6) -#define CONFIG_SYS_SPI0 -#define CONFIG_SYS_SPI_BASE KS2_SPI0_BASE -#define CONFIG_SYS_SPI0_NUM_CS 4 -#define CONFIG_SYS_SPI1 -#define CONFIG_SYS_SPI1_BASE KS2_SPI1_BASE -#define CONFIG_SYS_SPI1_NUM_CS 4 -#define CONFIG_SYS_SPI2 -#define CONFIG_SYS_SPI2_BASE KS2_SPI2_BASE -#define CONFIG_SYS_SPI2_NUM_CS 4/* Network Configuration */ #define CONFIG_BOOTP_DEFAULT
Signature · 1 line
2.25.1