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/pinctrl/brcm,bcm11351-pinctrl.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/pinctrl/brcm,bcm11351-pinctrl.txt')
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt index 67a5db95f189..4eaae32821ae 100644 --- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt | |||
@@ -73,9 +73,9 @@ Optional Properties (for standard pins): | |||
73 | Otherwise: | 73 | Otherwise: |
74 | 0: fast slew rate | 74 | 0: fast slew rate |
75 | 1: normal slew rate | 75 | 1: normal slew rate |
76 | - input-enable: No arguements. Enable input (does not affect | 76 | - input-enable: No arguments. Enable input (does not affect |
77 | output.) | 77 | output.) |
78 | - input-disable: No arguements. Disable input (does not affect | 78 | - input-disable: No arguments. Disable input (does not affect |
79 | output.) | 79 | output.) |
80 | - drive-strength: Integer. Drive strength in mA. Valid values are | 80 | - drive-strength: Integer. Drive strength in mA. Valid values are |
81 | 2, 4, 6, 8, 10, 12, 14, 16 mA. | 81 | 2, 4, 6, 8, 10, 12, 14, 16 mA. |
@@ -99,9 +99,9 @@ Optional Properties (for I2C pins): | |||
99 | Otherwise: | 99 | Otherwise: |
100 | 0: fast slew rate | 100 | 0: fast slew rate |
101 | 1: normal slew rate | 101 | 1: normal slew rate |
102 | - input-enable: No arguements. Enable input (does not affect | 102 | - input-enable: No arguments. Enable input (does not affect |
103 | output.) | 103 | output.) |
104 | - input-disable: No arguements. Disable input (does not affect | 104 | - input-disable: No arguments. Disable input (does not affect |
105 | output.) | 105 | output.) |
106 | 106 | ||
107 | Optional Properties (for HDMI pins): | 107 | Optional Properties (for HDMI pins): |
@@ -111,9 +111,9 @@ Optional Properties (for HDMI pins): | |||
111 | - slew-rate: Integer. Controls slew rate. | 111 | - slew-rate: Integer. Controls slew rate. |
112 | 0: Standard(100kbps)& Fast(400kbps) mode | 112 | 0: Standard(100kbps)& Fast(400kbps) mode |
113 | 1: Highspeed (3.4Mbps) mode | 113 | 1: Highspeed (3.4Mbps) mode |
114 | - input-enable: No arguements. Enable input (does not affect | 114 | - input-enable: No arguments. Enable input (does not affect |
115 | output.) | 115 | output.) |
116 | - input-disable: No arguements. Disable input (does not affect | 116 | - input-disable: No arguments. Disable input (does not affect |
117 | output.) | 117 | output.) |
118 | 118 | ||
119 | Example: | 119 | Example: |