6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
72 lines
2 KiB
Diff
72 lines
2 KiB
Diff
From 4b64ce34aaf88c2869c74efad7cbe5167920625b Mon Sep 17 00:00:00 2001
|
|
From: notro <notro@tronnes.org>
|
|
Date: Sat, 26 Jan 2013 20:38:03 +0100
|
|
Subject: [PATCH 056/196] spi-bcm2708: add 9-bit support using LoSSI mode
|
|
|
|
---
|
|
drivers/spi/spi-bcm2708.c | 30 ++++++++++++++++++++++++++++--
|
|
1 file changed, 28 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/spi/spi-bcm2708.c b/drivers/spi/spi-bcm2708.c
|
|
index b74aa32..abaa5a6 100644
|
|
--- a/drivers/spi/spi-bcm2708.c
|
|
+++ b/drivers/spi/spi-bcm2708.c
|
|
@@ -146,10 +146,31 @@ static inline void bcm2708_rd_fifo(struct bcm2708_spi *bs, int len)
|
|
static inline void bcm2708_wr_fifo(struct bcm2708_spi *bs, int len)
|
|
{
|
|
u8 byte;
|
|
+ u16 val;
|
|
|
|
if (len > bs->len)
|
|
len = bs->len;
|
|
|
|
+ if (unlikely(bcm2708_rd(bs, SPI_CS) & SPI_CS_LEN)) {
|
|
+ /* LoSSI mode */
|
|
+ if (unlikely(len % 2)) {
|
|
+ printk(KERN_ERR"bcm2708_wr_fifo: length must be even, skipping.\n");
|
|
+ bs->len = 0;
|
|
+ return;
|
|
+ }
|
|
+ while (len) {
|
|
+ if (bs->tx_buf) {
|
|
+ val = *(const u16 *)bs->tx_buf;
|
|
+ bs->tx_buf += 2;
|
|
+ } else
|
|
+ val = 0;
|
|
+ bcm2708_wr(bs, SPI_FIFO, val);
|
|
+ bs->len -= 2;
|
|
+ len -= 2;
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+
|
|
while (len--) {
|
|
byte = bs->tx_buf ? *bs->tx_buf++ : 0;
|
|
bcm2708_wr(bs, SPI_FIFO, byte);
|
|
@@ -234,8 +255,12 @@ static int bcm2708_setup_state(struct spi_master *master,
|
|
switch (bpw) {
|
|
case 8:
|
|
break;
|
|
+ case 9:
|
|
+ /* Reading in LoSSI mode is a special case. See 'BCM2835 ARM Peripherals' datasheet */
|
|
+ cs |= SPI_CS_LEN;
|
|
+ break;
|
|
default:
|
|
- dev_dbg(dev, "setup: invalid bits_per_word %u (must be 8)\n",
|
|
+ dev_dbg(dev, "setup: invalid bits_per_word %u (must be 8 or 9)\n",
|
|
bpw);
|
|
return -EINVAL;
|
|
}
|
|
@@ -283,7 +308,8 @@ static int bcm2708_process_transfer(struct bcm2708_spi *bs,
|
|
ret = bcm2708_setup_state(spi->master, &spi->dev, &state,
|
|
xfer->speed_hz ? xfer->speed_hz : spi->max_speed_hz,
|
|
spi->chip_select, spi->mode,
|
|
- spi->bits_per_word);
|
|
+ xfer->bits_per_word ? xfer->bits_per_word :
|
|
+ spi->bits_per_word);
|
|
if (ret)
|
|
return ret;
|
|
|
|
--
|
|
1.9.1
|
|
|