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

Commit b88f5577 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi updates from Mark Brown:
 "A fairly quiet release for the SPI subsystem:

   - Move to using IDR for allocating bus numbers

   - Modernisation of the ep93xx driver, removing a lot of open coding
     and using the framework more

   - The tools have been moved to use the standard tools build system
     and an install target added (there will be a fairly trivial
     conflict with tip resulting from the changes in the main tools
     Makefile)

   - A refactoring of the Qualcomm QUP driver which enables new variants
     to be supported

   - Explicit support for the Freescale i.MX53 and i.MX6 SPI, Renesas
     R-Car H3 and Rockchip RV1108 controllers"

* tag 'spi-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (71 commits)
  spi: spi-falcon: drop check of boot select
  spi: imx: fix use of native chip-selects with devicetree
  spi: pl022: constify amba_id
  spi: imx: fix little-endian build
  spi: omap: Allocate bus number from spi framework
  spi: Kernel coding style fixes
  spi: imx: dynamic burst length adjust for PIO mode
  spi: Pick spi bus number from Linux idr or spi alias
  spi: rockchip: configure CTRLR1 according to size and data frame
  spi: altera: Consolidate TX/RX data register access
  spi: altera: Switch to SPI core transfer queue management
  spi: rockchip: add compatible string for rv1108 spi
  spi: qup: fix 64-bit build warning
  spi: qup: hide warning for uninitialized variable
  spi: spi-ep93xx: use the default master transfer queueing mechanism
  spi: spi-ep93xx: remove private data 'current_msg'
  spi: spi-ep93xx: pass the spi_master pointer around
  spi: spi-ep93xx: absorb the interrupt enable/disable helpers
  spi: spi-ep93xx: add spi master prepare_transfer_hardware()
  spi: spi-ep93xx: use 32-bit read/write for all registers
  ...
parents 16a832a2 ecb478bf

Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
  - "fsl,imx31-cspi" for SPI compatible with the one integrated on i.MX31

  - "fsl,imx35-cspi" for SPI compatible with the one integrated on i.MX35

  - "fsl,imx51-ecspi" for SPI compatible with the one integrated on i.MX51

  - "fsl,imx53-ecspi" for SPI compatible with the one integrated on i.MX53 and later Soc

- reg : Offset and length of the register set for the device

- interrupts : Should contain CSPI/eCSPI interrupt

- cs-gpios : Specifies the gpio pins to be used for chipselects.

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
			 "renesas,msiof-r8a7792" (R-Car V2H)

			 "renesas,msiof-r8a7793" (R-Car M2-N)

			 "renesas,msiof-r8a7794" (R-Car E2)

			 "renesas,msiof-r8a7795" (R-Car H3)

			 "renesas,msiof-r8a7796" (R-Car M3-W)

			 "renesas,msiof-sh73a0" (SH-Mobile AG5)

			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)

Documentation/devicetree/bindings/spi/spi-rockchip.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ and display controllers using the SPI communication interface. 
Required Properties:



- compatible: should be one of the following.

    "rockchip,rv1108-spi" for rv1108 SoCs.

    "rockchip,rk3036-spi" for rk3036 SoCS.

    "rockchip,rk3066-spi" for rk3066 SoCs.

    "rockchip,rk3188-spi" for rk3188 SoCs.

drivers/spi/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ comment "SPI Master Controller Drivers" 


config SPI_ALTERA

	tristate "Altera SPI Controller"

	select SPI_BITBANG

	help

	  This is the driver for the Altera SPI Controller.
@@ -518,8 +517,8 @@ config SPI_PPC4xx 


config SPI_PXA2XX

	tristate "PXA2xx SSP SPI master"

	depends on (ARCH_PXA || PCI || ACPI)

	select PXA_SSP if ARCH_PXA

	depends on (ARCH_PXA || ARCH_MMP || PCI || ACPI)

	select PXA_SSP if ARCH_PXA || ARCH_MMP

	help

	  This enables using a PXA2xx or Sodaville SSP port as a SPI master

	  controller. The driver can be configured to use any SSP port and

drivers/spi/spi-altera.c

+59 −104
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -45,10 +44,6 @@ 
#define ALTERA_SPI_CONTROL_SSO_MSK	0x400



struct altera_spi {

	/* bitbang has to be first */

	struct spi_bitbang bitbang;

	struct completion done;



	void __iomem *base;

	int irq;

	int len;
@@ -66,59 +61,64 @@ static inline struct altera_spi *altera_spi_to_hw(struct spi_device *sdev) 
	return spi_master_get_devdata(sdev->master);

}



static void altera_spi_chipsel(struct spi_device *spi, int value)

static void altera_spi_set_cs(struct spi_device *spi, bool is_high)

{

	struct altera_spi *hw = altera_spi_to_hw(spi);



	if (spi->mode & SPI_CS_HIGH) {

		switch (value) {

		case BITBANG_CS_INACTIVE:

			writel(1 << spi->chip_select,

			       hw->base + ALTERA_SPI_SLAVE_SEL);

			hw->imr |= ALTERA_SPI_CONTROL_SSO_MSK;

			writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);

			break;



		case BITBANG_CS_ACTIVE:

	if (is_high) {

		hw->imr &= ~ALTERA_SPI_CONTROL_SSO_MSK;

		writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);

		writel(0, hw->base + ALTERA_SPI_SLAVE_SEL);

			break;

		}

	} else {

		switch (value) {

		case BITBANG_CS_INACTIVE:

			hw->imr &= ~ALTERA_SPI_CONTROL_SSO_MSK;

			writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);

			break;



		case BITBANG_CS_ACTIVE:

			writel(1 << spi->chip_select,

			       hw->base + ALTERA_SPI_SLAVE_SEL);

		writel(BIT(spi->chip_select), hw->base + ALTERA_SPI_SLAVE_SEL);

		hw->imr |= ALTERA_SPI_CONTROL_SSO_MSK;

		writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);

	}

}



static void altera_spi_tx_word(struct altera_spi *hw)

{

	unsigned int txd = 0;



	if (hw->tx) {

		switch (hw->bytes_per_word) {

		case 1:

			txd = hw->tx[hw->count];

			break;

		case 2:

			txd = (hw->tx[hw->count * 2]

				| (hw->tx[hw->count * 2 + 1] << 8));

			break;

		}

	}



	writel(txd, hw->base + ALTERA_SPI_TXDATA);

}



static inline unsigned int hw_txbyte(struct altera_spi *hw, int count)

static void altera_spi_rx_word(struct altera_spi *hw)

{

	if (hw->tx) {

	unsigned int rxd;



	rxd = readl(hw->base + ALTERA_SPI_RXDATA);

	if (hw->rx) {

		switch (hw->bytes_per_word) {

		case 1:

			return hw->tx[count];

			hw->rx[hw->count] = rxd;

			break;

		case 2:

			return (hw->tx[count * 2]

				| (hw->tx[count * 2 + 1] << 8));

			hw->rx[hw->count * 2] = rxd;

			hw->rx[hw->count * 2 + 1] = rxd >> 8;

			break;

		}

	}

	return 0;



	hw->count++;

}



static int altera_spi_txrx(struct spi_device *spi, struct spi_transfer *t)

static int altera_spi_txrx(struct spi_master *master,

	struct spi_device *spi, struct spi_transfer *t)

{

	struct altera_spi *hw = altera_spi_to_hw(spi);

	struct altera_spi *hw = spi_master_get_devdata(master);



	hw->tx = t->tx_buf;

	hw->rx = t->rx_buf;
@@ -132,67 +132,39 @@ static int altera_spi_txrx(struct spi_device *spi, struct spi_transfer *t) 
		writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);



		/* send the first byte */

		writel(hw_txbyte(hw, 0), hw->base + ALTERA_SPI_TXDATA);



		wait_for_completion(&hw->done);

		/* disable receive interrupt */

		hw->imr &= ~ALTERA_SPI_CONTROL_IRRDY_MSK;

		writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);

		altera_spi_tx_word(hw);

	} else {

		while (hw->count < hw->len) {

			unsigned int rxd;



			writel(hw_txbyte(hw, hw->count),

			       hw->base + ALTERA_SPI_TXDATA);

			altera_spi_tx_word(hw);



			while (!(readl(hw->base + ALTERA_SPI_STATUS) &

				 ALTERA_SPI_STATUS_RRDY_MSK))

				cpu_relax();



			rxd = readl(hw->base + ALTERA_SPI_RXDATA);

			if (hw->rx) {

				switch (hw->bytes_per_word) {

				case 1:

					hw->rx[hw->count] = rxd;

					break;

				case 2:

					hw->rx[hw->count * 2] = rxd;

					hw->rx[hw->count * 2 + 1] = rxd >> 8;

					break;

			altera_spi_rx_word(hw);

		}

		spi_finalize_current_transfer(master);

	}



			hw->count++;

		}

	}



	return hw->count * hw->bytes_per_word;

	return t->len;

}



static irqreturn_t altera_spi_irq(int irq, void *dev)

{

	struct altera_spi *hw = dev;

	unsigned int rxd;

	struct spi_master *master = dev;

	struct altera_spi *hw = spi_master_get_devdata(master);



	rxd = readl(hw->base + ALTERA_SPI_RXDATA);

	if (hw->rx) {

		switch (hw->bytes_per_word) {

		case 1:

			hw->rx[hw->count] = rxd;

			break;

		case 2:

			hw->rx[hw->count * 2] = rxd;

			hw->rx[hw->count * 2 + 1] = rxd >> 8;

			break;

		}

	}

	altera_spi_rx_word(hw);



	hw->count++;

	if (hw->count < hw->len) {

		altera_spi_tx_word(hw);

	} else {

		/* disable receive interrupt */

		hw->imr &= ~ALTERA_SPI_CONTROL_IRRDY_MSK;

		writel(hw->imr, hw->base + ALTERA_SPI_CONTROL);



	if (hw->count < hw->len)

		writel(hw_txbyte(hw, hw->count), hw->base + ALTERA_SPI_TXDATA);

	else

		complete(&hw->done);

		spi_finalize_current_transfer(master);

	}



	return IRQ_HANDLED;

}
@@ -214,14 +186,10 @@ static int altera_spi_probe(struct platform_device *pdev) 
	master->mode_bits = SPI_CS_HIGH;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);

	master->dev.of_node = pdev->dev.of_node;

	master->transfer_one = altera_spi_txrx;

	master->set_cs = altera_spi_set_cs;



	hw = spi_master_get_devdata(master);

	platform_set_drvdata(pdev, hw);



	/* setup the state for the bitbang driver */

	hw->bitbang.master = master;

	hw->bitbang.chipselect = altera_spi_chipsel;

	hw->bitbang.txrx_bufs = altera_spi_txrx;



	/* find and map our resources */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -239,15 +207,13 @@ static int altera_spi_probe(struct platform_device *pdev) 
	/* irq is optional */

	hw->irq = platform_get_irq(pdev, 0);

	if (hw->irq >= 0) {

		init_completion(&hw->done);

		err = devm_request_irq(&pdev->dev, hw->irq, altera_spi_irq, 0,

				       pdev->name, hw);

				       pdev->name, master);

		if (err)

			goto exit;

	}



	/* register our spi controller */

	err = spi_bitbang_start(&hw->bitbang);

	err = devm_spi_register_master(&pdev->dev, master);

	if (err)

		goto exit;

	dev_info(&pdev->dev, "base %p, irq %d\n", hw->base, hw->irq);
@@ -258,16 +224,6 @@ static int altera_spi_probe(struct platform_device *pdev) 
	return err;

}



static int altera_spi_remove(struct platform_device *dev)

{

	struct altera_spi *hw = platform_get_drvdata(dev);

	struct spi_master *master = hw->bitbang.master;



	spi_bitbang_stop(&hw->bitbang);

	spi_master_put(master);

	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id altera_spi_match[] = {

	{ .compatible = "ALTR,spi-1.0", },
@@ -279,7 +235,6 @@ MODULE_DEVICE_TABLE(of, altera_spi_match); 


static struct platform_driver altera_spi_driver = {

	.probe = altera_spi_probe,

	.remove = altera_spi_remove,

	.driver = {

		.name = DRV_NAME,

		.pm = NULL,