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

Commit 201f9e4d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bfin5xx',... 

Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bfin5xx', 'spi/fix/hspi' and 'spi/fix/sirf' into spi-linus
parents a798c10f 1676014e e8304d04 4a4dd7d8 6ee8a2f7

arch/arm/mach-shmobile/clock-r8a7778.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */

	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */

	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */

	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */

	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */

};



static struct clk_lookup lookups[] = {

drivers/spi/spi-atmel.c

+3 −0
Original line number Diff line number Diff line
@@ -1115,8 +1115,11 @@ static int atmel_spi_one_transfer(struct spi_master *master, 
			atmel_spi_next_xfer_pio(master, xfer);

		}



		/* interrupts are disabled, so free the lock for schedule */

		atmel_spi_unlock(as);

		ret = wait_for_completion_timeout(&as->xfer_completion,

							SPI_DMA_TIMEOUT);

		atmel_spi_lock(as);

		if (WARN_ON(ret == 0)) {

			dev_err(&spi->dev,

				"spi trasfer timeout, err %d\n", ret);

drivers/spi/spi-bfin5xx.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/module.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/slab.h>

#include <linux/io.h>

#include <linux/ioport.h>

drivers/spi/spi-sh-hspi.c

+2 −2
Original line number Diff line number Diff line
@@ -244,9 +244,9 @@ static int hspi_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	clk = clk_get(NULL, "shyway_clk");

	clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "shyway_clk is required\n");

		dev_err(&pdev->dev, "couldn't get clock\n");

		ret = -EINVAL;

		goto error0;

	}

drivers/spi/spi-sirf.c

+17 −3
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ static irqreturn_t spi_sirfsoc_irq(int irq, void *dev_id) 
				sspi->left_rx_word)

			sspi->rx_word(sspi);



	if (spi_stat & (SIRFSOC_SPI_FIFO_EMPTY

			| SIRFSOC_SPI_TXFIFO_THD_REACH))

	if (spi_stat & (SIRFSOC_SPI_TXFIFO_EMPTY |

			SIRFSOC_SPI_TXFIFO_THD_REACH))

		while (!((readl(sspi->base + SIRFSOC_SPI_TXFIFO_STATUS)

				& SIRFSOC_SPI_FIFO_FULL)) &&

				sspi->left_tx_word)
@@ -470,7 +470,16 @@ static void spi_sirfsoc_chipselect(struct spi_device *spi, int value) 
		writel(regval, sspi->base + SIRFSOC_SPI_CTRL);

	} else {

		int gpio = sspi->chipselect[spi->chip_select];

		gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH ? 0 : 1);

		switch (value) {

		case BITBANG_CS_ACTIVE:

			gpio_direction_output(gpio,

					spi->mode & SPI_CS_HIGH ? 1 : 0);

			break;

		case BITBANG_CS_INACTIVE:

			gpio_direction_output(gpio,

					spi->mode & SPI_CS_HIGH ? 0 : 1);

			break;

		}

	}

}
@@ -559,6 +568,11 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
		regval &= ~SIRFSOC_SPI_CMD_MODE;

		sspi->tx_by_cmd = false;

	}

	/*

	 * set spi controller in RISC chipselect mode, we are controlling CS by

	 * software BITBANG_CS_ACTIVE and BITBANG_CS_INACTIVE.

	 */

	regval |= SIRFSOC_SPI_CS_IO_MODE;

	writel(regval, sspi->base + SIRFSOC_SPI_CTRL);



	if (IS_DMA_VALID(t)) {