diff options
Diffstat (limited to 'Documentation/devicetree')
10 files changed, 17 insertions, 16 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 |
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 | ||
7 | The Si5351a/b/c are programmable i2c clock generators with upto 8 output | 7 | The Si5351a/b/c are programmable i2c clock generators with up to 8 output |
8 | clocks. Si5351a also has a reduced pin-count package (MSOP10) where only | 8 | clocks. Si5351a also has a reduced pin-count package (MSOP10) where only |
9 | 3 output clocks are accessible. The internal structure of the clock | 9 | 3 output clocks are accessible. The internal structure of the clock |
10 | generators can be found in [1]. | 10 | generators 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 | ||
3 | The BCM2835 contains two forms of SPI master controller, one known simply as | 3 | The BCM2835 contains two forms of SPI master controller, one known simply as |
4 | SPI0, and the other known as the "Universal SPI Master"; part of the | 4 | SPI0, and the other known as the "Universal SPI Master"; part of the |
5 | auxilliary block. This binding applies to the SPI0 controller. | 5 | auxiliary block. This binding applies to the SPI0 controller. |
6 | 6 | ||
7 | Required properties: | 7 | Required 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 | ||
46 | Example 2: In this example, the MCT global and local timer interrupts are | 46 | Example 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 | ||
18 | Example: | 18 | Example: |
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 | ||
diff --git a/Documentation/devicetree/usage-model.txt b/Documentation/devicetree/usage-model.txt index 0efedaad5165..2b6b3d3f0388 100644 --- a/Documentation/devicetree/usage-model.txt +++ b/Documentation/devicetree/usage-model.txt | |||
@@ -106,17 +106,18 @@ In the majority of cases, the machine identity is irrelevant, and the | |||
106 | kernel will instead select setup code based on the machine's core | 106 | kernel will instead select setup code based on the machine's core |
107 | CPU or SoC. On ARM for example, setup_arch() in | 107 | CPU or SoC. On ARM for example, setup_arch() in |
108 | arch/arm/kernel/setup.c will call setup_machine_fdt() in | 108 | arch/arm/kernel/setup.c will call setup_machine_fdt() in |
109 | arch/arm/kernel/devicetree.c which searches through the machine_desc | 109 | arch/arm/kernel/devtree.c which searches through the machine_desc |
110 | table and selects the machine_desc which best matches the device tree | 110 | table and selects the machine_desc which best matches the device tree |
111 | data. It determines the best match by looking at the 'compatible' | 111 | data. It determines the best match by looking at the 'compatible' |
112 | property in the root device tree node, and comparing it with the | 112 | property in the root device tree node, and comparing it with the |
113 | dt_compat list in struct machine_desc. | 113 | dt_compat list in struct machine_desc (which is defined in |
114 | arch/arm/include/asm/mach/arch.h if you're curious). | ||
114 | 115 | ||
115 | The 'compatible' property contains a sorted list of strings starting | 116 | The 'compatible' property contains a sorted list of strings starting |
116 | with the exact name of the machine, followed by an optional list of | 117 | with the exact name of the machine, followed by an optional list of |
117 | boards it is compatible with sorted from most compatible to least. For | 118 | boards it is compatible with sorted from most compatible to least. For |
118 | example, the root compatible properties for the TI BeagleBoard and its | 119 | example, the root compatible properties for the TI BeagleBoard and its |
119 | successor, the BeagleBoard xM board might look like: | 120 | successor, the BeagleBoard xM board might look like, respectively: |
120 | 121 | ||
121 | compatible = "ti,omap3-beagleboard", "ti,omap3450", "ti,omap3"; | 122 | compatible = "ti,omap3-beagleboard", "ti,omap3450", "ti,omap3"; |
122 | compatible = "ti,omap3-beagleboard-xm", "ti,omap3450", "ti,omap3"; | 123 | compatible = "ti,omap3-beagleboard-xm", "ti,omap3450", "ti,omap3"; |
@@ -161,7 +162,7 @@ cases. | |||
161 | 162 | ||
162 | Instead, the compatible list allows a generic machine_desc to provide | 163 | Instead, the compatible list allows a generic machine_desc to provide |
163 | support for a wide common set of boards by specifying "less | 164 | support for a wide common set of boards by specifying "less |
164 | compatible" value in the dt_compat list. In the example above, | 165 | compatible" values in the dt_compat list. In the example above, |
165 | generic board support can claim compatibility with "ti,omap3" or | 166 | generic board support can claim compatibility with "ti,omap3" or |
166 | "ti,omap3450". If a bug was discovered on the original beagleboard | 167 | "ti,omap3450". If a bug was discovered on the original beagleboard |
167 | that required special workaround code during early boot, then a new | 168 | that required special workaround code during early boot, then a new |
@@ -377,7 +378,7 @@ platform_devices as more platform_devices is a common pattern, and the | |||
377 | device tree support code reflects that and makes the above example | 378 | device tree support code reflects that and makes the above example |
378 | simpler. The second argument to of_platform_populate() is an | 379 | simpler. The second argument to of_platform_populate() is an |
379 | of_device_id table, and any node that matches an entry in that table | 380 | of_device_id table, and any node that matches an entry in that table |
380 | will also get its child nodes registered. In the tegra case, the code | 381 | will also get its child nodes registered. In the Tegra case, the code |
381 | can look something like this: | 382 | can look something like this: |
382 | 383 | ||
383 | static void __init harmony_init_machine(void) | 384 | static void __init harmony_init_machine(void) |