From fd7786159d47d26277f3e70600aa5dc90a6b53cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 24 May 2016 20:59:54 +0200 Subject: brcm63xx: drop linux 4.1 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to linux 4.4 now that it has been enough tested. Signed-off-by: Álvaro Fernández Rojas --- ...-hsspi-add-support-for-dual-spi-read-writ.patch | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100644 target/linux/brcm63xx/patches-4.1/010-4.3-01-spi-bcm63xx-hsspi-add-support-for-dual-spi-read-writ.patch (limited to 'target/linux/brcm63xx/patches-4.1/010-4.3-01-spi-bcm63xx-hsspi-add-support-for-dual-spi-read-writ.patch') diff --git a/target/linux/brcm63xx/patches-4.1/010-4.3-01-spi-bcm63xx-hsspi-add-support-for-dual-spi-read-writ.patch b/target/linux/brcm63xx/patches-4.1/010-4.3-01-spi-bcm63xx-hsspi-add-support-for-dual-spi-read-writ.patch deleted file mode 100644 index 1be40ebc1e..0000000000 --- a/target/linux/brcm63xx/patches-4.1/010-4.3-01-spi-bcm63xx-hsspi-add-support-for-dual-spi-read-writ.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 61dc388f577b6f984797949f32c30021d9ea73dc Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 23 Aug 2015 12:16:02 +0200 -Subject: [PATCH V2] spi/bcm63xx-hsspi: add support for dual spi read/write - -Add support for dual read/writes on spi-bcm63xx-hsspi. This has been -tested with a s25fl129p1 dual read capable spi flash, with a nice speed -improvement: - -serial read: - -root@OpenWrt:/# time dd if=/dev/mtd4 of=/dev/null bs=8192 -2032+0 records in -2032+0 records out -real 0m 4.39s -user 0m 0.00s -sys 0m 1.55s - -dual read: - -root@OpenWrt:/# time dd if=/dev/mtd4 of=/dev/null bs=8192 -2032+0 records in -2032+0 records out -real 0m 3.09s -user 0m 0.00s -sys 0m 1.56s - -Signed-off-by: Jonas Gorski ---- - drivers/spi/spi-bcm63xx-hsspi.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -76,6 +76,7 @@ - #define HSSPI_FIFO_REG(x) (0x200 + (x) * 0x200) - - -+#define HSSPI_OP_MULTIBIT BIT(11) - #define HSSPI_OP_CODE_SHIFT 13 - #define HSSPI_OP_SLEEP (0 << HSSPI_OP_CODE_SHIFT) - #define HSSPI_OP_READ_WRITE (1 << HSSPI_OP_CODE_SHIFT) -@@ -171,9 +172,12 @@ static int bcm63xx_hsspi_do_txrx(struct - if (opcode != HSSPI_OP_READ) - step_size -= HSSPI_OPCODE_LEN; - -- __raw_writel(0 << MODE_CTRL_PREPENDBYTE_CNT_SHIFT | -- 2 << MODE_CTRL_MULTIDATA_WR_STRT_SHIFT | -- 2 << MODE_CTRL_MULTIDATA_RD_STRT_SHIFT | 0xff, -+ if ((opcode == HSSPI_OP_READ && t->rx_nbits == SPI_NBITS_DUAL) || -+ (opcode == HSSPI_OP_WRITE && t->tx_nbits == SPI_NBITS_DUAL)) -+ opcode |= HSSPI_OP_MULTIBIT; -+ -+ __raw_writel(1 << MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT | -+ 1 << MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT | 0xff, - bs->regs + HSSPI_PROFILE_MODE_CTRL_REG(chip_select)); - - while (pending > 0) { -@@ -374,7 +378,8 @@ static int bcm63xx_hsspi_probe(struct pl - master->num_chipselect = 8; - master->setup = bcm63xx_hsspi_setup; - master->transfer_one_message = bcm63xx_hsspi_transfer_one; -- master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; -+ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | -+ SPI_RX_DUAL | SPI_TX_DUAL; - master->bits_per_word_mask = SPI_BPW_MASK(8); - master->auto_runtime_pm = true; - -- cgit v1.2.3