qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-27 14:50:38 +02:00
Code

[brcm63xx] the SPI_CMD register is 16-bits wide

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21162 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-04-26 09:22:23 +00:00
parent 3d253dd59a
commit 53463696e2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/brcm63xx/patches-2.6.32/240-spi.patch
View File

@ -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); + bcm_spi_writeb(msg_ctl, bs->regs, SPI_MSG_CTL);
+ +
+ /* Issue the transfer */ + /* 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 |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT); + 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); + 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); + bcm63xx_spi_fill_tx_fifo(bs);
+ +
+ /* Start the transfer */ + /* 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 |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT); + 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 + } else
+ complete(&bs->done); + complete(&bs->done);
+ } + }

8
target/linux/brcm63xx/patches-2.6.33/240-spi.patch
View File

@ -639,10 +639,10 @@
+ bcm_spi_writeb(msg_ctl, bs->regs, SPI_MSG_CTL); + bcm_spi_writeb(msg_ctl, bs->regs, SPI_MSG_CTL);
+ +
+ /* Issue the transfer */ + /* 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 |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT); + 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); + wait_for_completion(&bs->done);
+ +
@ -687,10 +687,10 @@
+ bcm63xx_spi_fill_tx_fifo(bs); + bcm63xx_spi_fill_tx_fifo(bs);
+ +
+ /* Start the transfer */ + /* 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 |= SPI_CMD_START_IMMEDIATE;
+ cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT); + 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 + } else
+ complete(&bs->done); + complete(&bs->done);
+ } + }