summaryrefslogtreecommitdiffstats
path: root/nicintel_spi.c
diff options
context:
space:
mode:
authorAnastasia Klimchuk <aklm@chromium.org>2021-05-26 09:54:08 +1000
committerEdward O'Callaghan <quasisec@chromium.org>2021-06-03 05:19:37 +0000
commit5f5eaeb7fa9b8443ff3656dd55041fd59582edf4 (patch)
tree33073db96a5fc583d3f8811e7351546ec99c58ff /nicintel_spi.c
parent30815fc3706194117c633393d1ed65941a5afafd (diff)
downloadflashrom-5f5eaeb7fa9b8443ff3656dd55041fd59582edf4.tar.gz
flashrom-5f5eaeb7fa9b8443ff3656dd55041fd59582edf4.tar.bz2
flashrom-5f5eaeb7fa9b8443ff3656dd55041fd59582edf4.zip
bitbang: Extend bitbang_spi_master functions to accept spi data
This way every bitbang spi master has access to its own spi data, and can use this data in all its functions. This patch only changes the signatures of functions. BUG=b:185191942 TEST=builds Change-Id: Id5722a43ce20feeed62630ad80e14df7744f9c02 Signed-off-by: Anastasia Klimchuk <aklm@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54991 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Diffstat (limited to 'nicintel_spi.c')
-rw-r--r--nicintel_spi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 03df8efcd..9e97840fa 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -107,7 +107,7 @@ const struct dev_entry nics_intel_spi[] = {
{0},
};
-static void nicintel_request_spibus(void)
+static void nicintel_request_spibus(void *spi_data)
{
uint32_t tmp;
@@ -119,7 +119,7 @@ static void nicintel_request_spibus(void)
while (!(pci_mmio_readl(nicintel_spibar + FLA) & BIT(FL_GNT))) ;
}
-static void nicintel_release_spibus(void)
+static void nicintel_release_spibus(void *spi_data)
{
uint32_t tmp;
@@ -128,7 +128,7 @@ static void nicintel_release_spibus(void)
pci_mmio_writel(tmp, nicintel_spibar + FLA);
}
-static void nicintel_bitbang_set_cs(int val)
+static void nicintel_bitbang_set_cs(int val, void *spi_data)
{
uint32_t tmp;
@@ -138,7 +138,7 @@ static void nicintel_bitbang_set_cs(int val)
pci_mmio_writel(tmp, nicintel_spibar + FLA);
}
-static void nicintel_bitbang_set_sck(int val)
+static void nicintel_bitbang_set_sck(int val, void *spi_data)
{
uint32_t tmp;
@@ -148,7 +148,7 @@ static void nicintel_bitbang_set_sck(int val)
pci_mmio_writel(tmp, nicintel_spibar + FLA);
}
-static void nicintel_bitbang_set_mosi(int val)
+static void nicintel_bitbang_set_mosi(int val, void *spi_data)
{
uint32_t tmp;
@@ -158,7 +158,7 @@ static void nicintel_bitbang_set_mosi(int val)
pci_mmio_writel(tmp, nicintel_spibar + FLA);
}
-static int nicintel_bitbang_get_miso(void)
+static int nicintel_bitbang_get_miso(void *spi_data)
{
uint32_t tmp;