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

UPSTREAM: soc/qualcomm/ipq*: Move spi driver to use spi_bus_map

Browse source 
This is in preparation to get rid of the strong spi_setup_slave
implemented by different platforms.

BUG=b:38430839

Change-Id: Ie955c903e299be8ff49e73b68c16b37ff833188c
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: e424a59729
Original-Change-Id: I6cc8c339e008e16449fa143c1d21e23534bdaf0b
Original-Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19776
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/514183
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Furquan Shaikh 2017-05-18 14:40:58 -07:00 • committed by chrome-bot
commit daea2a9a13
2 changed files with 47 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/soc/qualcomm/ipq40xx/spi.c
View file

@ -647,18 +647,12 @@ out:
return ret;
}
static const struct spi_ctrlr spi_ctrlr = {
.claim_bus = spi_ctrlr_claim_bus,
.release_bus = spi_ctrlr_release_bus,
.xfer = spi_ctrlr_xfer,
.xfer_vector = spi_xfer_two_vectors,
.max_xfer_size = MAX_PACKET_COUNT,
};
int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
static int spi_ctrlr_setup(const struct spi_slave *slave)
{
struct ipq_spi_slave *ds = NULL;
int i;
unsigned int bus = slave->bus;
unsigned int cs = slave->cs;
if ((bus < BLSP0_SPI) || (bus > BLSP1_SPI)
|| ((bus == BLSP0_SPI) && (cs > 2))
@ -674,9 +668,8 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
continue;
ds = spi_slave_pool + i;
ds->slave.bus = slave->bus = bus;
ds->slave.cs = slave->cs = cs;
slave->ctrlr = &spi_ctrlr;
ds->slave.bus = bus;
ds->slave.cs = cs;
ds->regs = &spi_reg[bus];
/*
@ -694,3 +687,22 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
printk(BIOS_ERR, "SPI error: all %d pools busy\n", i);
return -1;
}
static const struct spi_ctrlr spi_ctrlr = {
.setup = spi_ctrlr_setup,
.claim_bus = spi_ctrlr_claim_bus,
.release_bus = spi_ctrlr_release_bus,
.xfer = spi_ctrlr_xfer,
.xfer_vector = spi_xfer_two_vectors,
.max_xfer_size = MAX_PACKET_COUNT,
};
const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
{
.ctrlr = &spi_ctrlr,
.bus_start = BLSP0_SPI,
.bus_end = BLSP1_SPI,
},
};
const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);

34
src/soc/qualcomm/ipq806x/spi.c
View file

@ -752,17 +752,12 @@ out:
return ret;
}
static const struct spi_ctrlr spi_ctrlr = {
.claim_bus = spi_ctrlr_claim_bus,
.release_bus = spi_ctrlr_release_bus,
.xfer = spi_ctrlr_xfer,
.max_xfer_size = MAX_PACKET_COUNT,
};
int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
static int spi_ctrlr_setup(const struct spi_slave *slave)
{
struct ipq_spi_slave *ds = NULL;
int i;
unsigned int bus = slave->bus;
unsigned int cs = slave->cs;
/*
* IPQ GSBI (Generic Serial Bus Interface) supports SPI Flash
@ -782,9 +777,8 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
continue;
ds = spi_slave_pool + i;
ds->slave.bus = slave->bus = bus;
ds->slave.cs = slave->cs = cs;
slave->ctrlr = &spi_ctrlr;
ds->slave.bus = bus;
ds->slave.cs = cs;
ds->regs = &spi_reg[bus];
/*
@ -802,3 +796,21 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
printk(BIOS_ERR, "SPI error: all %d pools busy\n", i);
return -1;
}
static const struct spi_ctrlr spi_ctrlr = {
.setup = spi_ctrlr_setup,
.claim_bus = spi_ctrlr_claim_bus,
.release_bus = spi_ctrlr_release_bus,
.xfer = spi_ctrlr_xfer,
.max_xfer_size = MAX_PACKET_COUNT,
};
const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
{
.ctrlr = &spi_ctrlr,
.bus_start = GSBI5_SPI,
.bus_end = GSBI7_SPI,
},
};
const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);