Merge branch 'spi-4.19' into spi-linus

diff --git a/MAINTAINERS b/MAINTAINERS
index 6ac000cc006d1ec6eaa5949a1810f930f57c8af7..1668e49999c7733d78c851d316c3ba184d8804a2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3113,6 +3113,15 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
 F:     drivers/memory/brcmstb_dpfe.c
 
+BROADCOM SPI DRIVER
+M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+F:     drivers/spi/spi-bcm-qspi.*
+F:     drivers/spi/spi-brcmstb-qspi.c
+F:     drivers/spi/spi-iproc-qspi.c
+
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 8612525fa4e34e6281d26c5f306f3f1e36a212ce..584bcb018a62db6743eb2028dd29e15b178c734f 100644 (file)
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -89,7 +89,7 @@
 #define BSPI_BPP_MODE_SELECT_MASK              BIT(8)
 #define BSPI_BPP_ADDR_SELECT_MASK              BIT(16)
 
-#define BSPI_READ_LENGTH                       512
+#define BSPI_READ_LENGTH                       256
 
 /* MSPI register offsets */
 #define MSPI_SPCR0_LSB                         0x000
@@ -355,7 +355,7 @@ static int bcm_qspi_bspi_set_flex_mode(struct bcm_qspi *qspi,
        int bpc = 0, bpp = 0;
        u8 command = op->cmd.opcode;
        int width  = op->cmd.buswidth ? op->cmd.buswidth : SPI_NBITS_SINGLE;
-       int addrlen = op->addr.nbytes * 8;
+       int addrlen = op->addr.nbytes;
        int flex_mode = 1;
 
        dev_dbg(&qspi->pdev->dev, "set flex mode w %x addrlen %x hp %d\n",

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index fdcf3076681b5eeffb1885b428c8d00ff2682d2f..185bbdce62b1467acbe833255f3fe79e4fad0840 100644 (file)
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -445,6 +445,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
        struct dma_slave_config rxconf, txconf;
        struct dma_async_tx_descriptor *rxdesc, *txdesc;
 
+       memset(&rxconf, 0, sizeof(rxconf));
+       memset(&txconf, 0, sizeof(txconf));
+
        spin_lock_irqsave(&rs->lock, flags);
        rs->state &= ~RXBUSY;
        rs->state &= ~TXBUSY;

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 101cd6aae2ea520afcac89671071cdabe2341f8f..30ea0a2068e094ab47822b63da58da4778858ee3 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -1343,8 +1343,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 
        i = platform_get_irq(pdev, 0);
        if (i < 0) {
-               dev_err(&pdev->dev, "cannot get platform IRQ\n");
-               ret = -ENOENT;
+               dev_err(&pdev->dev, "cannot get IRQ\n");
+               ret = i;
                goto err1;
        }