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

Commit 50ae833e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi updates from Mark Brown:
 "A quiet release for SPI, not even many driver updates:

   - Add a dummy loopback driver for use in exercising framework
     features during development.

   - Move the test utilities to tools/ and add support for transferring
     data to and from a file instead of stdin and stdout to spidev_test.

   - Support for Mediatek MT2701 and Renesas AG5 deices"

* tag 'spi-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (69 commits)
  spi: loopback: fix typo in MODULE_PARM_DESC
  spi: sun4i: Prevent chip-select from being activated twice before a transfer
  spi: loopback-test: spi_check_rx_ranges can get always done
  spi: loopback-test: rename method spi_test_fill_tx to spi_test_fill_pattern
  spi: loopback-test: write rx pattern also when running without tx_buf
  spi: fsl-espi: expose maximum transfer size limit
  spi: expose master transfer size limitation.
  spi: zynq: use to_platform_device()
  spi: cadence: use to_platform_device()
  spi: mediatek: Add spi support for mt2701 IC
  spi: mediatek: merge all identical compat to mtk_common_compat
  spi: mtk: Add bindings for mediatek MT2701 soc platform
  spi: mediatek: Prevent overflows in FIFO transfers
  spi: s3c64xx: Remove unused platform_device_id entries
  spi: use to_spi_device
  spi: dw: Use SPI_TMOD_TR rather than magic const 0 to set tmode
  spi: imx: defer spi initialization, if DMA engine is
  spi: imx: return error from dma channel request
  spi: imx: enable loopback only for ECSPI controller family
  spi: imx: fix loopback mode setup after controller reset
  ...
parents ac53b2e0 cabeea98

Documentation/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
subdir-y := accounting auxdisplay blackfin connector \

subdir-y := accounting auxdisplay blackfin connector \

	filesystems filesystems ia64 laptops mic misc-devices \

	filesystems filesystems ia64 laptops mic misc-devices \

	networking pcmcia prctl ptp spi timers vDSO video4linux \

	networking pcmcia prctl ptp timers vDSO video4linux \

	watchdog
 
	watchdog

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

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

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

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

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

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

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

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

- reg                  : A list of offsets and lengths of the register sets for

- reg                  : A list of offsets and lengths of the register sets for

			 the device.

			 the device.

			 If only one register set is present, it is to be used

			 If only one register set is present, it is to be used

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

+5 −4
Original line number Original line Diff line number Diff line
@@ -2,9 +2,10 @@ Binding for MTK SPI controller 




Required properties:

Required properties:

- compatible: should be one of the following.

- compatible: should be one of the following.

    - mediatek,mt8173-spi: for mt8173 platforms

    - mediatek,mt2701-spi: for mt2701 platforms

    - mediatek,mt8135-spi: for mt8135 platforms

    - mediatek,mt6589-spi: for mt6589 platforms

    - mediatek,mt6589-spi: for mt6589 platforms

    - mediatek,mt8135-spi: for mt8135 platforms

    - mediatek,mt8173-spi: for mt8173 platforms





- #address-cells: should be 1.

- #address-cells: should be 1.
@@ -29,10 +30,10 @@ Required properties: 
  muxes clock, and "spi-clk" for the clock gate.

  muxes clock, and "spi-clk" for the clock gate.





Optional properties:

Optional properties:

-cs-gpios: see spi-bus.txt, only required for MT8173.

-cs-gpios: see spi-bus.txt.





- mediatek,pad-select: specify which pins group(ck/mi/mo/cs) spi

- mediatek,pad-select: specify which pins group(ck/mi/mo/cs) spi

  controller used. This is a array, the element value should be 0~3,

  controller used. This is an array, the element value should be 0~3,

  only required for MT8173.

  only required for MT8173.

    0: specify GPIO69,70,71,72 for spi pins.

    0: specify GPIO69,70,71,72 for spi pins.

    1: specify GPIO102,103,104,105 for spi pins.

    1: specify GPIO102,103,104,105 for spi pins.

Documentation/spi/00-INDEX

+0 −4
Original line number Original line Diff line number Diff line
@@ -10,13 +10,9 @@ pxa2xx 
	- PXA2xx SPI master controller build by spi_message fifo wq

	- PXA2xx SPI master controller build by spi_message fifo wq

spidev

spidev

	- Intro to the userspace API for spi devices

	- Intro to the userspace API for spi devices

spidev_fdx.c

	- spidev example file

spi-lm70llp

spi-lm70llp

	- Connecting an LM70-LLP sensor to the kernel via the SPI subsys.

	- Connecting an LM70-LLP sensor to the kernel via the SPI subsys.

spi-sc18is602

spi-sc18is602

	- NXP SC18IS602/603 I2C-bus to SPI bridge

	- NXP SC18IS602/603 I2C-bus to SPI bridge

spi-summary

spi-summary

	- (Linux) SPI overview. If unsure about SPI or SPI in Linux, start here.
 
	- (Linux) SPI overview. If unsure about SPI or SPI in Linux, start here.
 
spidev_test.c

	- SPI testing utility.

Documentation/spi/Makefile

deleted100644 → 0
+0 −8
Original line number Original line Diff line number Diff line 
# List of programs to build

hostprogs-y := spidev_test spidev_fdx



# Tell kbuild to always build the programs

always := $(hostprogs-y)



HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include

HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include