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

Commit 0051db82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi updates from Mark Brown:
 "The main thing this release has been a lot of work on the integration
  with SPI NOR flashes, there's been some specific support for a while
  for controller features designed to make them perform better but it's
  not worked out as well as hoped so the interface has been redesigned
  in a way that will hopefully do better - it's already been adopted by
  a number of additional controllers so things are looking good.

  Otherwise most of the work has been driver specific:

   - Support for better integration with NOR flashes from Boris
     Brezillon and Yogesh Narayan Gaur plus usage of it in several
     drivers.

   - A big cleanup of the Rockchip driver from Emil Renner Berthing.

   - Lots of performance improvements for bcm2835 from Lukas Wunner.

   - Slave mode support for pxa2xx from Lubomir Rintel.

   - Support for Macronix MXIC, Mediatek MT7629 and MT8183, NPCM PSPI,
     and Renesas r8a77470"

* tag 'spi-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (90 commits)
  spi: sh-msiof: Reduce the number of times write to and perform the transmission from FIFO
  spi: sh-msiof: Add r8a774c0 support
  doc: lpspi: Document DT bindings for LPSPI slave mode
  spi: lpspi: Let watermark change with send data length
  spi: lpspi: Add slave mode support
  spi: lpspi: Replace all "master" with "controller"
  spi: imx: drop useless member speed_hz from driver data struct
  spi: imx: rename config callback and add useful parameters
  spi: imx: style fixes
  spi: imx: mx51-ecspi: Move some initialisation to prepare_message hook.
  spi: imx: add a device specific prepare_message callback
  mtd: atmel-quadspi: disallow building on ebsa110
  spi: Update NPCM PSPI controller documentation
  spi: npcm: Modify pspi send function
  spi: Use of_node_name_eq for node name comparisons
  spi: dw-mmio: add ACPI support
  spi: bcm2835: Synchronize with callback on DMA termination
  spi: bcm2835: Speed up FIFO access if fill level is known
  spi: bcm2835: Polish transfer of DMA prologue
  spi: spi-mem: add support for octal mode I/O data transfer
  ...
parents 79f20778 74ff666b

Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
Nuvoton NPCM Peripheral Serial Peripheral Interface(PSPI) controller driver



Nuvoton NPCM7xx SOC support two PSPI channels.



Required properties:

 - compatible : "nuvoton,npcm750-pspi" for NPCM7XX BMC

 - #address-cells : should be 1. see spi-bus.txt

 - #size-cells : should be 0. see spi-bus.txt

 - specifies physical base address and size of the register.

 - interrupts : contain PSPI interrupt.

 - clocks : phandle of PSPI reference clock.

 - clock-names: Should be "clk_apb5".

 - pinctrl-names : a pinctrl state named "default" must be defined.

 - pinctrl-0 : phandle referencing pin configuration of the device.

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

            See: Documentation/devicetree/bindings/spi/spi-bus.txt



Optional properties:

- clock-frequency : Input clock frequency to the PSPI block in Hz.

		    Default is 25000000 Hz.



Aliases:

- All the SPI controller nodes should be represented in the aliases node using

  the following format 'spi{n}' withe the correct numbered in "aliases" node.



Example:



aliases {

	spi0 = &spi0;

};



spi0: spi@f0200000 {

	compatible = "nuvoton,npcm750-pspi";

	reg = <0xf0200000 0x1000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pspi1_pins>;

	#address-cells = <1>;

	#size-cells = <0>;

	interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clk NPCM7XX_CLK_APB5>;

	clock-names = "clk_apb5";

	cs-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ OMAP2+ McSPI device 


Required properties:

- compatible :

  - "ti,am654-mcspi" for AM654.

  - "ti,omap2-mcspi" for OMAP2 & OMAP3.

  - "ti,omap4-mcspi" for OMAP4+.

- ti,spi-num-cs : Number of chipselect supported  by the instance.

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
			 "renesas,msiof-r8a7744" (RZ/G1N)

			 "renesas,msiof-r8a7745" (RZ/G1E)

			 "renesas,msiof-r8a774a1" (RZ/G2M)

			 "renesas,msiof-r8a774c0" (RZ/G2E)

			 "renesas,msiof-r8a7790" (R-Car H2)

			 "renesas,msiof-r8a7791" (R-Car M2-W)

			 "renesas,msiof-r8a7792" (R-Car V2H)

Documentation/devicetree/bindings/spi/spi-fsl-lpspi.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ Required properties: 
  - "fsl,imx7ulp-spi" for LPSPI compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx8qxp-spi" for LPSPI compatible with the one integrated on i.MX8QXP soc

- reg : address and length of the lpspi master registers

- interrupt-parent : core interrupt controller

- interrupts : lpspi interrupt

- clocks : lpspi clock specifier

- spi-slave : spi slave mode support. In slave mode, add this attribute without

	      value. In master mode, remove it.



Examples:
@@ -16,4 +19,5 @@ lpspi2: lpspi@40290000 { 
	interrupt-parent = <&intc>;

	interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clks IMX7ULP_CLK_LPSPI2>;

	spi-slave;

};