Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/19769 )
Change subject: soc/nvidia/tegra*: Move spi driver to use spi_bus_map ......................................................................
soc/nvidia/tegra*: Move spi driver to use spi_bus_map
This is in preparation to get rid of the strong spi_setup_slave implemented by different platforms.
BUG=b:38430839
Change-Id: I873b96d286655a814554bfd89f899ee87302b06d Signed-off-by: Furquan Shaikh furquan@chromium.org Reviewed-on: https://review.coreboot.org/19769 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Julius Werner jwerner@chromium.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Philippe Mathieu-Daudé philippe.mathieu.daude@gmail.com --- M src/soc/nvidia/tegra124/spi.c M src/soc/nvidia/tegra210/spi.c 2 files changed, 16 insertions(+), 22 deletions(-)
Approvals: Aaron Durbin: Looks good to me, approved Philippe Mathieu-Daudé: Looks good to me, but someone else must approve Julius Werner: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c index 4ecd67a..ae07d53 100644 --- a/src/soc/nvidia/tegra124/spi.c +++ b/src/soc/nvidia/tegra124/spi.c @@ -800,15 +800,12 @@ .max_xfer_size = SPI_CTRLR_DEFAULT_MAX_XFER_SIZE, };
-int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) -{ - struct tegra_spi_channel *channel = to_tegra_spi(bus); - if (!channel) - return -1; +const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = { + { + .ctrlr = &spi_ctrlr, + .bus_start = 1, + .bus_end = ARRAY_SIZE(tegra_spi_channels) + }, +};
- slave->bus = channel->slave.bus; - slave->cs = channel->slave.cs; - slave->ctrlr = &spi_ctrlr; - - return 0; -} +const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map); diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c index 0987ddb..54e46f1 100644 --- a/src/soc/nvidia/tegra210/spi.c +++ b/src/soc/nvidia/tegra210/spi.c @@ -836,15 +836,12 @@ .max_xfer_size = SPI_CTRLR_DEFAULT_MAX_XFER_SIZE, };
-int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) -{ - struct tegra_spi_channel *channel = to_tegra_spi(bus); - if (!channel) - return -1; +const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = { + { + .ctrlr = &spi_ctrlr, + .bus_start = 1, + .bus_end = ARRAY_SIZE(tegra_spi_channels) + }, +};
- slave->cs = channel->slave.cs; - slave->bus = channel->slave.bus; - slave->ctrlr = &spi_ctrlr; - - return 0; -} +const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);