aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-04-26 09:22:23 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-04-26 09:22:23 +0000
commit52231f694d0dcf47a0c067af4e054e084e8ea8b1 (patch)
tree1152f9fe4e95a0a397921dc6bbb9c5168335ee70
parent1aea70229e4ed7a7f8b7a7f22ccc27ccd31e5757 (diff)
downloadupstream-52231f694d0dcf47a0c067af4e054e084e8ea8b1.tar.gz
upstream-52231f694d0dcf47a0c067af4e054e084e8ea8b1.tar.bz2
upstream-52231f694d0dcf47a0c067af4e054e084e8ea8b1.zip
the SPI_CMD register is 16-bits wide
SVN-Revision: 21162
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/240-spi.patch8
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/240-spi.patch8
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
index d4b95b0446..ba7a947fa6 100644
--- a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
@@ -649,10 +649,10 @@ Index: linux-2.6.32.10/drivers/spi/bcm63xx_spi.c
+ bcm_spi_writeb(msg_ctl, bs->regs, SPI_MSG_CTL);
+
+ /* Issue the transfer */
-+ cmd = bcm_spi_readb(bs->regs, SPI_CMD);
++ cmd = bcm_spi_readw(bs->regs, SPI_CMD);
+ cmd |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-+ bcm_spi_writeb(cmd, bs->regs, SPI_CMD);
++ bcm_spi_writew(cmd, bs->regs, SPI_CMD);
+
+ wait_for_completion(&bs->done);
+
@@ -697,10 +697,10 @@ Index: linux-2.6.32.10/drivers/spi/bcm63xx_spi.c
+ bcm63xx_spi_fill_tx_fifo(bs);
+
+ /* Start the transfer */
-+ cmd = bcm_spi_readb(bs->regs, SPI_CMD);
++ cmd = bcm_spi_readw(bs->regs, SPI_CMD);
+ cmd |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-+ bcm_spi_writeb(cmd, bs->regs, SPI_CMD);
++ bcm_spi_writew(cmd, bs->regs, SPI_CMD);
+ } else
+ complete(&bs->done);
+ }
diff --git a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch
index bcae32350b..86fcc7d76d 100644
--- a/target/linux/brcm63xx/patches-2.6.33/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/240-spi.patch
@@ -639,10 +639,10 @@
+ bcm_spi_writeb(msg_ctl, bs->regs, SPI_MSG_CTL);
+
+ /* Issue the transfer */
-+ cmd = bcm_spi_readb(bs->regs, SPI_CMD);
++ cmd = bcm_spi_readw(bs->regs, SPI_CMD);
+ cmd |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-+ bcm_spi_writeb(cmd, bs->regs, SPI_CMD);
++ bcm_spi_writew(cmd, bs->regs, SPI_CMD);
+
+ wait_for_completion(&bs->done);
+
@@ -687,10 +687,10 @@
+ bcm63xx_spi_fill_tx_fifo(bs);
+
+ /* Start the transfer */
-+ cmd = bcm_spi_readb(bs->regs, SPI_CMD);
++ cmd = bcm_spi_readw(bs->regs, SPI_CMD);
+ cmd |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-+ bcm_spi_writeb(cmd, bs->regs, SPI_CMD);
++ bcm_spi_writew(cmd, bs->regs, SPI_CMD);
+ } else
+ complete(&bs->done);
+ }