Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 58b860ed authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-5.1' into spi-linus

parents 37624b58 7e95b166

drivers/spi/atmel-quadspi.c

+4 −2
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ static int atmel_qspi_remove(struct platform_device *pdev) 


static int __maybe_unused atmel_qspi_suspend(struct device *dev)

{

	struct atmel_qspi *aq = dev_get_drvdata(dev);

	struct spi_controller *ctrl = dev_get_drvdata(dev);

	struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);



	clk_disable_unprepare(aq->qspick);

	clk_disable_unprepare(aq->pclk);
@@ -580,7 +581,8 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev) 


static int __maybe_unused atmel_qspi_resume(struct device *dev)

{

	struct atmel_qspi *aq = dev_get_drvdata(dev);

	struct spi_controller *ctrl = dev_get_drvdata(dev);

	struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);



	clk_prepare_enable(aq->pclk);

	clk_prepare_enable(aq->qspick);

drivers/spi/spi-fsl-lpspi.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#define CFGR1_PCSPOL	BIT(8)

#define CFGR1_NOSTALL	BIT(3)

#define CFGR1_MASTER	BIT(0)

#define FSR_RXCOUNT	(BIT(16)|BIT(17)|BIT(18))

#define FSR_TXCOUNT	(0xFF)

#define RSR_RXEMPTY	BIT(1)

#define TCR_CPOL	BIT(31)

#define TCR_CPHA	BIT(30)
@@ -452,7 +452,7 @@ static irqreturn_t fsl_lpspi_isr(int irq, void *dev_id) 
	}



	if (temp_SR & SR_MBF ||

	    readl(fsl_lpspi->base + IMX7ULP_FSR) & FSR_RXCOUNT) {

	    readl(fsl_lpspi->base + IMX7ULP_FSR) & FSR_TXCOUNT) {

		writel(SR_FCF, fsl_lpspi->base + IMX7ULP_SR);

		fsl_lpspi_intctrl(fsl_lpspi, IER_FCIE);

		return IRQ_HANDLED;

drivers/spi/spi-gpio.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
 * platform_device->driver_data ... points to spi_gpio

 *

 * spi->controller_state ... reserved for bitbang framework code

 * spi->controller_data ... holds chipselect GPIO

 *

 * spi->master->dev.driver_data ... points to spi_gpio->bitbang

 */

drivers/spi/spi-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ static int spi_imx_transfer(struct spi_device *spi, 


	/* flush rxfifo before transfer */

	while (spi_imx->devtype_data->rx_available(spi_imx))

		spi_imx->rx(spi_imx);

		readl(spi_imx->base + MXC_CSPIRXDATA);



	if (spi_imx->slave_mode)

		return spi_imx_pio_transfer_slave(spi, transfer);

drivers/spi/spi-pic32.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int pic32_spi_one_transfer(struct spi_master *master, 
		dev_err(&spi->dev, "wait error/timedout\n");

		if (dma_issued) {

			dmaengine_terminate_all(master->dma_rx);

			dmaengine_terminate_all(master->dma_rx);

			dmaengine_terminate_all(master->dma_tx);

		}

		ret = -ETIMEDOUT;

	} else {