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

Commit 010b0e70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi updates from Mark Brown:
 "Quite an active release for the SPI subsystem, lots of small updates
  and fixes scattered about with highlights including:

   - 3-wire support in the GPIO driver.

   - support for setting a custom memory name in the memory mapped flash
     drivers.

   - support for extended mode in the Freescale DSPI controller.

   - support for the non-standard integration with the Microsemi Ocelot
     platform in the DesignWare driver.

   - new driver for the SocioNext UniPhier"

* tag 'spi-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (47 commits)
  spi: davinci: fix a NULL pointer dereference
  spi: spi-mem: Constify spi_mem->name
  mtd: m25p80: Call spi_mem_get_name() to let controller set a custom name
  spi: spi-mem: Extend the SPI mem interface to set a custom memory name
  spi: spi-mem: Fix a typo in the documentation of struct spi_mem
  spi: uniphier: remove unnecessary include headers
  spi: spi-gpio: add SPI_3WIRE support
  spi: add flags parameter to txrx_word function pointers
  spi: add SPI controller driver for UniPhier SoC
  spi: add DT bindings for UniPhier SPI controller
  spi: dw: document Microsemi integration
  spi: img-spfi: Set device select bits for SPFI port state
  spi: omap2-mcspi: remove several redundant variables
  spi: dw-mmio: add MSCC Ocelot support
  spi: dw: export dw_spi_set_cs
  spi: spi-fsl-espi: Log fifo counters on error
  spi: imx: Use the longuest possible burst size when in dynamic_burst
  spi: imx: remove unnecessary check in spi_imx_can_dma
  spi: imx: Use correct number of bytes per words
  spi: imx: Use dynamic bursts only when bits_per_word is 8, 16 or 32
  ...
parents 792adb90 c1acb21b

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt

+4 −2
Original line number Diff line number Diff line 
Synopsys DesignWare AMBA 2.0 Synchronous Serial Interface.



Required properties:

- compatible : "snps,dw-apb-ssi"

- reg : The register base for the controller.

- compatible : "snps,dw-apb-ssi" or "mscc,<soc>-spi", where soc is "ocelot" or

  "jaguar2"

- reg : The register base for the controller. For "mscc,<soc>-spi", a second

  register set is required (named ICPU_CFG:SPI_MST)

- interrupts : One interrupt, used by the controller.

- #address-cells : <1>, as required by generic SPI binding.

- #size-cells : <0>, also as required by generic SPI binding.

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required Properties: 


- compatible: should be one of the following.

    "rockchip,rv1108-spi" for rv1108 SoCs.

    "rockchip,px30-spi", "rockchip,rk3066-spi" for px30 SoCs.

    "rockchip,rk3036-spi" for rk3036 SoCS.

    "rockchip,rk3066-spi" for rk3066 SoCs.

    "rockchip,rk3188-spi" for rk3188 SoCs.

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Socionext UniPhier SPI controller driver



UniPhier SoCs have SCSSI which supports SPI single channel.



Required properties:

 - compatible: should be "socionext,uniphier-scssi"

 - reg: address and length of the spi master registers

 - #address-cells: must be <1>, see spi-bus.txt

 - #size-cells: must be <0>, see spi-bus.txt

 - clocks: A phandle to the clock for the device.

 - resets: A phandle to the reset control for the device.



Example:



spi0: spi@54006000 {

	compatible = "socionext,uniphier-scssi";

	reg = <0x54006000 0x100>;

	#address-cells = <1>;

	#size-cells = <0>;

	clocks = <&peri_clk 11>;

	resets = <&peri_rst 11>;

};

drivers/mtd/devices/m25p80.c

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ static int m25p_probe(struct spi_mem *spimem) 
	if (data && data->name)

		nor->mtd.name = data->name;



	if (!nor->mtd.name)

		nor->mtd.name = spi_mem_get_name(spimem);



	/* For some (historical?) reason many platforms provide two different

	 * names in flash_platform_data: "name" and "type". Quite often name is

	 * set to "m25p80" and then "type" provides a real chip name.

drivers/spi/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -688,6 +688,19 @@ config SPI_TXX9 
	help

	  SPI driver for Toshiba TXx9 MIPS SoCs



config SPI_UNIPHIER

	tristate "Socionext UniPhier SPI Controller"

	depends on (ARCH_UNIPHIER || COMPILE_TEST) && OF

	help

	  This enables a driver for the Socionext UniPhier SoC SCSSI SPI controller.



	  UniPhier SoCs have SCSSI and MCSSI SPI controllers.

	  Every UniPhier SoC has SCSSI which supports single channel.

	  Older UniPhier Pro4/Pro5 also has MCSSI which support multiple channels.

	  This driver supports SCSSI only.



	  If your SoC supports SCSSI, say Y here.



config SPI_XCOMM

	tristate "Analog Devices AD-FMCOMMS1-EBZ SPI-I2C-bridge driver"

	depends on I2C