Skip to contentSkip to conversation

spi: Remove unused spi_init

PATCH Superseded Jagan Teki 1 participant 7 messages Nov 24, 2018 – Nov 27, 2018

Subsystems (7)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 1/6 spi: Remove unused spi_init

Remove spi_init definition which never used on
respective code since from many years.

---
 drivers/net/e1000_spi.c       | 3 ---
 drivers/spi/atmel_spi.c       | 5 -----
 drivers/spi/davinci_spi.c     | 5 -----
 drivers/spi/fsl_dspi.c        | 5 -----
 drivers/spi/fsl_espi.c        | 5 -----
 drivers/spi/lpc32xx_ssp.c     | 9 ---------
 drivers/spi/mxc_spi.c         | 4 ----
 drivers/spi/mxs_spi.c         | 4 ----
 drivers/spi/omap3_spi.c       | 5 -----
 drivers/spi/sh_qspi.c         | 5 -----
 drivers/spi/sh_spi.c          | 4 ----
 drivers/spi/soft_spi_legacy.c | 7 -------
 include/spi.h                 | 7 -------
 13 files changed, 68 deletions(-)
drivers/net/e1000_spi.c +0 -3
index b38f4df9f3..aecd290d72 100644
@@ -77,9 +77,6 @@ static inline struct e1000_hw *e1000_hw_from_spi(struct spi_slave *spi)
 	return container_of(spi, struct e1000_hw, spi);
 }
 
-/* Not sure why all of these are necessary */
-void spi_init(void)   { /* Nothing to do */ }
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		unsigned int max_hz, unsigned int mode)
 {
drivers/spi/atmel_spi.c +0 -5
index 1db8bbef2b..cf4de9ee1a 100644
@@ -34,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)
 {
drivers/spi/davinci_spi.c +0 -5
index 07fa5e3b8a..4d2c106440 100644
@@ -388,11 +388,6 @@ void spi_cs_deactivate(struct spi_slave *slave)
 	/* do nothing */
 }
 
-void spi_init(void)
-{
-	/* do nothing */
-}
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 			unsigned int max_hz, unsigned int mode)
 {
drivers/spi/fsl_dspi.c +0 -5
index f7ed8fbe08..764c94215e 100644
@@ -390,11 +390,6 @@ static int fsl_dspi_cfg_speed(struct fsl_dspi_priv *priv, uint speed)
 	return 0;
 }
 #ifndef CONFIG_DM_SPI
-void spi_init(void)
-{
-	/* Nothing to do */
-}
-
 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
 	if (((cs >= 0) && (cs < 8)) && ((bus >= 0) && (bus < 8)))
drivers/spi/fsl_espi.c +0 -5
index e9941593f5..7444ae1a06 100644
@@ -118,11 +118,6 @@ void spi_free_slave(struct spi_slave *slave)
 	free(fsl);
 }
 
-void spi_init(void)
-{
-
-}
-
 int spi_claim_bus(struct spi_slave *slave)
 {
 	struct fsl_spi_slave *fsl = to_fsl_spi_slave(slave);
drivers/spi/lpc32xx_ssp.c +0 -9
index ce12eee657..4b09366317 100644
@@ -47,15 +47,6 @@ static inline struct lpc32xx_spi_slave *to_lpc32xx_spi_slave(
 	return container_of(slave, struct lpc32xx_spi_slave, slave);
 }
 
-/* spi_init is called during boot when CONFIG_CMD_SPI is defined */
-void spi_init(void)
-{
-	/*
-	 *  nothing to do: clocking was enabled in lpc32xx_ssp_enable()
-	 * and configuration will be done in spi_setup_slave()
-	*/
-}
-
 /* the following is called in sequence by do_spi_xfer() */
 
 struct spi_slave *spi_setup_slave(uint bus, uint cs, uint max_hz, uint mode)
drivers/spi/mxc_spi.c +0 -4
index 0dccc38b82..b2636909ce 100644
@@ -400,10 +400,6 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
 	return mxc_spi_xfer_internal(mxcs, bitlen, dout, din, flags);
 }
 
-void spi_init(void)
-{
-}
-
 /*
  * Some SPI devices require active chip-select over multiple
  * transactions, we achieve this using a GPIO. Still, the SPI
drivers/spi/mxs_spi.c +0 -4
index 006fe8281c..5065e407f8 100644
@@ -39,10 +39,6 @@ static inline struct mxs_spi_slave *to_mxs_slave(struct spi_slave *slave)
 	return container_of(slave, struct mxs_spi_slave, slave);
 }
 
-void spi_init(void)
-{
-}
-
 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
 	/* MXS SPI: 4 ports and 3 chip selects maximum */
drivers/spi/omap3_spi.c +0 -5
index ecf54bb714..c7fcf050a5 100644
@@ -461,11 +461,6 @@ static inline struct omap3_spi_priv *to_omap3_spi(struct spi_slave *slave)
 	return container_of(slave, struct omap3_spi_priv, slave);
 }
 
-void spi_init(void)
-{
-	/* do nothing */
-}
-
 void spi_free_slave(struct spi_slave *slave)
 {
 	struct omap3_spi_priv *priv = to_omap3_spi(slave);
drivers/spi/sh_qspi.c +0 -5
index 64dfd748d6..5ae203d8d4 100644
@@ -247,11 +247,6 @@ void spi_cs_deactivate(struct spi_slave *slave)
 	sh_qspi_cs_deactivate(ss);
 }
 
-void spi_init(void)
-{
-	/* nothing to do */
-}
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		unsigned int max_hz, unsigned int mode)
 {
drivers/spi/sh_spi.c +0 -4
index bc2bd638e6..c58fd0ebc4 100644
@@ -66,10 +66,6 @@ static int write_fifo_empty_wait(struct sh_spi *ss)
 	return 0;
 }
 
-void spi_init(void)
-{
-}
-
 static void sh_spi_set_cs(struct sh_spi *ss, unsigned int cs)
 {
 	unsigned long val = 0;
drivers/spi/soft_spi_legacy.c +0 -7
index 0aac0c065d..cc5ab5f991 100644
@@ -36,13 +36,6 @@ static inline struct soft_spi_slave *to_soft_spi(struct spi_slave *slave)
 /*                         Public Functions                            */
 /*=====================================================================*/
 
-/*-----------------------------------------------------------------------
- * Initialization
- */
-void spi_init (void)
-{
-}
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		unsigned int max_hz, unsigned int mode)
 {
include/spi.h +0 -7
index 938627bc01..92427e5f32 100644
@@ -117,13 +117,6 @@ struct spi_slave {
 #define SPI_XFER_MMAP_END	BIT(3)	/* Memory Mapped End */
 };
 
-/**
- * Initialization, must be called once on start up.
- *
- * TODO: I don't think we really need this.
- */
-void spi_init(void);
-
 /**
  * spi_do_alloc_slave - Allocate a new SPI slave (internal)
  *
Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#1 lore raw

PATCH v2 1/6 spi: Remove unused spi_init

Quoted 6 lines · Jagan Teki

Remove spi_init definition which never used on
respective code since from many years.

---

All patches,

Applied to u-boot-spi/maste

author
#2 lore raw

PATCH v2 2/6 spi: Remove used spi_init

In reply to Jagan Teki

spi_init used in some areas in tree, but the respective drivers will remove in future patches.

So remove the same instances.

---
 common/board_f.c                    | 2 --
 doc/driver-model/spi-howto.txt      | 5 -----
 examples/standalone/atmel_df_pow2.c | 2 --
 include/_exports.h                  | 2 --
 4 files changed, 11 deletions(-)
common/board_f.c +0 -2
index f1a1432d86..60634e52cd 100644
@@ -23,7 +23,6 @@
 #include <os.h>
 #include <post.h>
 #include <relocate.h>
-#include <spi.h>
 #include <status_led.h>
 #include <sysreset.h>
 #include <timer.h>
@@ -262,7 +261,6 @@ __weak int init_func_vid(void)
 static int init_func_spi(void)
 {
 	puts("SPI:   ");
-	spi_init();
 	puts("ready\n");
 	return 0;
 }
doc/driver-model/spi-howto.txt +0 -5
index 1955ffe284..38c26f642b 100644
@@ -163,11 +163,6 @@ At this point you should be able to build U-Boot for your board with the
 empty SPI driver. You still have empty methods in your driver, but we will
 write these one by one.
 
-If you have spi_init() functions or the like that are called from your
-board then the build will fail. Remove these calls and make a note of the
-init that needs to be done.
-
-
 7. Set up your platform data structure
 
 This will hold the information your driver to operate, like its hardware
examples/standalone/atmel_df_pow2.c +0 -2
index 2e14aba390..b7bd243730 100644
@@ -126,8 +126,6 @@ int atmel_df_pow2(int argc, char * const argv[])
 		return 1;
 	}
 
-	spi_init();
-
 	while (1) {
 		struct spi_slave *slave;
 		char *line, *p;
include/_exports.h +0 -2
index 5416041243..c15050e30b 100644
@@ -50,11 +50,9 @@
 #endif
 
 #if !defined(CONFIG_CMD_SPI) || defined(CONFIG_DM_SPI)
-	EXPORT_FUNC(dummy, void, spi_init, void)
 	EXPORT_FUNC(dummy, void, spi_setup_slave, void)
 	EXPORT_FUNC(dummy, void, spi_free_slave, void)
 #else
-	EXPORT_FUNC(spi_init, void, spi_init, void)
 	EXPORT_FUNC(spi_setup_slave, struct spi_slave *, spi_setup_slave,
 		    unsigned int, unsigned int, unsigned int, unsigned int)
 	EXPORT_FUNC(spi_free_slave, void, spi_free_slave, struct spi_slave *)
Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#3 lore raw

PATCH v2 3/6 spi: mpc8xx: Migrate to DM_SPI

In reply to Jagan Teki

From: Christophe Leroy <[email protected]>

Drop non-dm code and migrate into DM_SPI.

[jagan: Move config menu in DM_SPI area]
---
 drivers/spi/Kconfig      |  12 +--
 drivers/spi/mpc8xx_spi.c | 179 +++++++--------------------------------
 2 files changed, 36 insertions(+), 155 deletions(-)
drivers/spi/Kconfig +6 -6
index 4a8a38b863..a7bb5b35c2 100644
@@ -124,6 +124,12 @@ config MESON_SPIFC
 	  This driver can be used to access the SPI NOR flash chips on
 	  Amlogic Meson SoCs.
 
+config MPC8XX_SPI
+	bool "MPC8XX SPI Driver"
+	depends on MPC8xx
+	help
+	  Enable support for SPI on MPC8XX
+
 config MT7621_SPI
 	bool "MediaTek MT7621 SPI driver"
 	depends on ARCH_MT7620
@@ -343,12 +349,6 @@ config LPC32XX_SSP
 	help
 	  Enable support for SPI on LPC32xx
 
-config MPC8XX_SPI
-	bool "MPC8XX SPI Driver"
-	depends on MPC8xx
-	help
-	  Enable support for SPI on MPC8XX
-
 config MPC8XXX_SPI
 	bool "MPC8XXX SPI Driver"
 	help
drivers/spi/mpc8xx_spi.c +30 -149

224 lines not on this page · raw message

Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#4 lore raw

PATCH v2 4/6 spi: Remove unused mpc8xx code

In reply to Jagan Teki

- spi_init_f
- spi_init_r
- spi_read
- spi_write

these spi calls are exclusively for mpc8xx, but the relevant driver is not available so remove it.

---
 cmd/eeprom.c     | 15 +--------------
 common/board_r.c |  7 -------
 include/common.h |  7 -------
 3 files changed, 1 insertion(+), 28 deletions(-)
cmd/eeprom.c +1 -14
index 4052cf494a..9136630ada 100644
@@ -66,11 +66,6 @@ __weak int eeprom_write_enable(unsigned dev_addr, int state)
 
 void eeprom_init(int bus)
 {
-	/* SPI EEPROM */
-#if defined(CONFIG_MPC8XX_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-	spi_init_f();
-#endif
-
 	/* I2C EEPROM */
 #if defined(CONFIG_SYS_I2C)
 	if (bus >= 0)
@@ -129,14 +124,6 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
 {
 	int ret = 0;
 
-	/* SPI */
-#if defined(CONFIG_MPC8XX_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-	if (read)
-		spi_read(addr, alen, buffer, len);
-	else
-		spi_write(addr, alen, buffer, len);
-#else	/* I2C */
-
 #if defined(CONFIG_SYS_I2C_EEPROM_BUS)
 	i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
 #endif
@@ -148,7 +135,7 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
 
 	if (ret)
 		ret = 1;
-#endif
+
 	return ret;
 }
 
common/board_r.c +0 -7
index c55e33eec2..3ccef5467b 100644
@@ -382,13 +382,6 @@ static int initr_flash(void)
 #if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
 static int initr_spi(void)
 {
-	/* MPC8xx does this here */
-#ifdef CONFIG_MPC8XX_SPI
-#if !defined(CONFIG_ENV_IS_IN_EEPROM)
-	spi_init_f();
-#endif
-	spi_init_r();
-#endif
 	return 0;
 }
 #endif
include/common.h +0 -7
index 3f69943887..cfbdf7ebcb 100644
@@ -276,13 +276,6 @@ int  eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned c
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
-#if defined(CONFIG_MPC8XX_SPI)
-extern void spi_init_f (void);
-extern void spi_init_r (void);
-extern ssize_t spi_read	 (uchar *, int, uchar *, int);
-extern ssize_t spi_write (uchar *, int, uchar *, int);
-#endif
-
 /* $(BOARD)/$(BOARD).c */
 int board_early_init_f (void);
 int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its relocation */
Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#5 lore raw

PATCH v2 5/6 spi: Zap CONFIG_HARD_SPI

In reply to Jagan Teki

In legacy CONFIG_HARD_SPI initalizing spi_init code, which was removed during dm conversion cleanup.

So remove the dead instances of CONFIG_HARD_SPI, and related code.

---
 README                                    |  8 --------
 arch/powerpc/include/asm/config.h         |  7 -------
 board/freescale/mpc8349emds/mpc8349emds.c |  2 +-
 board/ids/ids8313/ids8313.c               |  2 +-
 common/board_f.c                          | 12 ------------
 include/configs/M52277EVB.h               |  1 -
 include/configs/M54418TWR.h               |  1 -
 include/configs/M54451EVB.h               |  1 -
 include/configs/M54455EVB.h               |  1 -
 include/configs/MPC8536DS.h               |  5 -----
 include/configs/P1022DS.h                 |  6 ------
 include/configs/UCP1020.h                 |  5 -----
 include/configs/controlcenterd.h          |  4 ----
 include/configs/dreamplug.h               |  1 -
 include/configs/ds109.h                   |  1 -
 include/configs/ids8313.h                 | 10 ----------
 include/configs/mx31pdk.h                 |  1 -
 include/configs/mxs.h                     |  1 -
 include/configs/p1_p2_rdb_pc.h            |  5 -----
 include/configs/p1_twr.h                  |  5 -----
 include/configs/stmark2.h                 |  1 -
 include/configs/ts4800.h                  |  5 -----
 scripts/config_whitelist.txt              |  1 -
 23 files changed, 2 insertions(+), 84 deletions(-)
README +0 -8
index a46c7c63a4..17d56b8034 100644
@@ -1932,14 +1932,6 @@ The following options need to be configured:
 		SPI configuration items (port pins to use, etc). For
 		an example, see include/configs/sacsng.h.
 
-		CONFIG_HARD_SPI
-
-		Enables a hardware SPI driver for general-purpose reads
-		and writes.  As with CONFIG_SOFT_SPI, the board configuration
-		must define a list of chip-select function pointers.
-		Currently supported on some MPC8xxx processors.	 For an
-		example, see include/configs/mpc8349emds.h.
-
 		CONFIG_SYS_SPI_MXC_WAIT
 		Timeout for waiting until spi transfer completed.
 		default: (CONFIG_SYS_HZ/100)     /* 10 ms */
arch/powerpc/include/asm/config.h +0 -7
index 849a69aced..c9c9964630 100644
@@ -18,13 +18,6 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-/* CONFIG_HARD_SPI triggers SPI bus initialization in PowerPC */
-#if defined(CONFIG_MPC8XXX_SPI) || defined(CONFIG_FSL_ESPI)
-# ifndef CONFIG_HARD_SPI
-#  define CONFIG_HARD_SPI
-# endif
-#endif
-
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
board/freescale/mpc8349emds/mpc8349emds.c +1 -1
index 4ec0af4d1c..d40ed3742e 100644
@@ -273,7 +273,7 @@ void spi_cs_deactivate(struct spi_slave *slave)
 
 	iopd->dat |=  SPI_CS_MASK;
 }
-#endif /* CONFIG_HARD_SPI */
+#endif
 
 #if defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, bd_t *bd)
board/ids/ids8313/ids8313.c +1 -1
index a411d4e7f6..d547af4b05 100644
@@ -208,4 +208,4 @@ void spi_cs_deactivate(struct spi_slave *slave)
 	/* deactivate the spi_cs */
 	setbits_be32(&iopd->dat, IDSCPLD_SPI_CS_MASK);
 }
-#endif /* CONFIG_HARD_SPI */
+#endif
common/board_f.c +0 -12
index 60634e52cd..a3e80ca951 100644
@@ -257,15 +257,6 @@ __weak int init_func_vid(void)
 }
 #endif
 
-#if defined(CONFIG_HARD_SPI)
-static int init_func_spi(void)
-{
-	puts("SPI:   ");
-	puts("ready\n");
-	return 0;
-}
-#endif
-
 static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
@@ -863,9 +854,6 @@ static const init_fnc_t init_sequence_f[] = {
 #endif
 #if defined(CONFIG_VID) && !defined(CONFIG_SPL)
 	init_func_vid,
-#endif
-#if defined(CONFIG_HARD_SPI)
-	init_func_spi,
 #endif
 	announce_dram_init,
 	dram_init,		/* configure available RAM banks */
include/configs/M52277EVB.h +0 -1
index 11cb3955da..83d774527a 100644
@@ -102,7 +102,6 @@
 
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
-#define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
 #	define CONFIG_SYS_DSPI_CS2
include/configs/M54418TWR.h +0 -1
index f08896ef0a..4b8ef38c0b 100644
@@ -151,7 +151,6 @@
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
 #define CONFIG_SERIAL_FLASH
-#define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
 
include/configs/M54451EVB.h +0 -1
index 16becbdbed..87cdbae1db 100644
@@ -116,7 +116,6 @@
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
 #define CONFIG_SERIAL_FLASH
-#define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
 
include/configs/M54455EVB.h +0 -1
index 99b60d5d82..d41b7c4492 100644
@@ -142,7 +142,6 @@
 
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
-#define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x13
 #ifdef CONFIG_CMD_SPI
 
include/configs/MPC8536DS.h +0 -5
index 524a10fc95..86a1233e32 100644
@@ -370,11 +370,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_SYS_EEPROM_BUS_NUM	1
 
-/*
- * eSPI - Enhanced SPI
- */
-#define CONFIG_HARD_SPI
-
 #if defined(CONFIG_SPI_FLASH)
 #define CONFIG_SF_DEFAULT_SPEED	10000000
 #define CONFIG_SF_DEFAULT_MODE	0
include/configs/P1022DS.h +0 -6
index c9ed70ca4c..eeb19a9fa6 100644
@@ -386,12 +386,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_SYS_EEPROM_BUS_NUM	1
 
-/*
- * eSPI - Enhanced SPI
- */
-
-#define CONFIG_HARD_SPI
-
 #define CONFIG_SF_DEFAULT_SPEED		10000000
 #define CONFIG_SF_DEFAULT_MODE		0
 
include/configs/UCP1020.h +0 -5
index 423ecd71c2..1bbe9d9b37 100644
@@ -287,11 +287,6 @@
 #define CONFIG_SYS_I2C_NCT72_ADDR	0x4C
 #define CONFIG_SYS_I2C_IDT6V49205B	0x69
 
-/*
- * eSPI - Enhanced SPI
- */
-#define CONFIG_HARD_SPI
-
 #define CONFIG_SF_DEFAULT_SPEED		10000000
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 
include/configs/controlcenterd.h +0 -4
index 4adcd956ef..1908d35bcc 100644
@@ -182,10 +182,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 
 #ifndef CONFIG_TRAILBLAZER
-/*
- * eSPI - Enhanced SPI
- */
-#define CONFIG_HARD_SPI
 
 #define CONFIG_SF_DEFAULT_SPEED		10000000
 #define CONFIG_SF_DEFAULT_MODE		0
include/configs/dreamplug.h +0 -1
index 1c94bf9fa1..f4d717213c 100644
@@ -35,7 +35,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_HARD_SPI			1
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		50000000 /* 50 MHz */
include/configs/ds109.h +0 -1
index c06f0058de..2c7928e88c 100644
@@ -38,7 +38,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_HARD_SPI			1
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		50000000 /* 50 MHz */
include/configs/ids8313.h +0 -10
index 28124dd4b1..7e4c497fe0 100644
@@ -159,7 +159,6 @@
  */
 #define CONFIG_TSEC1
 #define CONFIG_TSEC2
-#define CONFIG_HARD_SPI
 
 /*
  * NOR FLASH setup
@@ -273,15 +272,6 @@
 #define CONFIG_RTC_PCF8563
 #define CONFIG_SYS_I2C_RTC_ADDR	0x51
 
-/*
- * SPI setup
- */
-#ifdef CONFIG_HARD_SPI
-#define CONFIG_SYS_GPIO1_PRELIM
-#define CONFIG_SYS_GPIO1_DIR		0x00000001
-#define CONFIG_SYS_GPIO1_DAT		0x00000001
-#endif
-
 /*
  * Ethernet setup
  */
include/configs/mx31pdk.h +0 -1
index 7d84d160b4..4765764f83 100644
@@ -43,7 +43,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-#define CONFIG_HARD_SPI
 #define CONFIG_DEFAULT_SPI_BUS	1
 #define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 
include/configs/mxs.h +0 -1
index 9e59e7a4dc..4bb3621a42 100644
@@ -143,7 +143,6 @@
 
 /* SPI */
 #ifdef CONFIG_CMD_SPI
-#define CONFIG_HARD_SPI
 #define CONFIG_SPI_HALF_DUPLEX
 #endif
 
include/configs/p1_p2_rdb_pc.h +0 -5
index 9465fb4702..459ecf328f 100644
@@ -576,11 +576,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
 
-/*
- * eSPI - Enhanced SPI
- */
-#define CONFIG_HARD_SPI
-
 #if defined(CONFIG_SPI_FLASH)
 #define CONFIG_SF_DEFAULT_SPEED	10000000
 #define CONFIG_SF_DEFAULT_MODE	0
include/configs/p1_twr.h +0 -5
index d018c22afd..4f48370648 100644
@@ -214,11 +214,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
 
-/*
- * eSPI - Enhanced SPI
- */
-#define CONFIG_HARD_SPI
-
 #if defined(CONFIG_PCI)
 /*
  * General PCI
include/configs/stmark2.h +0 -1
index c408db865e..33ddc67bf4 100644
@@ -66,7 +66,6 @@
 #define CONFIG_CF_DSPI
 #define CONFIG_SF_DEFAULT_SPEED		50000000
 #define CONFIG_SERIAL_FLASH
-#define CONFIG_HARD_SPI
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		1
 
include/configs/ts4800.h +0 -5
index 956f7795f1..4e274bd414 100644
@@ -42,11 +42,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-/*
- * SPI Configs
- * */
-#define CONFIG_HARD_SPI /* puts SPI: ready */
-
 /*
  * MMC Configs
  * */
scripts/config_whitelist.txt +0 -1
index abfb0ff89f..1404fd855b 100644
@@ -750,7 +750,6 @@ CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_H264_FREQ
 CONFIG_H8300
-CONFIG_HARD_SPI
 CONFIG_HAS_ETH0
 CONFIG_HAS_ETH1
 CONFIG_HAS_ETH2
Signature · 1 line
2.18.0.321.gffc6fa0e3
author
#6 lore raw

PATCH v2 6/6 board_r: Remove initr_spi

In reply to Jagan Teki

Drop unused initr_spi, which just return 0, no usage.

---
 common/board_r.c | 11 -----------
 1 file changed, 11 deletions(-)
common/board_r.c +0 -11
index 3ccef5467b..2f982b1646 100644
@@ -36,7 +36,6 @@
 #include <onenand_uboot.h>
 #include <scsi.h>
 #include <serial.h>
-#include <spi.h>
 #include <stdio_dev.h>
 #include <timer.h>
 #include <trace.h>
@@ -379,13 +378,6 @@ static int initr_flash(void)
 }
 #endif
 
-#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
-static int initr_spi(void)
-{
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_CMD_NAND
 /* go init the NAND */
 static int initr_nand(void)
@@ -736,9 +728,6 @@ static init_fnc_t init_sequence_r[] = {
 	/* initialize higher level parts of CPU like time base and timers */
 	cpu_init_r,
 #endif
-#ifdef CONFIG_PPC
-	initr_spi,
-#endif
 #ifdef CONFIG_CMD_NAND
 	initr_nand,
 #endif
Signature · 1 line
2.18.0.321.gffc6fa0e3