Skip to content

Commit

Permalink
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/loopback',…
Browse files Browse the repository at this point in the history
… 'spi/topic/omap', 'spi/topic/pic32' and 'spi/topic/pl022' into spi-next
  • Loading branch information
broonie committed Sep 4, 2017
6 parents a3a4246 + 602c8f4 + 8bc85a8 + b590782 + 808f515 + 5b8d5ad commit 817ef6e
Show file tree
Hide file tree
Showing 6 changed files with 228 additions and 35 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 817ef6e

Please sign in to comment.