aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-04 14:40:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-04 14:40:58 -0400
commit80cc38b16389849a6e06441ace4530f6b2497c3c (patch)
tree1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/devicetree/bindings
parent3366dd9fa887ebbda4872e9554f853eaeda764be (diff)
parent83a35e360433b58791bc9c4e288cace466d62e3a (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')
-rw-r--r--Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt6
-rw-r--r--Documentation/devicetree/bindings/arm/spear/shirq.txt2
-rw-r--r--Documentation/devicetree/bindings/clock/silabs,si5351.txt2
-rw-r--r--Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt2
-rw-r--r--Documentation/devicetree/bindings/powerpc/4xx/emac.txt2
-rw-r--r--Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt2
-rw-r--r--Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt2
-rw-r--r--Documentation/devicetree/bindings/usb/am33xx-usb.txt2
-rw-r--r--Documentation/devicetree/bindings/usb/omap-usb.txt2
9 files changed, 11 insertions, 11 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
5for the group. The interrupt request from each group are connected to a parent 5for the group. The interrupt request from each group are connected to a parent
6interrupt controller, such as GIC in case of Exynos4210. 6interrupt controller, such as GIC in case of Exynos4210.
7 7
8The interrupt combiner controller consists of multiple combiners. Upto eight 8The interrupt combiner controller consists of multiple combiners. Up to eight
9interrupt sources can be connected to a combiner. The combiner outputs one 9interrupt sources can be connected to a combiner. The combiner outputs one
10combined interrupt for its eight interrupt sources. The combined interrupt 10combined interrupt for its eight interrupt sources. The combined interrupt
11is usually connected to a parent interrupt controller. 11is 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
14controller module (which includes multiple combiners). A combiner in the 14controller module (which includes multiple combiners). A combiner in the
15interrupt controller module shares config/control registers with other 15interrupt controller module shares config/control registers with other
16combiners. For example, a 32-bit interrupt enable/disable config register 16combiners. For example, a 32-bit interrupt enable/disable config register
17can accommodate upto 4 interrupt combiners (with each combiner supporting 17can accommodate up to 4 interrupt combiners (with each combiner supporting
18upto 8 interrupt sources). 18up to 8 interrupt sources).
19 19
20Required properties: 20Required 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
14interrupt multiplexor (one node for all groups). A group in the 14interrupt multiplexor (one node for all groups). A group in the
15interrupt controller shares config/control registers with other groups. 15interrupt controller shares config/control registers with other groups.
16For example, a 32-bit interrupt enable/disable config register can 16For example, a 32-bit interrupt enable/disable config register can
17accommodate upto 4 interrupt groups. 17accommodate up to 4 interrupt groups.
18 18
19Required properties: 19Required properties:
20 - compatible: should be, either of 20 - compatible: should be, either of
diff --git a/Documentation/devicetree/bindings/clock/silabs,si5351.txt b/Documentation/devicetree/bindings/clock/silabs,si5351.txt
index 66c75b2d6158..c40711e8e8f7 100644
--- a/Documentation/devicetree/bindings/clock/silabs,si5351.txt
+++ b/Documentation/devicetree/bindings/clock/silabs,si5351.txt
@@ -4,7 +4,7 @@ Reference
4[1] Si5351A/B/C Data Sheet 4[1] Si5351A/B/C Data Sheet
5 http://www.silabs.com/Support%20Documents/TechnicalDocs/Si5351.pdf 5 http://www.silabs.com/Support%20Documents/TechnicalDocs/Si5351.pdf
6 6
7The Si5351a/b/c are programmable i2c clock generators with upto 8 output 7The Si5351a/b/c are programmable i2c clock generators with up to 8 output
8clocks. Si5351a also has a reduced pin-count package (MSOP10) where only 8clocks. Si5351a also has a reduced pin-count package (MSOP10) where only
93 output clocks are accessible. The internal structure of the clock 93 output clocks are accessible. The internal structure of the clock
10generators can be found in [1]. 10generators can be found in [1].
diff --git a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
index 726fd2122a13..1180d7814af8 100644
--- a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
@@ -51,7 +51,7 @@ Optional properties:
51* card-detect-delay: Delay in milli-seconds before detecting card after card 51* card-detect-delay: Delay in milli-seconds before detecting card after card
52 insert event. The default value is 0. 52 insert event. The default value is 0.
53 53
54* supports-highspeed: Enables support for high speed cards (upto 50MHz) 54* supports-highspeed: Enables support for high speed cards (up to 50MHz)
55 55
56* broken-cd: as documented in mmc core bindings. 56* broken-cd: as documented in mmc core bindings.
57 57
diff --git a/Documentation/devicetree/bindings/powerpc/4xx/emac.txt b/Documentation/devicetree/bindings/powerpc/4xx/emac.txt
index 2161334a7ca5..712baf6c3e24 100644
--- a/Documentation/devicetree/bindings/powerpc/4xx/emac.txt
+++ b/Documentation/devicetree/bindings/powerpc/4xx/emac.txt
@@ -1,7 +1,7 @@
1 4xx/Axon EMAC ethernet nodes 1 4xx/Axon EMAC ethernet nodes
2 2
3 The EMAC ethernet controller in IBM and AMCC 4xx chips, and also 3 The EMAC ethernet controller in IBM and AMCC 4xx chips, and also
4 the Axon bridge. To operate this needs to interact with a ths 4 the Axon bridge. To operate this needs to interact with a this
5 special McMAL DMA controller, and sometimes an RGMII or ZMII 5 special McMAL DMA controller, and sometimes an RGMII or ZMII
6 interface. In addition to the nodes and properties described 6 interface. In addition to the nodes and properties described
7 below, the node for the OPB bus on which the EMAC sits must have a 7 below, the node for the OPB bus on which the EMAC sits must have a
diff --git a/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt b/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt
index 8bf89c643640..f11f295c8450 100644
--- a/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt
+++ b/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt
@@ -2,7 +2,7 @@ Broadcom BCM2835 SPI0 controller
2 2
3The BCM2835 contains two forms of SPI master controller, one known simply as 3The BCM2835 contains two forms of SPI master controller, one known simply as
4SPI0, and the other known as the "Universal SPI Master"; part of the 4SPI0, and the other known as the "Universal SPI Master"; part of the
5auxilliary block. This binding applies to the SPI0 controller. 5auxiliary block. This binding applies to the SPI0 controller.
6 6
7Required properties: 7Required properties:
8- compatible: Should be "brcm,bcm2835-spi". 8- compatible: Should be "brcm,bcm2835-spi".
diff --git a/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt b/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
index cb47bfbcaeea..b5a86d20ee36 100644
--- a/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
+++ b/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
@@ -44,7 +44,7 @@ Example 1: In this example, the system uses only the first global timer
44 }; 44 };
45 45
46Example 2: In this example, the MCT global and local timer interrupts are 46Example 2: In this example, the MCT global and local timer interrupts are
47 connected to two seperate interrupt controllers. Hence, an 47 connected to two separate interrupt controllers. Hence, an
48 interrupt-map is created to map the interrupts to the respective 48 interrupt-map is created to map the interrupts to the respective
49 interrupt controllers. 49 interrupt controllers.
50 50
diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt
index ea840f7f9258..dc9dc8c87f15 100644
--- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt
@@ -12,7 +12,7 @@ AM33XX MUSB GLUE
12 represents PERIPHERAL. 12 represents PERIPHERAL.
13 - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2" 13 - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2"
14 represents PERIPHERAL. 14 represents PERIPHERAL.
15 - power : Should be "250". This signifies the controller can supply upto 15 - power : Should be "250". This signifies the controller can supply up to
16 500mA when operating in host mode. 16 500mA when operating in host mode.
17 17
18Example: 18Example:
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index d4769f343d6c..57e71f6817d0 100644
--- a/Documentation/devicetree/bindings/usb/omap-usb.txt
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -16,7 +16,7 @@ OMAP MUSB GLUE
16 specifying ULPI and UTMI respectively. 16 specifying ULPI and UTMI respectively.
17 - mode : Should be "3" to represent OTG. "1" signifies HOST and "2" 17 - mode : Should be "3" to represent OTG. "1" signifies HOST and "2"
18 represents PERIPHERAL. 18 represents PERIPHERAL.
19 - power : Should be "50". This signifies the controller can supply upto 19 - power : Should be "50". This signifies the controller can supply up to
20 100mA when operating in host mode. 20 100mA when operating in host mode.
21 - usb-phy : the phandle for the PHY device 21 - usb-phy : the phandle for the PHY device
22 22