diff options
Diffstat (limited to 'Documentation/devicetree/bindings')
17 files changed, 293 insertions, 15 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt index 06fc7602593a..37b2cafa4e52 100644 --- a/Documentation/devicetree/bindings/arm/arch_timer.txt +++ b/Documentation/devicetree/bindings/arm/arch_timer.txt | |||
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs. | |||
19 | 19 | ||
20 | - clock-frequency : The frequency of the main counter, in Hz. Optional. | 20 | - clock-frequency : The frequency of the main counter, in Hz. Optional. |
21 | 21 | ||
22 | - always-on : a boolean property. If present, the timer is powered through an | ||
23 | always-on power domain, therefore it never loses context. | ||
24 | |||
22 | Example: | 25 | Example: |
23 | 26 | ||
24 | timer { | 27 | timer { |
diff --git a/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt new file mode 100644 index 000000000000..925ecbf6e7b7 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/marvell,kirkwood.txt | |||
@@ -0,0 +1,97 @@ | |||
1 | Marvell Kirkwood SoC Family Device Tree Bindings | ||
2 | ------------------------------------------------ | ||
3 | |||
4 | Boards with a SoC of the Marvell Kirkwook family, eg 88f6281 | ||
5 | |||
6 | * Required root node properties: | ||
7 | compatible: must contain "marvell,kirkwood" | ||
8 | |||
9 | In addition, the above compatible shall be extended with the specific | ||
10 | SoC. Currently known SoC compatibles are: | ||
11 | |||
12 | "marvell,kirkwood-88f6192" | ||
13 | "marvell,kirkwood-88f6281" | ||
14 | "marvell,kirkwood-88f6282" | ||
15 | "marvell,kirkwood-88f6283" | ||
16 | "marvell,kirkwood-88f6702" | ||
17 | "marvell,kirkwood-98DX4122" | ||
18 | |||
19 | And in addition, the compatible shall be extended with the specific | ||
20 | board. Currently known boards are: | ||
21 | |||
22 | "buffalo,lschlv2" | ||
23 | "buffalo,lsxhl" | ||
24 | "buffalo,lsxl" | ||
25 | "dlink,dns-320" | ||
26 | "dlink,dns-320-a1" | ||
27 | "dlink,dns-325" | ||
28 | "dlink,dns-325-a1" | ||
29 | "dlink,dns-kirkwood" | ||
30 | "excito,b3" | ||
31 | "globalscale,dreamplug-003-ds2001" | ||
32 | "globalscale,guruplug" | ||
33 | "globalscale,guruplug-server-plus" | ||
34 | "globalscale,sheevaplug" | ||
35 | "globalscale,sheevaplug" | ||
36 | "globalscale,sheevaplug-esata" | ||
37 | "globalscale,sheevaplug-esata-rev13" | ||
38 | "iom,iconnect" | ||
39 | "iom,iconnect-1.1" | ||
40 | "iom,ix2-200" | ||
41 | "keymile,km_kirkwood" | ||
42 | "lacie,cloudbox" | ||
43 | "lacie,inetspace_v2" | ||
44 | "lacie,laplug" | ||
45 | "lacie,netspace_lite_v2" | ||
46 | "lacie,netspace_max_v2" | ||
47 | "lacie,netspace_mini_v2" | ||
48 | "lacie,netspace_v2" | ||
49 | "marvell,db-88f6281-bp" | ||
50 | "marvell,db-88f6282-bp" | ||
51 | "marvell,mv88f6281gtw-ge" | ||
52 | "marvell,rd88f6281" | ||
53 | "marvell,rd88f6281" | ||
54 | "marvell,rd88f6281-a0" | ||
55 | "marvell,rd88f6281-a1" | ||
56 | "mpl,cec4" | ||
57 | "mpl,cec4-10" | ||
58 | "netgear,readynas" | ||
59 | "netgear,readynas" | ||
60 | "netgear,readynas-duo-v2" | ||
61 | "netgear,readynas-nv+-v2" | ||
62 | "plathome,openblocks-a6" | ||
63 | "plathome,openblocks-a7" | ||
64 | "raidsonic,ib-nas6210" | ||
65 | "raidsonic,ib-nas6210-b" | ||
66 | "raidsonic,ib-nas6220" | ||
67 | "raidsonic,ib-nas6220-b" | ||
68 | "raidsonic,ib-nas62x0" | ||
69 | "seagate,dockstar" | ||
70 | "seagate,goflexnet" | ||
71 | "synology,ds109" | ||
72 | "synology,ds110jv10" | ||
73 | "synology,ds110jv20" | ||
74 | "synology,ds110jv30" | ||
75 | "synology,ds111" | ||
76 | "synology,ds209" | ||
77 | "synology,ds210jv10" | ||
78 | "synology,ds210jv20" | ||
79 | "synology,ds212" | ||
80 | "synology,ds212jv10" | ||
81 | "synology,ds212jv20" | ||
82 | "synology,ds212pv10" | ||
83 | "synology,ds409" | ||
84 | "synology,ds409slim" | ||
85 | "synology,ds410j" | ||
86 | "synology,ds411" | ||
87 | "synology,ds411j" | ||
88 | "synology,ds411slim" | ||
89 | "synology,ds413jv10" | ||
90 | "synology,rs212" | ||
91 | "synology,rs409" | ||
92 | "synology,rs411" | ||
93 | "synology,rs812" | ||
94 | "usi,topkick" | ||
95 | "usi,topkick-1281P2" | ||
96 | "zyxel,nsa310" | ||
97 | "zyxel,nsa310a" | ||
diff --git a/Documentation/devicetree/bindings/ata/apm-xgene.txt b/Documentation/devicetree/bindings/ata/apm-xgene.txt index 7bcfbf59810e..a668f0e7d001 100644 --- a/Documentation/devicetree/bindings/ata/apm-xgene.txt +++ b/Documentation/devicetree/bindings/ata/apm-xgene.txt | |||
@@ -24,6 +24,7 @@ Required properties: | |||
24 | * "sata-phy" for the SATA 6.0Gbps PHY | 24 | * "sata-phy" for the SATA 6.0Gbps PHY |
25 | 25 | ||
26 | Optional properties: | 26 | Optional properties: |
27 | - dma-coherent : Present if dma operations are coherent | ||
27 | - status : Shall be "ok" if enabled or "disabled" if disabled. | 28 | - status : Shall be "ok" if enabled or "disabled" if disabled. |
28 | Default is "ok". | 29 | Default is "ok". |
29 | 30 | ||
@@ -55,6 +56,7 @@ Example: | |||
55 | <0x0 0x1f22e000 0x0 0x1000>, | 56 | <0x0 0x1f22e000 0x0 0x1000>, |
56 | <0x0 0x1f227000 0x0 0x1000>; | 57 | <0x0 0x1f227000 0x0 0x1000>; |
57 | interrupts = <0x0 0x87 0x4>; | 58 | interrupts = <0x0 0x87 0x4>; |
59 | dma-coherent; | ||
58 | status = "ok"; | 60 | status = "ok"; |
59 | clocks = <&sataclk 0>; | 61 | clocks = <&sataclk 0>; |
60 | phys = <&phy2 0>; | 62 | phys = <&phy2 0>; |
@@ -69,6 +71,7 @@ Example: | |||
69 | <0x0 0x1f23e000 0x0 0x1000>, | 71 | <0x0 0x1f23e000 0x0 0x1000>, |
70 | <0x0 0x1f237000 0x0 0x1000>; | 72 | <0x0 0x1f237000 0x0 0x1000>; |
71 | interrupts = <0x0 0x88 0x4>; | 73 | interrupts = <0x0 0x88 0x4>; |
74 | dma-coherent; | ||
72 | status = "ok"; | 75 | status = "ok"; |
73 | clocks = <&sataclk 0>; | 76 | clocks = <&sataclk 0>; |
74 | phys = <&phy3 0>; | 77 | phys = <&phy3 0>; |
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index 71724d026ffa..bef86e57c388 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt | |||
@@ -13,8 +13,22 @@ ad,ad7414 SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert an | |||
13 | ad,adm9240 ADM9240: Complete System Hardware Monitor for uProcessor-Based Systems | 13 | ad,adm9240 ADM9240: Complete System Hardware Monitor for uProcessor-Based Systems |
14 | adi,adt7461 +/-1C TDM Extended Temp Range I.C | 14 | adi,adt7461 +/-1C TDM Extended Temp Range I.C |
15 | adt7461 +/-1C TDM Extended Temp Range I.C | 15 | adt7461 +/-1C TDM Extended Temp Range I.C |
16 | adi,adt7473 +/-1C TDM Extended Temp Range I.C | ||
17 | adi,adt7475 +/-1C TDM Extended Temp Range I.C | ||
18 | adi,adt7476 +/-1C TDM Extended Temp Range I.C | ||
19 | adi,adt7490 +/-1C TDM Extended Temp Range I.C | ||
16 | at,24c08 i2c serial eeprom (24cxx) | 20 | at,24c08 i2c serial eeprom (24cxx) |
21 | atmel,24c00 i2c serial eeprom (24cxx) | ||
22 | atmel,24c01 i2c serial eeprom (24cxx) | ||
17 | atmel,24c02 i2c serial eeprom (24cxx) | 23 | atmel,24c02 i2c serial eeprom (24cxx) |
24 | atmel,24c04 i2c serial eeprom (24cxx) | ||
25 | atmel,24c16 i2c serial eeprom (24cxx) | ||
26 | atmel,24c32 i2c serial eeprom (24cxx) | ||
27 | atmel,24c64 i2c serial eeprom (24cxx) | ||
28 | atmel,24c128 i2c serial eeprom (24cxx) | ||
29 | atmel,24c256 i2c serial eeprom (24cxx) | ||
30 | atmel,24c512 i2c serial eeprom (24cxx) | ||
31 | atmel,24c1024 i2c serial eeprom (24cxx) | ||
18 | atmel,at97sc3204t i2c trusted platform module (TPM) | 32 | atmel,at97sc3204t i2c trusted platform module (TPM) |
19 | capella,cm32181 CM32181: Ambient Light Sensor | 33 | capella,cm32181 CM32181: Ambient Light Sensor |
20 | catalyst,24c32 i2c serial eeprom | 34 | catalyst,24c32 i2c serial eeprom |
@@ -46,8 +60,10 @@ maxim,ds1050 5 Bit Programmable, Pulse-Width Modulator | |||
46 | maxim,max1237 Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs | 60 | maxim,max1237 Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs |
47 | maxim,max6625 9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface | 61 | maxim,max6625 9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface |
48 | mc,rv3029c2 Real Time Clock Module with I2C-Bus | 62 | mc,rv3029c2 Real Time Clock Module with I2C-Bus |
63 | national,lm63 Temperature sensor with integrated fan control | ||
49 | national,lm75 I2C TEMP SENSOR | 64 | national,lm75 I2C TEMP SENSOR |
50 | national,lm80 Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor | 65 | national,lm80 Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor |
66 | national,lm85 Temperature sensor with integrated fan control | ||
51 | national,lm92 ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface | 67 | national,lm92 ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface |
52 | nuvoton,npct501 i2c trusted platform module (TPM) | 68 | nuvoton,npct501 i2c trusted platform module (TPM) |
53 | nxp,pca9556 Octal SMBus and I2C registered interface | 69 | nxp,pca9556 Octal SMBus and I2C registered interface |
diff --git a/Documentation/devicetree/bindings/net/arc_emac.txt b/Documentation/devicetree/bindings/net/arc_emac.txt index 7fbb027218a1..a1d71eb43b20 100644 --- a/Documentation/devicetree/bindings/net/arc_emac.txt +++ b/Documentation/devicetree/bindings/net/arc_emac.txt | |||
@@ -4,11 +4,15 @@ Required properties: | |||
4 | - compatible: Should be "snps,arc-emac" | 4 | - compatible: Should be "snps,arc-emac" |
5 | - reg: Address and length of the register set for the device | 5 | - reg: Address and length of the register set for the device |
6 | - interrupts: Should contain the EMAC interrupts | 6 | - interrupts: Should contain the EMAC interrupts |
7 | - clock-frequency: CPU frequency. It is needed to calculate and set polling | ||
8 | period of EMAC. | ||
9 | - max-speed: see ethernet.txt file in the same directory. | 7 | - max-speed: see ethernet.txt file in the same directory. |
10 | - phy: see ethernet.txt file in the same directory. | 8 | - phy: see ethernet.txt file in the same directory. |
11 | 9 | ||
10 | Clock handling: | ||
11 | The clock frequency is needed to calculate and set polling period of EMAC. | ||
12 | It must be provided by one of: | ||
13 | - clock-frequency: CPU frequency. | ||
14 | - clocks: reference to the clock supplying the EMAC. | ||
15 | |||
12 | Child nodes of the driver are the individual PHY devices connected to the | 16 | Child nodes of the driver are the individual PHY devices connected to the |
13 | MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus. | 17 | MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus. |
14 | 18 | ||
@@ -19,7 +23,11 @@ Examples: | |||
19 | reg = <0xc0fc2000 0x3c>; | 23 | reg = <0xc0fc2000 0x3c>; |
20 | interrupts = <6>; | 24 | interrupts = <6>; |
21 | mac-address = [ 00 11 22 33 44 55 ]; | 25 | mac-address = [ 00 11 22 33 44 55 ]; |
26 | |||
22 | clock-frequency = <80000000>; | 27 | clock-frequency = <80000000>; |
28 | /* or */ | ||
29 | clocks = <&emac_clock>; | ||
30 | |||
23 | max-speed = <100>; | 31 | max-speed = <100>; |
24 | phy = <&phy0>; | 32 | phy = <&phy0>; |
25 | 33 | ||
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt index 9ecd43d8792c..3fc360523bc9 100644 --- a/Documentation/devicetree/bindings/net/ethernet.txt +++ b/Documentation/devicetree/bindings/net/ethernet.txt | |||
@@ -10,7 +10,7 @@ The following properties are common to the Ethernet controllers: | |||
10 | - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than | 10 | - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than |
11 | the maximum frame size (there's contradiction in ePAPR). | 11 | the maximum frame size (there's contradiction in ePAPR). |
12 | - phy-mode: string, operation mode of the PHY interface; supported values are | 12 | - phy-mode: string, operation mode of the PHY interface; supported values are |
13 | "mii", "gmii", "sgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id", | 13 | "mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id", |
14 | "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii"; this is now a de-facto | 14 | "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii"; this is now a de-facto |
15 | standard property; | 15 | standard property; |
16 | - phy-connection-type: the same as "phy-mode" property but described in ePAPR; | 16 | - phy-connection-type: the same as "phy-mode" property but described in ePAPR; |
diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt index 636f0ac4e223..2a60cd3e8d5d 100644 --- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt +++ b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt | |||
@@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 { | |||
23 | interrupt-names = "macirq"; | 23 | interrupt-names = "macirq"; |
24 | mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ | 24 | mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ |
25 | clocks = <&emac_0_clk>; | 25 | clocks = <&emac_0_clk>; |
26 | clocks-names = "stmmaceth"; | 26 | clock-names = "stmmaceth"; |
27 | }; | 27 | }; |
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index 80c1fb8bfbb8..a2acd2b26baf 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt | |||
@@ -33,7 +33,7 @@ Optional properties: | |||
33 | - max-frame-size: See ethernet.txt file in the same directory | 33 | - max-frame-size: See ethernet.txt file in the same directory |
34 | - clocks: If present, the first clock should be the GMAC main clock, | 34 | - clocks: If present, the first clock should be the GMAC main clock, |
35 | further clocks may be specified in derived bindings. | 35 | further clocks may be specified in derived bindings. |
36 | - clocks-names: One name for each entry in the clocks property, the | 36 | - clock-names: One name for each entry in the clocks property, the |
37 | first one should be "stmmaceth". | 37 | first one should be "stmmaceth". |
38 | 38 | ||
39 | Examples: | 39 | Examples: |
diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt index c119debe6bab..67a5db95f189 100644 --- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt | |||
@@ -119,7 +119,7 @@ Optional Properties (for HDMI pins): | |||
119 | Example: | 119 | Example: |
120 | // pin controller node | 120 | // pin controller node |
121 | pinctrl@35004800 { | 121 | pinctrl@35004800 { |
122 | compatible = "brcmbcm11351-pinctrl"; | 122 | compatible = "brcm,bcm11351-pinctrl"; |
123 | reg = <0x35004800 0x430>; | 123 | reg = <0x35004800 0x430>; |
124 | 124 | ||
125 | // pin configuration node | 125 | // pin configuration node |
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt index 4bd5be0e5e7d..26bcb18f4e60 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt | |||
@@ -83,7 +83,7 @@ Example: | |||
83 | reg = <0xfe61f080 0x4>; | 83 | reg = <0xfe61f080 0x4>; |
84 | reg-names = "irqmux"; | 84 | reg-names = "irqmux"; |
85 | interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; | 85 | interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; |
86 | interrupts-names = "irqmux"; | 86 | interrupt-names = "irqmux"; |
87 | ranges = <0 0xfe610000 0x5000>; | 87 | ranges = <0 0xfe610000 0x5000>; |
88 | 88 | ||
89 | PIO0: gpio@fe610000 { | 89 | PIO0: gpio@fe610000 { |
@@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{ | |||
165 | interrupt-parent = <&PIO3>; | 165 | interrupt-parent = <&PIO3>; |
166 | #interrupt-cells = <2>; | 166 | #interrupt-cells = <2>; |
167 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */ | 167 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */ |
168 | interrupts-names = "card-detect"; | 168 | interrupt-names = "card-detect"; |
169 | pinctrl-names = "default"; | 169 | pinctrl-names = "default"; |
170 | pinctrl-0 = <&pinctrl_mmc>; | 170 | pinctrl-0 = <&pinctrl_mmc>; |
171 | }; | 171 | }; |
diff --git a/Documentation/devicetree/bindings/serial/efm32-uart.txt b/Documentation/devicetree/bindings/serial/efm32-uart.txt index 1984bdfbd545..3ca01336b837 100644 --- a/Documentation/devicetree/bindings/serial/efm32-uart.txt +++ b/Documentation/devicetree/bindings/serial/efm32-uart.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | * Energymicro efm32 UART | 1 | * Energymicro efm32 UART |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : Should be "efm32,uart" | 4 | - compatible : Should be "energymicro,efm32-uart" |
5 | - reg : Address and length of the register set | 5 | - reg : Address and length of the register set |
6 | - interrupts : Should contain uart interrupt | 6 | - interrupts : Should contain uart interrupt |
7 | 7 | ||
@@ -13,7 +13,7 @@ Optional properties: | |||
13 | Example: | 13 | Example: |
14 | 14 | ||
15 | uart@0x4000c400 { | 15 | uart@0x4000c400 { |
16 | compatible = "efm32,uart"; | 16 | compatible = "energymicro,efm32-uart"; |
17 | reg = <0x4000c400 0x400>; | 17 | reg = <0x4000c400 0x400>; |
18 | interrupts = <15>; | 18 | interrupts = <15>; |
19 | efm32,location = <0>; | 19 | efm32,location = <0>; |
diff --git a/Documentation/devicetree/bindings/sound/ak4104.txt b/Documentation/devicetree/bindings/sound/ak4104.txt index b902ee39cf89..deca5e18f304 100644 --- a/Documentation/devicetree/bindings/sound/ak4104.txt +++ b/Documentation/devicetree/bindings/sound/ak4104.txt | |||
@@ -8,6 +8,8 @@ Required properties: | |||
8 | 8 | ||
9 | - reg : The chip select number on the SPI bus | 9 | - reg : The chip select number on the SPI bus |
10 | 10 | ||
11 | - vdd-supply : A regulator node, providing 2.7V - 3.6V | ||
12 | |||
11 | Optional properties: | 13 | Optional properties: |
12 | 14 | ||
13 | - reset-gpio : a GPIO spec for the reset pin. If specified, it will be | 15 | - reset-gpio : a GPIO spec for the reset pin. If specified, it will be |
@@ -19,4 +21,5 @@ spdif: ak4104@0 { | |||
19 | compatible = "asahi-kasei,ak4104"; | 21 | compatible = "asahi-kasei,ak4104"; |
20 | reg = <0>; | 22 | reg = <0>; |
21 | spi-max-frequency = <5000000>; | 23 | spi-max-frequency = <5000000>; |
24 | vdd-supply = <&vdd_3v3_reg>; | ||
22 | }; | 25 | }; |
diff --git a/Documentation/devicetree/bindings/sound/alc5623.txt b/Documentation/devicetree/bindings/sound/alc5623.txt new file mode 100644 index 000000000000..26c86c98d671 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/alc5623.txt | |||
@@ -0,0 +1,25 @@ | |||
1 | ALC5621/ALC5622/ALC5623 audio Codec | ||
2 | |||
3 | Required properties: | ||
4 | |||
5 | - compatible: "realtek,alc5623" | ||
6 | - reg: the I2C address of the device. | ||
7 | |||
8 | Optional properties: | ||
9 | |||
10 | - add-ctrl: Default register value for Reg-40h, Additional Control | ||
11 | Register. If absent or has the value of 0, the | ||
12 | register is untouched. | ||
13 | |||
14 | - jack-det-ctrl: Default register value for Reg-5Ah, Jack Detect | ||
15 | Control Register. If absent or has value 0, the | ||
16 | register is untouched. | ||
17 | |||
18 | Example: | ||
19 | |||
20 | alc5621: alc5621@1a { | ||
21 | compatible = "alc5621"; | ||
22 | reg = <0x1a>; | ||
23 | add-ctrl = <0x3700>; | ||
24 | jack-det-ctrl = <0x4810>; | ||
25 | }; | ||
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index 569b26c4a81e..60ca07996458 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt | |||
@@ -47,7 +47,7 @@ mcasp0: mcasp0@1d00000 { | |||
47 | reg = <0x100000 0x3000>; | 47 | reg = <0x100000 0x3000>; |
48 | reg-names "mpu"; | 48 | reg-names "mpu"; |
49 | interrupts = <82>, <83>; | 49 | interrupts = <82>, <83>; |
50 | interrupts-names = "tx", "rx"; | 50 | interrupt-names = "tx", "rx"; |
51 | op-mode = <0>; /* MCASP_IIS_MODE */ | 51 | op-mode = <0>; /* MCASP_IIS_MODE */ |
52 | tdm-slots = <2>; | 52 | tdm-slots = <2>; |
53 | serial-dir = < | 53 | serial-dir = < |
diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt new file mode 100644 index 000000000000..950188891abd --- /dev/null +++ b/Documentation/devicetree/bindings/sound/st,sta350.txt | |||
@@ -0,0 +1,107 @@ | |||
1 | STA350 audio CODEC | ||
2 | |||
3 | The driver for this device only supports I2C. | ||
4 | |||
5 | Required properties: | ||
6 | |||
7 | - compatible: "st,sta350" | ||
8 | - reg: the I2C address of the device for I2C | ||
9 | - reset-gpios: a GPIO spec for the reset pin. If specified, it will be | ||
10 | deasserted before communication to the codec starts. | ||
11 | |||
12 | - power-down-gpios: a GPIO spec for the power down pin. If specified, | ||
13 | it will be deasserted before communication to the codec | ||
14 | starts. | ||
15 | |||
16 | - vdd-dig-supply: regulator spec, providing 3.3V | ||
17 | - vdd-pll-supply: regulator spec, providing 3.3V | ||
18 | - vcc-supply: regulator spec, providing 5V - 26V | ||
19 | |||
20 | Optional properties: | ||
21 | |||
22 | - st,output-conf: number, Selects the output configuration: | ||
23 | 0: 2-channel (full-bridge) power, 2-channel data-out | ||
24 | 1: 2 (half-bridge). 1 (full-bridge) on-board power | ||
25 | 2: 2 Channel (Full-Bridge) Power, 1 Channel FFX | ||
26 | 3: 1 Channel Mono-Parallel | ||
27 | If parameter is missing, mode 0 will be enabled. | ||
28 | |||
29 | - st,ch1-output-mapping: Channel 1 output mapping | ||
30 | - st,ch2-output-mapping: Channel 2 output mapping | ||
31 | - st,ch3-output-mapping: Channel 3 output mapping | ||
32 | 0: Channel 1 | ||
33 | 1: Channel 2 | ||
34 | 2: Channel 3 | ||
35 | If parameter is missing, channel 1 is choosen. | ||
36 | |||
37 | - st,thermal-warning-recover: | ||
38 | If present, thermal warning recovery is enabled. | ||
39 | |||
40 | - st,thermal-warning-adjustment: | ||
41 | If present, thermal warning adjustment is enabled. | ||
42 | |||
43 | - st,fault-detect-recovery: | ||
44 | If present, then fault recovery will be enabled. | ||
45 | |||
46 | - st,ffx-power-output-mode: string | ||
47 | The FFX power output mode selects how the FFX output timing is | ||
48 | configured. Must be one of these values: | ||
49 | - "drop-compensation" | ||
50 | - "tapered-compensation" | ||
51 | - "full-power-mode" | ||
52 | - "variable-drop-compensation" (default) | ||
53 | |||
54 | - st,drop-compensation-ns: number | ||
55 | Only required for "st,ffx-power-output-mode" == | ||
56 | "variable-drop-compensation". | ||
57 | Specifies the drop compensation in nanoseconds. | ||
58 | The value must be in the range of 0..300, and only | ||
59 | multiples of 20 are allowed. Default is 140ns. | ||
60 | |||
61 | - st,overcurrent-warning-adjustment: | ||
62 | If present, overcurrent warning adjustment is enabled. | ||
63 | |||
64 | - st,max-power-use-mpcc: | ||
65 | If present, then MPCC bits are used for MPC coefficients, | ||
66 | otherwise standard MPC coefficients are used. | ||
67 | |||
68 | - st,max-power-corr: | ||
69 | If present, power bridge correction for THD reduction near maximum | ||
70 | power output is enabled. | ||
71 | |||
72 | - st,am-reduction-mode: | ||
73 | If present, FFX mode runs in AM reduction mode, otherwise normal | ||
74 | FFX mode is used. | ||
75 | |||
76 | - st,odd-pwm-speed-mode: | ||
77 | If present, PWM speed mode run on odd speed mode (341.3 kHz) on all | ||
78 | channels. If not present, normal PWM spped mode (384 kHz) will be used. | ||
79 | |||
80 | - st,distortion-compensation: | ||
81 | If present, distortion compensation variable uses DCC coefficient. | ||
82 | If not present, preset DC coefficient is used. | ||
83 | |||
84 | - st,invalid-input-detect-mute: | ||
85 | If not present, automatic invalid input detect mute is enabled. | ||
86 | |||
87 | |||
88 | |||
89 | Example: | ||
90 | |||
91 | codec: sta350@38 { | ||
92 | compatible = "st,sta350"; | ||
93 | reg = <0x1c>; | ||
94 | reset-gpios = <&gpio1 19 0>; | ||
95 | power-down-gpios = <&gpio1 16 0>; | ||
96 | st,output-conf = <0x3>; // set output to 2-channel | ||
97 | // (full-bridge) power, | ||
98 | // 2-channel data-out | ||
99 | st,ch1-output-mapping = <0>; // set channel 1 output ch 1 | ||
100 | st,ch2-output-mapping = <0>; // set channel 2 output ch 1 | ||
101 | st,ch3-output-mapping = <0>; // set channel 3 output ch 1 | ||
102 | st,max-power-correction; // enables power bridge | ||
103 | // correction for THD reduction | ||
104 | // near maximum power output | ||
105 | st,invalid-input-detect-mute; // mute if no valid digital | ||
106 | // audio signal is provided. | ||
107 | }; | ||
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 74c66dee3e14..eff12be5e789 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | |||
@@ -13,6 +13,9 @@ Required properties: | |||
13 | "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP) | 13 | "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP) |
14 | 14 | ||
15 | - reg - <int> - I2C slave address | 15 | - reg - <int> - I2C slave address |
16 | - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, | ||
17 | DVDD-supply : power supplies for the device as covered in | ||
18 | Documentation/devicetree/bindings/regulator/regulator.txt | ||
16 | 19 | ||
17 | 20 | ||
18 | Optional properties: | 21 | Optional properties: |
@@ -24,9 +27,6 @@ Optional properties: | |||
24 | 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD | 27 | 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD |
25 | If this node is not mentioned or if the value is unknown, then | 28 | If this node is not mentioned or if the value is unknown, then |
26 | micbias is set to 2.0V. | 29 | micbias is set to 2.0V. |
27 | - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, | ||
28 | DVDD-supply : power supplies for the device as covered in | ||
29 | Documentation/devicetree/bindings/regulator/regulator.txt | ||
30 | 30 | ||
31 | CODEC output pins: | 31 | CODEC output pins: |
32 | * HPL | 32 | * HPL |
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 0f01c9bf19c8..abc308083acb 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
@@ -22,6 +22,7 @@ auo AU Optronics Corporation | |||
22 | avago Avago Technologies | 22 | avago Avago Technologies |
23 | bosch Bosch Sensortec GmbH | 23 | bosch Bosch Sensortec GmbH |
24 | brcm Broadcom Corporation | 24 | brcm Broadcom Corporation |
25 | buffalo Buffalo, Inc. | ||
25 | calxeda Calxeda | 26 | calxeda Calxeda |
26 | capella Capella Microsystems, Inc | 27 | capella Capella Microsystems, Inc |
27 | cavium Cavium, Inc. | 28 | cavium Cavium, Inc. |
@@ -33,15 +34,18 @@ cortina Cortina Systems, Inc. | |||
33 | crystalfontz Crystalfontz America, Inc. | 34 | crystalfontz Crystalfontz America, Inc. |
34 | dallas Maxim Integrated Products (formerly Dallas Semiconductor) | 35 | dallas Maxim Integrated Products (formerly Dallas Semiconductor) |
35 | davicom DAVICOM Semiconductor, Inc. | 36 | davicom DAVICOM Semiconductor, Inc. |
36 | dlink D-Link Systems, Inc. | ||
37 | denx Denx Software Engineering | 37 | denx Denx Software Engineering |
38 | digi Digi International Inc. | ||
39 | dlink D-Link Corporation | ||
38 | dmo Data Modul AG | 40 | dmo Data Modul AG |
41 | ebv EBV Elektronik | ||
39 | edt Emerging Display Technologies | 42 | edt Emerging Display Technologies |
40 | emmicro EM Microelectronic | 43 | emmicro EM Microelectronic |
41 | epfl Ecole Polytechnique Fédérale de Lausanne | 44 | epfl Ecole Polytechnique Fédérale de Lausanne |
42 | epson Seiko Epson Corp. | 45 | epson Seiko Epson Corp. |
43 | est ESTeem Wireless Modems | 46 | est ESTeem Wireless Modems |
44 | eukrea Eukréa Electromatique | 47 | eukrea Eukréa Electromatique |
48 | excito Excito | ||
45 | fsl Freescale Semiconductor | 49 | fsl Freescale Semiconductor |
46 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 50 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
47 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 51 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
@@ -53,13 +57,17 @@ haoyu Haoyu Microelectronic Co. Ltd. | |||
53 | hisilicon Hisilicon Limited. | 57 | hisilicon Hisilicon Limited. |
54 | honeywell Honeywell | 58 | honeywell Honeywell |
55 | hp Hewlett Packard | 59 | hp Hewlett Packard |
60 | i2se I2SE GmbH | ||
56 | ibm International Business Machines (IBM) | 61 | ibm International Business Machines (IBM) |
57 | idt Integrated Device Technologies, Inc. | 62 | idt Integrated Device Technologies, Inc. |
63 | iom Iomega Corporation | ||
58 | img Imagination Technologies Ltd. | 64 | img Imagination Technologies Ltd. |
59 | intel Intel Corporation | 65 | intel Intel Corporation |
60 | intercontrol Inter Control Group | 66 | intercontrol Inter Control Group |
67 | isee ISEE 2007 S.L. | ||
61 | isl Intersil | 68 | isl Intersil |
62 | karo Ka-Ro electronics GmbH | 69 | karo Ka-Ro electronics GmbH |
70 | keymile Keymile GmbH | ||
63 | lacie LaCie | 71 | lacie LaCie |
64 | lantiq Lantiq Semiconductor | 72 | lantiq Lantiq Semiconductor |
65 | lg LG Corporation | 73 | lg LG Corporation |
@@ -70,9 +78,12 @@ maxim Maxim Integrated Products | |||
70 | microchip Microchip Technology Inc. | 78 | microchip Microchip Technology Inc. |
71 | mosaixtech Mosaix Technologies, Inc. | 79 | mosaixtech Mosaix Technologies, Inc. |
72 | moxa Moxa | 80 | moxa Moxa |
81 | mpl MPL AG | ||
82 | mxicy Macronix International Co., Ltd. | ||
73 | national National Semiconductor | 83 | national National Semiconductor |
74 | neonode Neonode Inc. | 84 | neonode Neonode Inc. |
75 | netgear NETGEAR | 85 | netgear NETGEAR |
86 | newhaven Newhaven Display International | ||
76 | nintendo Nintendo | 87 | nintendo Nintendo |
77 | nokia Nokia | 88 | nokia Nokia |
78 | nvidia NVIDIA | 89 | nvidia NVIDIA |
@@ -82,10 +93,12 @@ opencores OpenCores.org | |||
82 | panasonic Panasonic Corporation | 93 | panasonic Panasonic Corporation |
83 | phytec PHYTEC Messtechnik GmbH | 94 | phytec PHYTEC Messtechnik GmbH |
84 | picochip Picochip Ltd | 95 | picochip Picochip Ltd |
96 | plathome Plat'Home Co., Ltd. | ||
85 | powervr PowerVR (deprecated, use img) | 97 | powervr PowerVR (deprecated, use img) |
86 | qca Qualcomm Atheros, Inc. | 98 | qca Qualcomm Atheros, Inc. |
87 | qcom Qualcomm Technologies, Inc | 99 | qcom Qualcomm Technologies, Inc |
88 | qnap QNAP Systems, Inc. | 100 | qnap QNAP Systems, Inc. |
101 | raidsonic RaidSonic Technology GmbH | ||
89 | ralink Mediatek/Ralink Technology Corp. | 102 | ralink Mediatek/Ralink Technology Corp. |
90 | ramtron Ramtron International | 103 | ramtron Ramtron International |
91 | realtek Realtek Semiconductor Corp. | 104 | realtek Realtek Semiconductor Corp. |
@@ -95,6 +108,7 @@ rockchip Fuzhou Rockchip Electronics Co., Ltd | |||
95 | samsung Samsung Semiconductor | 108 | samsung Samsung Semiconductor |
96 | sbs Smart Battery System | 109 | sbs Smart Battery System |
97 | schindler Schindler | 110 | schindler Schindler |
111 | seagate Seagate Technology PLC | ||
98 | sil Silicon Image | 112 | sil Silicon Image |
99 | silabs Silicon Laboratories | 113 | silabs Silicon Laboratories |
100 | simtek | 114 | simtek |
@@ -111,6 +125,7 @@ ti Texas Instruments | |||
111 | tlm Trusted Logic Mobility | 125 | tlm Trusted Logic Mobility |
112 | toshiba Toshiba Corporation | 126 | toshiba Toshiba Corporation |
113 | toumaz Toumaz | 127 | toumaz Toumaz |
128 | usi Universal Scientifc Industrial Co., Ltd. | ||
114 | v3 V3 Semiconductor | 129 | v3 V3 Semiconductor |
115 | via VIA Technologies, Inc. | 130 | via VIA Technologies, Inc. |
116 | voipac Voipac Technologies s.r.o. | 131 | voipac Voipac Technologies s.r.o. |
@@ -119,3 +134,4 @@ wlf Wolfson Microelectronics | |||
119 | wm Wondermedia Technologies, Inc. | 134 | wm Wondermedia Technologies, Inc. |
120 | xes Extreme Engineering Solutions (X-ES) | 135 | xes Extreme Engineering Solutions (X-ES) |
121 | xlnx Xilinx | 136 | xlnx Xilinx |
137 | zyxel ZyXEL Communications Corp. | ||