diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-04-26 09:22:23 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-04-26 09:22:23 +0000 |
commit | 6ad5cee86b167c48557989f782faff8e8a35cae6 (patch) | |
tree | c002c66d22aaf974b2bf028b08d11ab7248fe002 /target | |
parent | 13980ac08a91782527153485d3874d2e5eb6e108 (diff) | |
download | master-187ad058-6ad5cee86b167c48557989f782faff8e8a35cae6.tar.gz master-187ad058-6ad5cee86b167c48557989f782faff8e8a35cae6.tar.bz2 master-187ad058-6ad5cee86b167c48557989f782faff8e8a35cae6.zip |
[brcm63xx] the SPI_CMD register is 16-bits wide
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21162 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.32/240-spi.patch | 8 | ||||
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/240-spi.patch | 8 |
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); + } |