erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi: Remove unused parameters from spi_flash_probe and setup_spi_slave.

Browse source 
The spi_flash_probe and and spi_setup_slave functions each took a max_hz
parameter and a spi_mode parameter which were never used.

BUG=None
TEST=Built for link, falco, rambi, nyan.
BRANCH=None

Change-Id: I3a2e0a9ab530bcc0f722f81f00e8c7bd1f6d2a22
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/192046
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
This commit is contained in:
Gabe Black 2014-03-27 20:37:03 -07:00 • committed by chrome-internal-fetch
commit 42bf907986
16 changed files with 19 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/amd/agesa/s3_resume.c
View file

@ -157,7 +157,7 @@ void OemAgesaSaveMtrr(void)
spi_init();
flash = spi_flash_probe(0, 0, 0, 0);
flash = spi_flash_probe(0, 0);
if (!flash) {
printk(BIOS_DEBUG, "Could not find SPI device\n");
return;
@ -272,7 +272,7 @@ u32 OemAgesaSaveS3Info(S3_DATA_TYPE S3DataType, u32 DataSize, void *Data)
}
spi_init();
flash = spi_flash_probe(0, 0, 0, 0);
flash = spi_flash_probe(0, 0);
if (!flash) {
printk(BIOS_DEBUG, "Could not find SPI device\n");
/* Dont make flow stop. */

2
src/drivers/elog/elog.c
View file

@ -547,7 +547,7 @@ int elog_init(void)
/* Prepare SPI */
spi_init();
elog_spi = spi_flash_probe(0, 0, 0, 0);
elog_spi = spi_flash_probe(0, 0);
if (!elog_spi) {
printk(BIOS_ERR, "ELOG: Unable to find SPI flash\n");
return -1;

5
src/drivers/spi/spi_flash.c
View file

@ -246,15 +246,14 @@ static struct {
};
#define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN)
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode)
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs)
{
struct spi_slave *spi;
struct spi_flash *flash = NULL;
int ret, i, shift;
u8 idcode[IDCODE_LEN], *idp;
spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
spi = spi_setup_slave(bus, cs);
if (!spi) {
printk(BIOS_WARNING, "SF: Failed to set up slave\n");
return NULL;

9
src/ec/google/chromeec/ec_spi.c
View file

@ -23,8 +23,6 @@
#include <spi-generic.h>
#include <timer.h>
#define CROSEC_SPI_SPEED (500000)
static const uint8_t EcFramingByte = 0xec;
static int crosec_spi_io(uint8_t *write_bytes, size_t write_size,
@ -80,12 +78,9 @@ static int crosec_spi_io(uint8_t *write_bytes, size_t write_size,
int google_chromeec_command(struct chromeec_command *cec_command)
{
static struct spi_slave *slave = NULL;
if (!slave) {
if (!slave)
slave = spi_setup_slave(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS,
CONFIG_EC_GOOGLE_CHROMEEC_SPI_CHIP,
CROSEC_SPI_SPEED,
SPI_READ_FLAG | SPI_WRITE_FLAG);
}
CONFIG_EC_GOOGLE_CHROMEEC_SPI_CHIP);
return crosec_command_proto(cec_command, crosec_spi_io, slave);
}

5
src/include/spi-generic.h
View file

@ -82,14 +82,11 @@ void spi_init(void);
*
* bus: Bus ID of the slave chip.
* cs: Chip select ID of the slave chip on the specified bus.
* max_hz: Maximum SCK rate in Hz.
* mode: Clock polarity, clock phase and other parameters.
*
* Returns: A spi_slave reference that can be used in subsequent SPI
* calls, or NULL if one or more of the parameters are not supported.
*/
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode);
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs);
/*-----------------------------------------------------------------------
* Claim the bus and prepare it for communication with a given slave.

3
src/include/spi_flash.h
View file

@ -66,8 +66,7 @@ struct spi_flash {
size_t len);
};
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int spi_mode);
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs);
static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
size_t len, void *buf)

2
src/northbridge/intel/haswell/mrccache.c
View file

@ -192,7 +192,7 @@ static void update_mrc_cache(void *unused)
// 1. use spi_flash_probe() to find the flash, then
spi_init();
struct spi_flash *flash = spi_flash_probe(0, 0, 1000000, SPI_MODE_3);
struct spi_flash *flash = spi_flash_probe(0, 0);
if (!flash) {
printk(BIOS_DEBUG, "Could not find SPI device\n");
return;

2
src/northbridge/intel/sandybridge/mrccache.c
View file

@ -192,7 +192,7 @@ static void update_mrc_cache(void *unused)
// 1. use spi_flash_probe() to find the flash, then
spi_init();
struct spi_flash *flash = spi_flash_probe(0, 0, 1000000, SPI_MODE_3);
struct spi_flash *flash = spi_flash_probe(0, 0);
if (!flash) {
printk(BIOS_DEBUG, "Could not find SPI device\n");
return;

2
src/soc/intel/baytrail/nvm.c
View file

@ -37,7 +37,7 @@ static int nvm_init(void)
return 0;
spi_init();
flash = spi_flash_probe(0, 0, 1000000, SPI_MODE_3);
flash = spi_flash_probe(0, 0);
if (!flash) {
printk(BIOS_DEBUG, "Could not find SPI device\n");
return -1;

3
src/soc/intel/baytrail/spi.c
View file

@ -266,8 +266,7 @@ static void ich_set_bbar(uint32_t minaddr)
writel_(ichspi_bbar, cntlr.bbar);
}
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
ich_spi_slave *slave = malloc(sizeof(*slave));

3
src/soc/nvidia/tegra124/spi.c
View file

@ -923,8 +923,7 @@ int initialize_tegra_spi_cbfs_media(struct cbfs_media *media,
return 0;
}
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
struct tegra_spi_channel *channel = to_tegra_spi(bus);
if (!channel)

3
src/soc/samsung/exynos5420/spi.c
View file

@ -122,8 +122,7 @@ static void exynos_spi_init(struct exynos_spi *regs)
spi_sw_reset(regs, 1);
}
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
ASSERT(bus >= 0 && bus < 3);
struct exynos_spi_slave *eslave = &exynos_spi_slaves[bus];

3
src/southbridge/amd/agesa/hudson/spi.c
View file

@ -132,8 +132,7 @@ 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)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
struct spi_slave *slave = malloc(sizeof(*slave));

3
src/southbridge/amd/cimx/sb800/spi.c
View file

@ -164,8 +164,7 @@ 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)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
struct spi_slave *slave = malloc(sizeof(*slave));

3
src/southbridge/intel/bd82x6x/spi.c
View file

@ -279,8 +279,7 @@ static void ich_set_bbar(uint32_t minaddr)
writel_(ichspi_bbar, cntlr.bbar);
}
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
ich_spi_slave *slave = malloc(sizeof(*slave));

3
src/southbridge/intel/lynxpoint/spi.c
View file

@ -266,8 +266,7 @@ static void ich_set_bbar(uint32_t minaddr)
writel_(ichspi_bbar, cntlr.bbar);
}
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
unsigned int max_hz, unsigned int mode)
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
{
ich_spi_slave *slave = malloc(sizeof(*slave));