diff options
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/016-spi-bcm63xx-fix-bcm6348-38.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/016-spi-bcm63xx-fix-bcm6348-38.patch | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/016-spi-bcm63xx-fix-bcm6348-38.patch b/target/linux/brcm63xx/patches-3.3/016-spi-bcm63xx-fix-bcm6348-38.patch deleted file mode 100644 index ce53257..0000000 --- a/target/linux/brcm63xx/patches-3.3/016-spi-bcm63xx-fix-bcm6348-38.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- a/arch/mips/bcm63xx/dev-spi.c -+++ b/arch/mips/bcm63xx/dev-spi.c -@@ -106,11 +106,15 @@ int __init bcm63xx_spi_register(void) - if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { - spi_resources[0].end += BCM_6338_RSET_SPI_SIZE - 1; - spi_pdata.fifo_size = SPI_6338_MSG_DATA_SIZE; -+ spi_pdata.msg_type_shift = SPI_6338_MSG_TYPE_SHIFT; -+ spi_pdata.msg_ctl_width = SPI_6338_MSG_CTL_WIDTH; - } - - if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) { - spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1; - spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE; -+ spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT; -+ spi_pdata.msg_ctl_width = SPI_6358_MSG_CTL_WIDTH; - } - - bcm63xx_spi_regs_init(); ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h -@@ -9,6 +9,8 @@ int __init bcm63xx_spi_register(void); - - struct bcm63xx_spi_pdata { - unsigned int fifo_size; -+ unsigned int msg_type_shift; -+ unsigned int msg_ctl_width; - int bus_num; - int num_chipselect; - u32 speed_hz; ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -987,7 +987,8 @@ - #define SPI_6338_FILL_BYTE 0x07 - #define SPI_6338_MSG_TAIL 0x09 - #define SPI_6338_RX_TAIL 0x0b --#define SPI_6338_MSG_CTL 0x40 -+#define SPI_6338_MSG_CTL 0x40 /* 8-bits register */ -+#define SPI_6338_MSG_CTL_WIDTH 8 - #define SPI_6338_MSG_DATA 0x41 - #define SPI_6338_MSG_DATA_SIZE 0x3f - #define SPI_6338_RX_DATA 0x80 -@@ -1003,7 +1004,8 @@ - #define SPI_6348_FILL_BYTE 0x07 - #define SPI_6348_MSG_TAIL 0x09 - #define SPI_6348_RX_TAIL 0x0b --#define SPI_6348_MSG_CTL 0x40 -+#define SPI_6348_MSG_CTL 0x40 /* 8-bits register */ -+#define SPI_6348_MSG_CTL_WIDTH 8 - #define SPI_6348_MSG_DATA 0x41 - #define SPI_6348_MSG_DATA_SIZE 0x3f - #define SPI_6348_RX_DATA 0x80 -@@ -1011,6 +1013,7 @@ - - /* BCM 6358 SPI core */ - #define SPI_6358_MSG_CTL 0x00 /* 16-bits register */ -+#define SPI_6358_MSG_CTL_WIDTH 16 - #define SPI_6358_MSG_DATA 0x02 - #define SPI_6358_MSG_DATA_SIZE 0x21e - #define SPI_6358_RX_DATA 0x400 -@@ -1027,6 +1030,7 @@ - - /* BCM 6358 SPI core */ - #define SPI_6368_MSG_CTL 0x00 /* 16-bits register */ -+#define SPI_6368_MSG_CTL_WIDTH 16 - #define SPI_6368_MSG_DATA 0x02 - #define SPI_6368_MSG_DATA_SIZE 0x21e - #define SPI_6368_RX_DATA 0x400 -@@ -1048,7 +1052,10 @@ - #define SPI_HD_W 0x01 - #define SPI_HD_R 0x02 - #define SPI_BYTE_CNT_SHIFT 0 --#define SPI_MSG_TYPE_SHIFT 14 -+#define SPI_6338_MSG_TYPE_SHIFT 6 -+#define SPI_6348_MSG_TYPE_SHIFT 6 -+#define SPI_6358_MSG_TYPE_SHIFT 14 -+#define SPI_6368_MSG_TYPE_SHIFT 14 - - /* Command */ - #define SPI_CMD_NOOP 0x00 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -47,6 +47,8 @@ struct bcm63xx_spi { - /* Platform data */ - u32 speed_hz; - unsigned fifo_size; -+ unsigned int msg_type_shift; -+ unsigned int msg_ctl_width; - - /* Data buffers */ - const unsigned char *tx_ptr; -@@ -221,13 +223,24 @@ static unsigned int bcm63xx_txrx_bufs(st - msg_ctl = (t->len << SPI_BYTE_CNT_SHIFT); - - if (t->rx_buf && t->tx_buf) -- msg_ctl |= (SPI_FD_RW << SPI_MSG_TYPE_SHIFT); -+ msg_ctl |= (SPI_FD_RW << bs->msg_type_shift); - else if (t->rx_buf) -- msg_ctl |= (SPI_HD_R << SPI_MSG_TYPE_SHIFT); -+ msg_ctl |= (SPI_HD_R << bs->msg_type_shift); - else if (t->tx_buf) -- msg_ctl |= (SPI_HD_W << SPI_MSG_TYPE_SHIFT); -+ msg_ctl |= (SPI_HD_W << bs->msg_type_shift); - -- bcm_spi_writew(bs, msg_ctl, SPI_MSG_CTL); -+ switch (bs->msg_ctl_width) { -+ case 8: -+ bcm_spi_writeb(bs, msg_ctl, SPI_MSG_CTL); -+ break; -+ case 16: -+ bcm_spi_writew(bs, msg_ctl, SPI_MSG_CTL); -+ break; -+ default: -+ dev_err(&spi->dev, "unknown MSG_CTL width: %d\n", -+ bs->msg_ctl_width); -+ return 0; -+ } - - /* Issue the transfer */ - cmd = SPI_CMD_START_IMMEDIATE; -@@ -406,6 +419,8 @@ static int __devinit bcm63xx_spi_probe(s - master->transfer_one_message = bcm63xx_spi_transfer_one; - master->mode_bits = MODEBITS; - bs->speed_hz = pdata->speed_hz; -+ bs->msg_type_shift = pdata->msg_type_shift; -+ bs->msg_ctl_width = pdata->msg_ctl_width; - bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA)); - bs->rx_io = (const u8 *)(bs->regs + bcm63xx_spireg(SPI_RX_DATA)); - |