Unverified Commit 92d58fd1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-4.19' into spi-linus

parents 35a7f35a 4585add9

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -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

drivers/spi/spi-bcm-qspi.c

+2 −2
Original line number Diff line number Diff line
@@ -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",

drivers/spi/spi-rockchip.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/spi/spi-sh-msiof.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}