The patch titled
SPI: add 3wire mode flag
has been added to the -mm tree. Its filename is
spi-add-3wire-mode-flag.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: SPI: add 3wire mode flag
From: David Brownell <david-b@xxxxxxxxxxx>
Add a new spi->mode bit: SPI_3WIRE, for chips where the SI and SO signals
are shared (and which are thus only half duplex). Update the LM70 driver
to require support for that hardware mode from the controller.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/lm70.c | 4 ++++
include/linux/spi/spi.h | 1 +
2 files changed, 5 insertions(+)
diff -puN drivers/hwmon/lm70.c~spi-add-3wire-mode-flag drivers/hwmon/lm70.c
--- a/drivers/hwmon/lm70.c~spi-add-3wire-mode-flag
+++ a/drivers/hwmon/lm70.c
@@ -96,6 +96,10 @@ static int __devinit lm70_probe(struct s
struct lm70 *p_lm70;
int status;
+ /* signaling is SPI_MODE_0 on a 3-wire link (shared SI/SO) */
+ if ((spi->mode & (SPI_CPOL|SPI_CPHA)) || !spi->mode & SPI_3WIRE)
+ return -EINVAL;
+
p_lm70 = kzalloc(sizeof *p_lm70, GFP_KERNEL);
if (!p_lm70)
return -ENOMEM;
diff -puN include/linux/spi/spi.h~spi-add-3wire-mode-flag include/linux/spi/spi.h
--- a/include/linux/spi/spi.h~spi-add-3wire-mode-flag
+++ a/include/linux/spi/spi.h
@@ -76,6 +76,7 @@ struct spi_device {
#define SPI_MODE_3 (SPI_CPOL|SPI_CPHA)
#define SPI_CS_HIGH 0x04 /* chipselect active high? */
#define SPI_LSB_FIRST 0x08 /* per-word bits-on-wire */
+#define SPI_3WIRE 0x10 /* SI/SO signals shared */
u8 bits_per_word;
int irq;
void *controller_state;
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
spi-doc-update-describe-clock-mode-bits.patch
git-leds.patch
git-mmc.patch
at91-fix-enable-disable_irq_wake-symmetry-in-pcmcia-driver.patch
fix-usb-ohci-subvendor-for-toshiba-portege-4000.patch
ehci-fsl-fix-cache-coherency-problem-on-system-with-large-memory.patch
spi-controller-drivers-check-for-unsupported-modes.patch
spi-add-3wire-mode-flag.patch
rtc-ds1307-cleanups.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
