From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 26 Apr 2010 09:22:23 +0000 (+0000)
Subject: the SPI_CMD register is 16-bits wide
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=52231f694d0dcf47a0c067af4e054e084e8ea8b1;p=openwrt%2Fstaging%2Fblocktrron.git

the SPI_CMD register is 16-bits wide

SVN-Revision: 21162
---

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);
 +	}