From 87f3b4ea01ca90eb242dbf1a8b829d1fb3aaaa7d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 27 Mar 2014 20:06:03 -0700 Subject: spi: Remove the spi_set_speed and spi_cs_is_valid functions. spi_set_speed was never implemented, and spi_cs_is_valid was only implemented as a stub and never called. BUG=None TEST=Built for rambi, falco, and peach_pit. BRANCH=None Original-Change-Id: If30c2339f5e0360a5099eb540fab73fb23582905 Original-Signed-off-by: Gabe Black Original-Reviewed-on: https://chromium-review.googlesource.com/192045 Original-Reviewed-by: Hung-Te Lin Original-Tested-by: Gabe Black Original-Reviewed-by: David Hendricks Original-Commit-Queue: Gabe Black (cherry picked from commit 98c1f6014c512e75e989df36b48622a7b56d0582) Signed-off-by: Marc Jones Change-Id: Iebdb2704ee81aee432c83ab182246d31ef52a6b6 Reviewed-on: http://review.coreboot.org/7707 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/include/spi-generic.h | 17 ----------------- src/soc/intel/baytrail/spi.c | 6 ------ src/soc/intel/fsp_baytrail/spi.c | 6 ------ src/soc/samsung/exynos5420/spi.c | 5 ----- src/southbridge/intel/common/spi.c | 6 ------ src/southbridge/intel/fsp_rangeley/spi.c | 6 ------ 6 files changed, 46 deletions(-) diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h index 6c1bc1e1fb..931376db3e 100644 --- a/src/include/spi-generic.h +++ b/src/include/spi-generic.h @@ -116,15 +116,6 @@ void spi_release_bus(struct spi_slave *slave); int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bytesout, void *din, unsigned int bytesin); -/*----------------------------------------------------------------------- - * Determine if a SPI chipselect is valid. - * This function is provided by the board if the low-level SPI driver - * needs it to determine if a given chipselect is actually valid. - * - * Returns: 1 if bus:cs identifies a valid chip on this board, 0 - * otherwise. - */ -int spi_cs_is_valid(unsigned int bus, unsigned int cs); /*----------------------------------------------------------------------- * Activate a SPI chipselect. @@ -144,14 +135,6 @@ void spi_cs_activate(struct spi_slave *slave); */ void spi_cs_deactivate(struct spi_slave *slave); -/*----------------------------------------------------------------------- - * Set transfer speed. - * This sets a new speed to be applied for next spi_xfer(). - * slave: The SPI slave - * hz: The transfer speed - */ -void spi_set_speed(struct spi_slave *slave, uint32_t hz); - unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len); /*----------------------------------------------------------------------- diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c index 10dbe44d01..7dd21e849e 100644 --- a/src/soc/intel/baytrail/spi.c +++ b/src/soc/intel/baytrail/spi.c @@ -266,12 +266,6 @@ static void ich_set_bbar(uint32_t minaddr) writel_(ichspi_bbar, cntlr.bbar); } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - printk(BIOS_DEBUG, "spi_cs_is_valid used but not implemented\n"); - return 0; -} - struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) { ich_spi_slave *slave = malloc(sizeof(*slave)); diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c index 5057cdeb23..f62164a4a2 100644 --- a/src/soc/intel/fsp_baytrail/spi.c +++ b/src/soc/intel/fsp_baytrail/spi.c @@ -264,12 +264,6 @@ static void ich_set_bbar(uint32_t minaddr) writel_(ichspi_bbar, cntlr.bbar); } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - printk(BIOS_DEBUG, "spi_cs_is_valid used but not implemented\n"); - return 0; -} - struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) { ich_spi_slave *slave = malloc(sizeof(*slave)); diff --git a/src/soc/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c index c8661e1852..31611e3ed6 100644 --- a/src/soc/samsung/exynos5420/spi.c +++ b/src/soc/samsung/exynos5420/spi.c @@ -133,11 +133,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) return &eslave->slave; } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - return bus > 0 && bus < 3; -} - void spi_cs_activate(struct spi_slave *slave) { struct exynos_spi *regs = to_exynos_spi(slave)->regs; diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 2ea9a24142..c35e8b7413 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -293,12 +293,6 @@ static void ich_set_bbar(uint32_t minaddr) writel_(ichspi_bbar, cntlr.bbar); } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - printk(BIOS_DEBUG, "spi_cs_is_valid used but not implemented\n"); - return 0; -} - struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) { ich_spi_slave *slave = malloc(sizeof(*slave)); diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c index 6df99fdc80..33f645945f 100644 --- a/src/southbridge/intel/fsp_rangeley/spi.c +++ b/src/southbridge/intel/fsp_rangeley/spi.c @@ -329,12 +329,6 @@ static void ich_set_bbar(uint32_t minaddr) writel_(ichspi_bbar, cntlr.bbar); } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - printk(BIOS_DEBUG, "spi_cs_is_valid used but not implemented\n"); - return 0; -} - struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) { ich_spi_slave *slave = malloc(sizeof(*slave)); -- cgit v1.2.3