aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 21:16:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 21:16:26 -0400
commit28596c9722289b2f98fa83a2e4351eb0a031b953 (patch)
treef1a76a8a2604ac710bad28e3ad1b5976601c82d4 /Documentation/devicetree/bindings
parentb6420ebd4a541455a75f9802f58cfa3ba0ea5390 (diff)
parent7bb38d57fd75f03753a5b362916c5bbde8290208 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina: "Usual pile from trivial tree everyone is so eagerly waiting for" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Remove MN10300_PROC_MN2WS0038 mei: fix comments treewide: Fix typos in Kconfig kprobes: update jprobe_example.c for do_fork() change Documentation: change "&" to "and" in Documentation/applying-patches.txt Documentation: remove obsolete pcmcia-cs from Changes Documentation: update links in Changes Documentation: Docbook: Fix generated DocBook/kernel-api.xml score: Remove GENERIC_HAS_IOMAP gpio: fix 'CONFIG_GPIO_IRQCHIP' comments tty: doc: Fix grammar in serial/tty dma-debug: modify check_for_stack output treewide: fix errors in printk genirq: fix reference in devm_request_threaded_irq comment treewide: fix synchronize_rcu() in comments checkstack.pl: port to AArch64 doc: queue-sysfs: minor fixes init/do_mounts: better syntax description MIPS: fix comment spelling powerpc/simpleboot: fix comment ...
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/clock/arm-integrator.txt2
-rw-r--r--Documentation/devicetree/bindings/crypto/fsl-sec6.txt2
-rw-r--r--Documentation/devicetree/bindings/iio/adc/vf610-adc.txt2
-rw-r--r--Documentation/devicetree/bindings/mfd/s2mps11.txt2
-rw-r--r--Documentation/devicetree/bindings/mtd/gpmc-nand.txt6
-rw-r--r--Documentation/devicetree/bindings/net/samsung-sxgbe.txt2
-rw-r--r--Documentation/devicetree/bindings/net/stmmac.txt2
-rw-r--r--Documentation/devicetree/bindings/pci/host-generic-pci.txt2
-rw-r--r--Documentation/devicetree/bindings/phy/phy-bindings.txt2
-rw-r--r--Documentation/devicetree/bindings/power_supply/charger-manager.txt2
-rw-r--r--Documentation/devicetree/bindings/sound/st,sta350.txt2
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt2
-rw-r--r--Documentation/devicetree/bindings/video/atmel,lcdc.txt4
-rw-r--r--Documentation/devicetree/bindings/video/fsl,imx-fb.txt2
14 files changed, 17 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/clock/arm-integrator.txt b/Documentation/devicetree/bindings/clock/arm-integrator.txt
index ecc69520bcea..11f5f95f571b 100644
--- a/Documentation/devicetree/bindings/clock/arm-integrator.txt
+++ b/Documentation/devicetree/bindings/clock/arm-integrator.txt
@@ -1,6 +1,6 @@
1Clock bindings for ARM Integrator and Versatile Core Module clocks 1Clock bindings for ARM Integrator and Versatile Core Module clocks
2 2
3Auxilary Oscillator Clock 3Auxiliary Oscillator Clock
4 4
5This is a configurable clock fed from a 24 MHz chrystal, 5This is a configurable clock fed from a 24 MHz chrystal,
6used for generating e.g. video clocks. It is located on the 6used for generating e.g. video clocks. It is located on the
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
index c0a20cd972e3..baf8a3c1b469 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt
@@ -1,5 +1,5 @@
1SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM). 1SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM).
2Currently Freescale powerpc chip C29X is embeded with SEC 6. 2Currently Freescale powerpc chip C29X is embedded with SEC 6.
3SEC 6 device tree binding include: 3SEC 6 device tree binding include:
4 -SEC 6 Node 4 -SEC 6 Node
5 -Job Ring Node 5 -Job Ring Node
diff --git a/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt b/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
index dcebff1928e1..1a4a43d5c9ea 100644
--- a/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
@@ -9,7 +9,7 @@ Required properties:
9- interrupts: Should contain the interrupt for the device 9- interrupts: Should contain the interrupt for the device
10- clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock. 10- clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock.
11- clock-names: Must contain "adc", matching entry in the clocks property. 11- clock-names: Must contain "adc", matching entry in the clocks property.
12- vref-supply: The regulator supply ADC refrence voltage. 12- vref-supply: The regulator supply ADC reference voltage.
13 13
14Example: 14Example:
15adc0: adc@4003b000 { 15adc0: adc@4003b000 {
diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index ba2d7f0f9c5f..0e4026a6cbbf 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -47,7 +47,7 @@ sub-node should be of the format as listed below.
47 47
48 regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us 48 regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us
49 49
50 BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explictly 50 BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explicitly
51 regulator-ramp-delay = <0> can be used for them to disable ramp delay. 51 regulator-ramp-delay = <0> can be used for them to disable ramp delay.
52 In the absence of the regulator-ramp-delay property, the default ramp 52 In the absence of the regulator-ramp-delay property, the default ramp
53 delay will be used. 53 delay will be used.
diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index ee654e95d8ad..fb733c4e1c11 100644
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -110,8 +110,8 @@ on various other factors also like;
110 Other factor which governs the selection of ecc-scheme is oob-size. 110 Other factor which governs the selection of ecc-scheme is oob-size.
111 Higher ECC schemes require more OOB/Spare area to store ECC syndrome, 111 Higher ECC schemes require more OOB/Spare area to store ECC syndrome,
112 so the device should have enough free bytes available its OOB/Spare 112 so the device should have enough free bytes available its OOB/Spare
113 area to accomodate ECC for entire page. In general following expression 113 area to accommodate ECC for entire page. In general following expression
114 helps in determining if given device can accomodate ECC syndrome: 114 helps in determining if given device can accommodate ECC syndrome:
115 "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE" 115 "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"
116 where 116 where
117 OOBSIZE number of bytes in OOB/spare area 117 OOBSIZE number of bytes in OOB/spare area
@@ -133,5 +133,5 @@ on various other factors also like;
133 Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and 133 Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and
134 trying to use BCH16 (ECC_BYTES=26) ecc-scheme. 134 trying to use BCH16 (ECC_BYTES=26) ecc-scheme.
135 Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B 135 Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B
136 which can be accomodate in the OOB/Spare area of this device 136 which can be accommodated in the OOB/Spare area of this device
137 (OOBSIZE=128). So this device can use BCH16 ecc-scheme. 137 (OOBSIZE=128). So this device can use BCH16 ecc-scheme.
diff --git a/Documentation/devicetree/bindings/net/samsung-sxgbe.txt b/Documentation/devicetree/bindings/net/samsung-sxgbe.txt
index 989f6c95cfd5..888c250197fe 100644
--- a/Documentation/devicetree/bindings/net/samsung-sxgbe.txt
+++ b/Documentation/devicetree/bindings/net/samsung-sxgbe.txt
@@ -17,7 +17,7 @@ Required properties:
17- samsung,pbl: Integer, Programmable Burst Length. 17- samsung,pbl: Integer, Programmable Burst Length.
18 Supported values are 1, 2, 4, 8, 16, or 32. 18 Supported values are 1, 2, 4, 8, 16, or 32.
19- samsung,burst-map: Integer, Program the possible bursts supported by sxgbe 19- samsung,burst-map: Integer, Program the possible bursts supported by sxgbe
20 This is an interger and represents allowable DMA bursts when fixed burst. 20 This is an integer and represents allowable DMA bursts when fixed burst.
21 Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled. 21 Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled.
22 When fixed length is needed for burst mode, it can be set within allowable 22 When fixed length is needed for burst mode, it can be set within allowable
23 range. 23 range.
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index e45ac3f926b1..c41afd963edf 100644
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -58,5 +58,5 @@ Examples:
58 snps,multicast-filter-bins = <256>; 58 snps,multicast-filter-bins = <256>;
59 snps,perfect-filter-entries = <128>; 59 snps,perfect-filter-entries = <128>;
60 clocks = <&clock>; 60 clocks = <&clock>;
61 clock-names = "stmmaceth">; 61 clock-names = "stmmaceth";
62 }; 62 };
diff --git a/Documentation/devicetree/bindings/pci/host-generic-pci.txt b/Documentation/devicetree/bindings/pci/host-generic-pci.txt
index f0b0436807b4..cf3e205e0b7e 100644
--- a/Documentation/devicetree/bindings/pci/host-generic-pci.txt
+++ b/Documentation/devicetree/bindings/pci/host-generic-pci.txt
@@ -55,7 +55,7 @@ For CAM, this 24-bit offset is:
55 cfg_offset(bus, device, function, register) = 55 cfg_offset(bus, device, function, register) =
56 bus << 16 | device << 11 | function << 8 | register 56 bus << 16 | device << 11 | function << 8 | register
57 57
58Whilst ECAM extends this by 4 bits to accomodate 4k of function space: 58Whilst ECAM extends this by 4 bits to accommodate 4k of function space:
59 59
60 cfg_offset(bus, device, function, register) = 60 cfg_offset(bus, device, function, register) =
61 bus << 20 | device << 15 | function << 12 | register 61 bus << 20 | device << 15 | function << 12 | register
diff --git a/Documentation/devicetree/bindings/phy/phy-bindings.txt b/Documentation/devicetree/bindings/phy/phy-bindings.txt
index 2aa1840200ed..1293c321754c 100644
--- a/Documentation/devicetree/bindings/phy/phy-bindings.txt
+++ b/Documentation/devicetree/bindings/phy/phy-bindings.txt
@@ -27,7 +27,7 @@ phys: phy {
27}; 27};
28 28
29That node describes an IP block (PHY provider) that implements 2 different PHYs. 29That node describes an IP block (PHY provider) that implements 2 different PHYs.
30In order to differentiate between these 2 PHYs, an additonal specifier should be 30In order to differentiate between these 2 PHYs, an additional specifier should be
31given while trying to get a reference to it. 31given while trying to get a reference to it.
32 32
33PHY user node 33PHY user node
diff --git a/Documentation/devicetree/bindings/power_supply/charger-manager.txt b/Documentation/devicetree/bindings/power_supply/charger-manager.txt
index 2b33750e3db2..ec4fe9de3137 100644
--- a/Documentation/devicetree/bindings/power_supply/charger-manager.txt
+++ b/Documentation/devicetree/bindings/power_supply/charger-manager.txt
@@ -24,7 +24,7 @@ Optional properties :
24 - cm-thermal-zone : name of external thermometer's thermal zone 24 - cm-thermal-zone : name of external thermometer's thermal zone
25 - cm-battery-* : threshold battery temperature for charging 25 - cm-battery-* : threshold battery temperature for charging
26 -cold : critical cold temperature of battery for charging 26 -cold : critical cold temperature of battery for charging
27 -cold-in-minus : flag that cold temerature is in minus degree 27 -cold-in-minus : flag that cold temperature is in minus degrees
28 -hot : critical hot temperature of battery for charging 28 -hot : critical hot temperature of battery for charging
29 -temp-diff : temperature difference to allow recharging 29 -temp-diff : temperature difference to allow recharging
30 - cm-dis/charging-max = limits of charging duration 30 - cm-dis/charging-max = limits of charging duration
diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt
index b7e71bf5caf4..307398ef2317 100644
--- a/Documentation/devicetree/bindings/sound/st,sta350.txt
+++ b/Documentation/devicetree/bindings/sound/st,sta350.txt
@@ -33,7 +33,7 @@ Optional properties:
33 0: Channel 1 33 0: Channel 1
34 1: Channel 2 34 1: Channel 2
35 2: Channel 3 35 2: Channel 3
36 If parameter is missing, channel 1 is choosen. 36 If parameter is missing, channel 1 is chosen.
37 This properties have to be specified as '/bits/ 8' values. 37 This properties have to be specified as '/bits/ 8' values.
38 38
39 - st,thermal-warning-recover: 39 - st,thermal-warning-recover:
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 6073e76575ea..252e4e4c122a 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -140,7 +140,7 @@ tlm Trusted Logic Mobility
140toradex Toradex AG 140toradex Toradex AG
141toshiba Toshiba Corporation 141toshiba Toshiba Corporation
142toumaz Toumaz 142toumaz Toumaz
143usi Universal Scientifc Industrial Co., Ltd. 143usi Universal Scientific Industrial Co., Ltd.
144v3 V3 Semiconductor 144v3 V3 Semiconductor
145variscite Variscite Ltd. 145variscite Variscite Ltd.
146via VIA Technologies, Inc. 146via VIA Technologies, Inc.
diff --git a/Documentation/devicetree/bindings/video/atmel,lcdc.txt b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
index b75af94a5e52..7d0c4a1ab811 100644
--- a/Documentation/devicetree/bindings/video/atmel,lcdc.txt
+++ b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
@@ -39,8 +39,8 @@ Atmel LCDC Display
39----------------------------------------------------- 39-----------------------------------------------------
40Required properties (as per of_videomode_helper): 40Required properties (as per of_videomode_helper):
41 41
42 - atmel,dmacon: dma controler configuration 42 - atmel,dmacon: dma controller configuration
43 - atmel,lcdcon2: lcd controler configuration 43 - atmel,lcdcon2: lcd controller configuration
44 - atmel,guard-time: lcd guard time (Delay in frame periods) 44 - atmel,guard-time: lcd guard time (Delay in frame periods)
45 - bits-per-pixel: lcd panel bit-depth. 45 - bits-per-pixel: lcd panel bit-depth.
46 46
diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
index 0329f60d431e..8c8c2f4e4c3f 100644
--- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+++ b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
@@ -20,7 +20,7 @@ Optional properties:
20 register is not modified as recommended by the datasheet. 20 register is not modified as recommended by the datasheet.
21- fsl,lpccr: Contrast Control Register value. This property provides the 21- fsl,lpccr: Contrast Control Register value. This property provides the
22 default value for the contrast control register. 22 default value for the contrast control register.
23 If that property is ommited, the register is zeroed. 23 If that property is omitted, the register is zeroed.
24- fsl,lscr1: LCDC Sharp Configuration Register value. 24- fsl,lscr1: LCDC Sharp Configuration Register value.
25 25
26Example: 26Example: