From f8662ca3bc6279e70022a063acda7fc80d72dbff Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 18 May 2017 14:44:04 -0700 Subject: soc/samsung/exynos5420: Move spi driver to use spi_bus_map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is in preparation to get rid of the strong spi_setup_slave implemented by different platforms. BUG=b:38430839 Change-Id: Ic937cbf93b87f5e43f7d70140b47fa97bcd7757e Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/19777 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Philippe Mathieu-Daudé --- src/soc/samsung/exynos5420/spi.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'src/soc/samsung/exynos5420') diff --git a/src/soc/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c index c2a5828f14..fa53c0f4a0 100644 --- a/src/soc/samsung/exynos5420/spi.c +++ b/src/soc/samsung/exynos5420/spi.c @@ -208,22 +208,11 @@ static void spi_ctrlr_release_bus(const struct spi_slave *slave) setbits_le32(®s->cs_reg, SPI_SLAVE_SIG_INACT); } -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 = SPI_CTRLR_DEFAULT_MAX_XFER_SIZE, -}; - -int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) +static int spi_ctrlr_setup(const struct spi_slave *slave) { - ASSERT(bus >= 0 && bus < 3); + ASSERT(slave->bus >= 0 && slave->bus < 3); struct exynos_spi_slave *eslave; - slave->bus = bus; - slave->cs = cs; - slave->ctrlr = &spi_ctrlr; - eslave = to_exynos_spi(slave); if (!eslave->initialized) { exynos_spi_init(eslave->regs); @@ -232,6 +221,24 @@ int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) return 0; } +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 = SPI_CTRLR_DEFAULT_MAX_XFER_SIZE, +}; + +const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = { + { + .ctrlr = &spi_ctrlr, + .bus_start = 0, + .bus_end = 2, + }, +}; + +const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map); + static int exynos_spi_read(struct spi_slave *slave, void *dest, uint32_t len, uint32_t off) { -- cgit v1.2.3