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

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

Pull spi updates from Mark Brown:
 "Not the biggest set of changes for SPI but a bit of a pickup in
  activity on the core:

   - Support for memory mapped read from flash devices via a SPI
     controller.

   - The beginnings of a message rewriting framework in the core which
     should in time allow us to support transforming messages to work
     around the limits of controllers or optimise the performance for
     controllers transparently to calling drivers.

   - Updates to the PXA2xx, the main functional change being to improve
     the ACPI support.

   - A new driver for the Analog Devices AXI SPI engine"

* tag 'spi-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (66 commits)
  spi: Add gfp parameter to kernel-doc to fix build warning
  spi: Fix htmldocs build error due struct spi_replaced_transfers
  spi: rockchip: covert rsd_nsecs to u32 type
  spi: rockchip: header file cleanup
  spi: xilinx: Add devicetree binding for spi-xilinx
  spi: respect the maximum segment size of DMA device
  spi: rockchip: check requesting dma channel with EPROBE_DEFER
  spi: rockchip: migrate to dmaengine_terminate_async
  spi: rockchip: check return value of dmaengine_prep_slave_sg
  spi: core: Fix deadlock when sending messages
  spi/rockchip: fix endian mode for 16-bit transfers
  spi/rockchip: Make sure spi clk is on in rockchip_spi_set_cs
  spi: pxa2xx: Use newer more explicit DMAengine terminate API
  spi: pxa2xx: Add support for Intel Broxton B-Step
  spi: lp-8841: return correct error code from probe
  spi: imx: drop bogus tests for rx/tx bufs in DMA transfer
  spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function
  spi: imx: make some register defines simpler
  spi: imx: remove unnecessary bit clearing in mx51_ecspi_config
  spi: imx: add support for all SPI word width for DMA
  ...
parents 5ca5446e c508709b

Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
Analog Devices AXI SPI Engine controller Device Tree Bindings



Required properties:

- compatible		: Must be "adi,axi-spi-engine-1.00.a""

- reg			: Physical base address and size of the register map.

- interrupts		: Property with a value describing the interrupt

			  number.

- clock-names		: List of input clock names - "s_axi_aclk", "spi_clk"

- clocks		: Clock phandles and specifiers (See clock bindings for

			  details on clock-names and clocks).

- #address-cells	: Must be <1>

- #size-cells		: Must be <0>



Optional subnodes:

	Subnodes are use to represent the SPI slave devices connected to the SPI

	master. They follow the generic SPI bindings as outlined in spi-bus.txt.



Example:



    spi@@44a00000 {

		compatible = "adi,axi-spi-engine-1.00.a";

		reg = <0x44a00000 0x1000>;

		interrupts = <0 56 4>;

		clocks = <&clkc 15 &clkc 15>;

		clock-names = "s_axi_aclk", "spi_clk";



		#address-cells = <1>;

		#size-cells = <0>;



		/* SPI devices */

    };

Documentation/devicetree/bindings/spi/icpdas-lp8841-spi-rtc.txt

0 → 100644
+54 −0
Original line number Diff line number Diff line 
* ICP DAS LP-8841 SPI Controller for RTC



ICP DAS LP-8841 contains a DS-1302 RTC. RTC is connected to an IO

memory register, which acts as an SPI master device.



The device uses the standard MicroWire half-duplex transfer timing.

Master output is set on low clock and sensed by the RTC on the rising

edge. Master input is set by the RTC on the trailing edge and is sensed

by the master on low clock.



Required properties:



- #address-cells: should be 1



- #size-cells: should be 0



- compatible: should be "icpdas,lp8841-spi-rtc"



- reg: should provide IO memory address



Requirements to SPI slave nodes:



- There can be only one slave device.



- The spi slave node should claim the following flags which are

  required by the spi controller.



  - spi-3wire: The master itself has only 3 wire. It cannor work in

    full duplex mode.



  - spi-cs-high: DS-1302 has active high chip select line. The master

    doesn't support active low.



  - spi-lsb-first: DS-1302 requires least significant bit first

    transfers. The master only support this type of bit ordering.





Example:



spi@901c {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "icpdas,lp8841-spi-rtc";

	reg = <0x901c 0x1>;



	rtc@0 {

		compatible = "maxim,ds1302";

		reg = <0>;

		spi-max-frequency = <500000>;

		spi-3wire;

		spi-lsb-first;

		spi-cs-high;

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required Properties: 
    "rockchip,rk3066-spi" for rk3066.

    "rockchip,rk3188-spi", "rockchip,rk3066-spi" for rk3188.

    "rockchip,rk3288-spi", "rockchip,rk3066-spi" for rk3288.

    "rockchip,rk3399-spi", "rockchip,rk3066-spi" for rk3399.

- reg: physical base address of the controller and length of memory mapped

       region.

- interrupts: The interrupt number to the cpu. The interrupt specifier format

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Xilinx SPI controller Device Tree Bindings

-------------------------------------------------



Required properties:

- compatible		: Should be "xlnx,xps-spi-2.00.a" or "xlnx,xps-spi-2.00.b"

- reg			: Physical base address and size of SPI registers map.

- interrupts		: Property with a value describing the interrupt

			  number.

- interrupt-parent	: Must be core interrupt controller



Optional properties:

- xlnx,num-ss-bits	: Number of chip selects used.



Example:

	axi_quad_spi@41e00000 {

			compatible = "xlnx,xps-spi-2.00.a";

			interrupt-parent = <&intc>;

			interrupts = <0 31 1>;

			reg = <0x41e00000 0x10000>;

			xlnx,num-ss-bits = <0x1>;

	};

drivers/spi/Kconfig

+54 −42
Original line number Diff line number Diff line
@@ -75,11 +75,26 @@ config SPI_ATMEL 
	  This selects a driver for the Atmel SPI Controller, present on

	  many AT32 (AVR32) and AT91 (ARM) chips.



config SPI_AU1550

	tristate "Au1550/Au1200/Au1300 SPI Controller"

	depends on MIPS_ALCHEMY

	select SPI_BITBANG

	help

	  If you say yes to this option, support will be included for the

	  PSC SPI controller found on Au1550, Au1200 and Au1300 series.



config SPI_AXI_SPI_ENGINE

	tristate "Analog Devices AXI SPI Engine controller"

	depends on HAS_IOMEM

	help

	  This enables support for the Analog Devices AXI SPI Engine SPI controller.

	  It is part of the SPI Engine framework that is used in some Analog Devices

	  reference designs for FPGAs.



config SPI_BCM2835

	tristate "BCM2835 SPI controller"

	depends on GPIOLIB

	depends on ARCH_BCM2835 || COMPILE_TEST

	depends on GPIOLIB

	help

	  This selects a driver for the Broadcom BCM2835 SPI master.
@@ -90,8 +105,7 @@ config SPI_BCM2835 


config SPI_BCM2835AUX

	tristate "BCM2835 SPI auxiliary controller"

	depends on ARCH_BCM2835 || COMPILE_TEST

	depends on GPIOLIB

	depends on (ARCH_BCM2835 && GPIOLIB) || COMPILE_TEST

	help

	  This selects a driver for the Broadcom BCM2835 SPI aux master.
@@ -118,14 +132,6 @@ config SPI_BFIN_SPORT 
	help

	  Enable support for a SPI bus via the Blackfin SPORT peripheral.



config SPI_AU1550

	tristate "Au1550/Au1200/Au1300 SPI Controller"

	depends on MIPS_ALCHEMY

	select SPI_BITBANG

	help

	  If you say yes to this option, support will be included for the

	  PSC SPI controller found on Au1550, Au1200 and Au1300 series.



config SPI_BCM53XX

	tristate "Broadcom BCM53xx SPI controller"

	depends on ARCH_BCM_5301X
@@ -197,6 +203,23 @@ config SPI_DAVINCI 
	help

	  SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.



config SPI_DESIGNWARE

	tristate "DesignWare SPI controller core support"

	help

	  general driver for SPI controller core from DesignWare



config SPI_DW_PCI

	tristate "PCI interface driver for DW SPI core"

	depends on SPI_DESIGNWARE && PCI



config SPI_DW_MID_DMA

	bool "DMA support for DW SPI controller on Intel MID platform"

	depends on SPI_DW_PCI && DW_DMAC_PCI



config SPI_DW_MMIO

	tristate "Memory-mapped io interface driver for DW SPI core"

	depends on SPI_DESIGNWARE



config SPI_DLN2

       tristate "Diolan DLN-2 USB SPI adapter"

       depends on MFD_DLN2
@@ -271,6 +294,16 @@ config SPI_LM70_LLP 
	  which interfaces to an LM70 temperature sensor using

	  a parallel port.



config SPI_LP8841_RTC

	tristate "ICP DAS LP-8841 SPI Controller for RTC"

	depends on MACH_PXA27X_DT || COMPILE_TEST

	help

	  This driver provides an SPI master device to drive Maxim

	  DS-1302 real time clock.



	  Say N here unless you plan to run the kernel on an ICP DAS

	  LP-8x4x industrial computer.



config SPI_MPC52xx

	tristate "Freescale MPC52xx SPI (non-PSC) controller support"

	depends on PPC_MPC52xx
@@ -346,6 +379,13 @@ config SPI_MT65XX 
	  say Y or M here.If you are not sure, say N.

	  SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs.



config SPI_NUC900

	tristate "Nuvoton NUC900 series SPI"

	depends on ARCH_W90X900

	select SPI_BITBANG

	help

	  SPI driver for Nuvoton NUC900 series ARM SoCs



config SPI_OC_TINY

	tristate "OpenCores tiny SPI"

	depends on GPIOLIB || COMPILE_TEST
@@ -415,10 +455,6 @@ config SPI_PPC4xx 
	help

	  This selects a driver for the PPC4xx SPI Controller.



config SPI_PXA2XX_DMA

	def_bool y

	depends on SPI_PXA2XX



config SPI_PXA2XX

	tristate "PXA2xx SSP SPI master"

	depends on (ARCH_PXA || PCI || ACPI)
@@ -451,7 +487,7 @@ config SPI_RB4XX 


config SPI_RSPI

	tristate "Renesas RSPI/QSPI controller"

	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST

	depends on SUPERH || ARCH_RENESAS || COMPILE_TEST

	help

	  SPI driver for Renesas RSPI and QSPI blocks.
@@ -501,7 +537,7 @@ config SPI_SC18IS602 
config SPI_SH_MSIOF

	tristate "SuperH MSIOF SPI controller"

	depends on HAVE_CLK && HAS_DMA

	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST

	depends on SUPERH || ARCH_RENESAS || COMPILE_TEST

	help

	  SPI driver for SuperH and SH Mobile MSIOF blocks.
@@ -520,7 +556,7 @@ config SPI_SH_SCI 


config SPI_SH_HSPI

	tristate "SuperH HSPI controller"

	depends on ARCH_SHMOBILE || COMPILE_TEST

	depends on ARCH_RENESAS || COMPILE_TEST

	help

	  SPI driver for SuperH HSPI blocks.
@@ -647,34 +683,10 @@ config SPI_ZYNQMP_GQSPI 
	help

	  Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC.



config SPI_NUC900

	tristate "Nuvoton NUC900 series SPI"

	depends on ARCH_W90X900

	select SPI_BITBANG

	help

	  SPI driver for Nuvoton NUC900 series ARM SoCs



#

# Add new SPI master controllers in alphabetical order above this line

#



config SPI_DESIGNWARE

	tristate "DesignWare SPI controller core support"

	help

	  general driver for SPI controller core from DesignWare



config SPI_DW_PCI

	tristate "PCI interface driver for DW SPI core"

	depends on SPI_DESIGNWARE && PCI



config SPI_DW_MID_DMA

	bool "DMA support for DW SPI controller on Intel MID platform"

	depends on SPI_DW_PCI && DW_DMAC_PCI



config SPI_DW_MMIO

	tristate "Memory-mapped io interface driver for DW SPI core"

	depends on SPI_DESIGNWARE



#

# There are lots of SPI device types, with sensors and memory

# being probably the most widely used ones.

CRA Git | Maintained and supported by SUSTech CRA and CCSE