diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/devicetree/bindings/arm | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r-- | Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt | 6 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/arm/spear/shirq.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt b/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt index f2f2171e530e..9e5f73412cd7 100644 --- a/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt +++ b/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt | |||
@@ -5,7 +5,7 @@ can combine interrupt sources as a group and provide a single interrupt request | |||
5 | for the group. The interrupt request from each group are connected to a parent | 5 | for the group. The interrupt request from each group are connected to a parent |
6 | interrupt controller, such as GIC in case of Exynos4210. | 6 | interrupt controller, such as GIC in case of Exynos4210. |
7 | 7 | ||
8 | The interrupt combiner controller consists of multiple combiners. Upto eight | 8 | The interrupt combiner controller consists of multiple combiners. Up to eight |
9 | interrupt sources can be connected to a combiner. The combiner outputs one | 9 | interrupt sources can be connected to a combiner. The combiner outputs one |
10 | combined interrupt for its eight interrupt sources. The combined interrupt | 10 | combined interrupt for its eight interrupt sources. The combined interrupt |
11 | is usually connected to a parent interrupt controller. | 11 | is usually connected to a parent interrupt controller. |
@@ -14,8 +14,8 @@ A single node in the device tree is used to describe the interrupt combiner | |||
14 | controller module (which includes multiple combiners). A combiner in the | 14 | controller module (which includes multiple combiners). A combiner in the |
15 | interrupt controller module shares config/control registers with other | 15 | interrupt controller module shares config/control registers with other |
16 | combiners. For example, a 32-bit interrupt enable/disable config register | 16 | combiners. For example, a 32-bit interrupt enable/disable config register |
17 | can accommodate upto 4 interrupt combiners (with each combiner supporting | 17 | can accommodate up to 4 interrupt combiners (with each combiner supporting |
18 | upto 8 interrupt sources). | 18 | up to 8 interrupt sources). |
19 | 19 | ||
20 | Required properties: | 20 | Required properties: |
21 | - compatible: should be "samsung,exynos4210-combiner". | 21 | - compatible: should be "samsung,exynos4210-combiner". |
diff --git a/Documentation/devicetree/bindings/arm/spear/shirq.txt b/Documentation/devicetree/bindings/arm/spear/shirq.txt index 13fbb8866bd6..715a013ed4bd 100644 --- a/Documentation/devicetree/bindings/arm/spear/shirq.txt +++ b/Documentation/devicetree/bindings/arm/spear/shirq.txt | |||
@@ -14,7 +14,7 @@ A single node in the device tree is used to describe the shared | |||
14 | interrupt multiplexor (one node for all groups). A group in the | 14 | interrupt multiplexor (one node for all groups). A group in the |
15 | interrupt controller shares config/control registers with other groups. | 15 | interrupt controller shares config/control registers with other groups. |
16 | For example, a 32-bit interrupt enable/disable config register can | 16 | For example, a 32-bit interrupt enable/disable config register can |
17 | accommodate upto 4 interrupt groups. | 17 | accommodate up to 4 interrupt groups. |
18 | 18 | ||
19 | Required properties: | 19 | Required properties: |
20 | - compatible: should be, either of | 20 | - compatible: should be, either of |