[coreboot-gerrit] Change in coreboot[master]: soc/nvidia/tegra*: Move spi driver to use spi_bus_map

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded a new change for review. ( 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 at chromium.org>
---
M src/soc/nvidia/tegra124/spi.c
M src/soc/nvidia/tegra210/spi.c
2 files changed, 36 insertions(+), 22 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/19769/1

diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 4ecd67a..3e281c3 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -793,22 +793,29 @@
 	return ret;
 }
 
+static int spi_ctrlr_setup(const struct spi_slave *slave)
+{
+	struct tegra_spi_channel *channel = to_tegra_spi(slave->bus);
+	if (!channel)
+		return -1;
+
+	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,
 };
 
-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..e3246ec 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -829,22 +829,29 @@
 	return ret;
 }
 
+static int spi_ctrlr_setup(const struct spi_slave *slave)
+{
+	struct tegra_spi_channel *channel = to_tegra_spi(slave->bus);
+	if (!channel)
+		return -1;
+
+	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,
 };
 
-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);

-- 
To view, visit https://review.coreboot.org/19769
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I873b96d286655a814554bfd89f899ee87302b06d
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Furquan Shaikh <furquan at google.com>