diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/qualcomm/ipq40xx/spi.c | 36 | ||||
| -rw-r--r-- | src/soc/qualcomm/ipq806x/spi.c | 34 |
2 files changed, 47 insertions, 23 deletions
diff --git a/src/soc/qualcomm/ipq40xx/spi.c b/src/soc/qualcomm/ipq40xx/spi.c index b5c1f6699a..157903cf50 100644 --- a/src/soc/qualcomm/ipq40xx/spi.c +++ b/src/soc/qualcomm/ipq40xx/spi.c @@ -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); diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c index 9a34f7a948..c20ad9a325 100644 --- a/src/soc/qualcomm/ipq806x/spi.c +++ b/src/soc/qualcomm/ipq806x/spi.c @@ -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); |