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

UPSTREAM: soc/mediatek/mt8173: 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: I5cce241a0726571f522f69d3bfec7c18d621e6e3
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 02c0743a24
Original-Change-Id: Ib0d6e4e8185ce1285b671af5ebcead1d42e049bc
Original-Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19770
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/513959
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 10:57:10 -07:00 • committed by chrome-bot
commit 34d592501f
1 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/soc/mediatek/mt8173/spi.c
View file

@ -289,35 +289,39 @@ static void spi_ctrlr_release_bus(const struct spi_slave *slave)
mtk_slave->state = MTK_SPI_IDLE;
}
static int spi_ctrlr_setup(const struct spi_slave *slave)
{
struct mtk_spi_bus *eslave = to_mtk_spi(slave);
assert(read32(&eslave->regs->spi_cfg0_reg) != 0);
spi_sw_reset(eslave->regs);
return 0;
}
static const struct spi_ctrlr spi_flash_ctrlr = {
.max_xfer_size = 65535,
.flash_probe = mtk_spi_flash_probe,
};
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 = 65535,
.flash_probe = mtk_spi_flash_probe,
};
int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave)
{
struct mtk_spi_bus *eslave;
const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
{
.ctrlr = &spi_ctrlr,
.bus_start = 0,
.bus_end = 0,
},
{
.ctrlr = &spi_flash_ctrlr,
.bus_start = CONFIG_BOOT_DEVICE_SPI_FLASH_BUS,
.bus_end = CONFIG_BOOT_DEVICE_SPI_FLASH_BUS,
},
};
slave->ctrlr = &spi_ctrlr;
switch (bus) {
case CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS:
slave->bus = bus;
slave->cs = cs;
eslave = to_mtk_spi(slave);
assert(read32(&eslave->regs->spi_cfg0_reg) != 0);
spi_sw_reset(eslave->regs);
return 0;
case CONFIG_BOOT_DEVICE_SPI_FLASH_BUS:
slave->bus = bus;
slave->cs = cs;
return 0;
default:
die ("wrong bus number.\n");
};
return -1;
}
const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);