summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2011-08-09 17:21:25 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:59:25 -0700
commitff439240ebce0423e107eea71ab31fdaaece25cd (patch)
tree1b3bd48e4cf907d019d063598786b42e9b986c60 /drivers
parentb10f52c2fae92cad01bf57bf9f6956a4a33dafa0 (diff)
Make the dummy SPI driver able to support the new spi_xfer format
BUG=chrome-os-partner:4722 TEST=With this and related changes, built for x86-alex, tegra2_kaen, tegra2_aebl, tegra2_seaboard, and tegra2_asymptote. Flashed the firmware on a Kaen, verified the checksums matched, and booted to ChromeOS login. Built with the option turned off on x86-alex and tegra2_kaen. Change-Id: I827f3aa118eeeb3c35e6e9b815568130c030d291 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://gerrit.chromium.org/gerrit/5616
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/dummy_spi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spi/dummy_spi.c b/drivers/spi/dummy_spi.c
index 3df5965fbd..df539055ad 100644
--- a/drivers/spi/dummy_spi.c
+++ b/drivers/spi/dummy_spi.c
@@ -56,8 +56,13 @@ void spi_cs_deactivate(struct spi_slave *slave)
printf("spi_cs_deactivate used but not implemented.\n");
}
+#ifdef CONFIG_NEW_SPI_XFER
+int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout,
+ void *din, unsigned int bitsin)
+#else
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
void *din, unsigned long flags)
+#endif
{
printf("spi_xfer used but not implemented.\n");
return 0;