diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
| commit | 1aacb90eaaac057c10fd746e189553e04cfeb291 (patch) | |
| tree | eaf5b2eddc9e2e446b5402c106a3bf086aee925a /Documentation/devicetree/bindings/spi/spi-bus.txt | |
| parent | b05d59dfceaea72565b1648af929b037b0f96d7f (diff) | |
| parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
Pull trivial tree changes from Jiri Kosina:
"Usual pile of patches from trivial tree that make the world go round"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
staging: go7007: remove reference to CONFIG_KMOD
aic7xxx: Remove obsolete preprocessor define
of: dma: doc fixes
doc: fix incorrect formula to calculate CommitLimit value
doc: Note need of bc in the kernel build from 3.10 onwards
mm: Fix printk typo in dmapool.c
modpost: Fix comment typo "Modules.symvers"
Kconfig.debug: Grammar s/addition/additional/
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
aic7xxx: Spelling s/termnation/termination/
arm64: mm: Remove superfluous "the" in comment
of: Spelling s/anonymouns/anonymous/
dma: imx-sdma: Spelling s/determnine/determine/
ath10k: Improve grammar in comments
ath6kl: Spelling s/determnine/determine/
of: Improve grammar for of_alias_get_id() documentation
drm/exynos: Spelling s/contro/control/
radio-bcm2048.c: fix wrong overflow check
doc: printk-formats: do not mention casts for u64/s64
doc: spelling error changes
...
Diffstat (limited to 'Documentation/devicetree/bindings/spi/spi-bus.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-bus.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt index 22d57404fdc3..bbaa857dd68f 100644 --- a/Documentation/devicetree/bindings/spi/spi-bus.txt +++ b/Documentation/devicetree/bindings/spi/spi-bus.txt | |||
| @@ -63,7 +63,7 @@ contain the following properties. | |||
| 63 | used for MISO. Defaults to 1 if not present. | 63 | used for MISO. Defaults to 1 if not present. |
| 64 | 64 | ||
| 65 | Some SPI controllers and devices support Dual and Quad SPI transfer mode. | 65 | Some SPI controllers and devices support Dual and Quad SPI transfer mode. |
| 66 | It allows data in SPI system transfered in 2 wires(DUAL) or 4 wires(QUAD). | 66 | It allows data in the SPI system to be transferred in 2 wires(DUAL) or 4 wires(QUAD). |
| 67 | Now the value that spi-tx-bus-width and spi-rx-bus-width can receive is | 67 | Now the value that spi-tx-bus-width and spi-rx-bus-width can receive is |
| 68 | only 1(SINGLE), 2(DUAL) and 4(QUAD). | 68 | only 1(SINGLE), 2(DUAL) and 4(QUAD). |
| 69 | Dual/Quad mode is not allowed when 3-wire mode is used. | 69 | Dual/Quad mode is not allowed when 3-wire mode is used. |