diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-23 01:20:37 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-23 01:20:37 -0400 |
commit | 40169a7c399346281da55ed9905a104d3da47945 (patch) | |
tree | 47181afbd7ccf73af8ec0b840d637a794062faa0 /Documentation | |
parent | 84bae6c379e362aa017efd417199f51d5c2273ac (diff) | |
parent | c164fa62b93782165f12c0e8366f7b46507edb4d (diff) |
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
* 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500:
ARM: ux500: Fix SSP register address format
ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
ARM: ux500: Add all encompassing sound node to the HREF Device Tree
ARM: ux500: Add nodes for the MSP into the HREF Device Tree
ARM: ux500: Add all known I2C sub-device nodes to the HREF DT
ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled
ARM: ux500: Stop registering Audio devices for HREF when DT is enabled
ARM: ux500: Add all encompassing sound node to the Snowball Device Tree
ARM: ux500: Add nodes for the MSP into Device Tree
ARM: ux500: Rename MSP board file to something more meaningful
ARM: ux500: Remove platform registration of MSP devices
ARM: ux500: Stop registering the MOP500 Audio driver from platform code
ARM: ux500: Pass MSP DMA platform data though AUXDATA
ARM: ux500: Fork MSP platform registration for step-by-step DT enablement
ARM: ux500: Add AB8500 CODEC node to DB8500 Device Tree
ARM: ux500: Clean-up MSP platform code
ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI
ARM: ux500: Add UART support to the HREF Device Tree
ARM: ux500: Add skeleton Device Tree for the HREF reference board
...
+ sync to v3.6-rc6
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/ab8500.txt | 15 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/sound/ux500-mop500.txt | 39 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/sound/ux500-msp.txt | 43 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 1 |
4 files changed, 98 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt index 69e757a657a..ce83c8d3c00 100644 --- a/Documentation/devicetree/bindings/mfd/ab8500.txt +++ b/Documentation/devicetree/bindings/mfd/ab8500.txt | |||
@@ -23,6 +23,7 @@ Device IRQ Names Supply Names Description | |||
23 | ab8500-bm : : : Battery Manager | 23 | ab8500-bm : : : Battery Manager |
24 | ab8500-btemp : : : Battery Temperature | 24 | ab8500-btemp : : : Battery Temperature |
25 | ab8500-charger : : : Battery Charger | 25 | ab8500-charger : : : Battery Charger |
26 | ab8500-codec : : : Audio Codec | ||
26 | ab8500-fg : : : Fuel Gauge | 27 | ab8500-fg : : : Fuel Gauge |
27 | ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter | 28 | ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter |
28 | SW_CONV_END : : | 29 | SW_CONV_END : : |
@@ -52,6 +53,14 @@ Optional child device properties: | |||
52 | supplied in the interrupts property | 53 | supplied in the interrupts property |
53 | - <supply_name>-supply : contains a phandle to the regulator supply node in Device Tree | 54 | - <supply_name>-supply : contains a phandle to the regulator supply node in Device Tree |
54 | 55 | ||
56 | Non-standard child device properties: | ||
57 | - Audio CODEC: | ||
58 | - stericsson,amic[1|2]-type-single-ended : Single-ended Analoge Mic (default: differential) | ||
59 | - stericsson,amic1a-bias-vamic2 : Analoge Mic wishes to use a non-standard Vamic | ||
60 | - stericsson,amic1b-bias-vamic2 : Analoge Mic wishes to use a non-standard Vamic | ||
61 | - stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic | ||
62 | - stericsson,earpeice-cmv : Earpeice voltage (only: 950 | 1100 | 1270 | 1580) | ||
63 | |||
55 | ab8500@5 { | 64 | ab8500@5 { |
56 | compatible = "stericsson,ab8500"; | 65 | compatible = "stericsson,ab8500"; |
57 | reg = <5>; /* mailbox 5 is i2c */ | 66 | reg = <5>; /* mailbox 5 is i2c */ |
@@ -110,6 +119,12 @@ ab8500@5 { | |||
110 | compatible = "stericsson,ab8500-pwm"; | 119 | compatible = "stericsson,ab8500-pwm"; |
111 | }; | 120 | }; |
112 | 121 | ||
122 | codec: ab8500-codec { | ||
123 | compatible = "stericsson,ab8500-codec"; | ||
124 | |||
125 | stericsson,earpeice-cmv = <950>; /* Units in mV. */ | ||
126 | }; | ||
127 | |||
113 | ab8500-regulators { | 128 | ab8500-regulators { |
114 | compatible = "stericsson,ab8500-regulator"; | 129 | compatible = "stericsson,ab8500-regulator"; |
115 | 130 | ||
diff --git a/Documentation/devicetree/bindings/sound/ux500-mop500.txt b/Documentation/devicetree/bindings/sound/ux500-mop500.txt new file mode 100644 index 00000000000..48e071c96b4 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ux500-mop500.txt | |||
@@ -0,0 +1,39 @@ | |||
1 | * MOP500 Audio Machine Driver | ||
2 | |||
3 | This node is responsible for linking together all ux500 Audio Driver components. | ||
4 | |||
5 | Required properties: | ||
6 | - compatible : "stericsson,snd-soc-mop500" | ||
7 | |||
8 | Non-standard properties: | ||
9 | - stericsson,cpu-dai : Phandle to the CPU-side DAI | ||
10 | - stericsson,audio-codec : Phandle to the Audio CODEC | ||
11 | - stericsson,card-name : Over-ride default card name | ||
12 | |||
13 | Example: | ||
14 | |||
15 | sound { | ||
16 | compatible = "stericsson,snd-soc-mop500"; | ||
17 | |||
18 | stericsson,cpu-dai = <&msp1 &msp3>; | ||
19 | stericsson,audio-codec = <&codec>; | ||
20 | }; | ||
21 | |||
22 | msp1: msp@80124000 { | ||
23 | compatible = "stericsson,ux500-msp-i2s"; | ||
24 | reg = <0x80124000 0x1000>; | ||
25 | interrupts = <0 62 0x4>; | ||
26 | v-ape-supply = <&db8500_vape_reg>; | ||
27 | }; | ||
28 | |||
29 | msp3: msp@80125000 { | ||
30 | compatible = "stericsson,ux500-msp-i2s"; | ||
31 | reg = <0x80125000 0x1000>; | ||
32 | interrupts = <0 62 0x4>; | ||
33 | v-ape-supply = <&db8500_vape_reg>; | ||
34 | }; | ||
35 | |||
36 | codec: ab8500-codec { | ||
37 | compatible = "stericsson,ab8500-codec"; | ||
38 | stericsson,earpeice-cmv = <950>; /* Units in mV. */ | ||
39 | }; | ||
diff --git a/Documentation/devicetree/bindings/sound/ux500-msp.txt b/Documentation/devicetree/bindings/sound/ux500-msp.txt new file mode 100644 index 00000000000..99acd9c774e --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ux500-msp.txt | |||
@@ -0,0 +1,43 @@ | |||
1 | * ux500 MSP (CPU-side Digital Audio Interface) | ||
2 | |||
3 | Required properties: | ||
4 | - compatible :"stericsson,ux500-msp-i2s" | ||
5 | - reg : Physical base address and length of the device's registers. | ||
6 | |||
7 | Optional properties: | ||
8 | - interrupts : The interrupt output from the device. | ||
9 | - interrupt-parent : The parent interrupt controller. | ||
10 | - <name>-supply : Phandle to the regulator <name> supply | ||
11 | |||
12 | Example: | ||
13 | |||
14 | sound { | ||
15 | compatible = "stericsson,snd-soc-mop500"; | ||
16 | |||
17 | stericsson,platform-pcm-dma = <&pcm>; | ||
18 | stericsson,cpu-dai = <&msp1 &msp3>; | ||
19 | stericsson,audio-codec = <&codec>; | ||
20 | }; | ||
21 | |||
22 | pcm: ux500-pcm { | ||
23 | compatible = "stericsson,ux500-pcm"; | ||
24 | }; | ||
25 | |||
26 | msp1: msp@80124000 { | ||
27 | compatible = "stericsson,ux500-msp-i2s"; | ||
28 | reg = <0x80124000 0x1000>; | ||
29 | interrupts = <0 62 0x4>; | ||
30 | v-ape-supply = <&db8500_vape_reg>; | ||
31 | }; | ||
32 | |||
33 | msp3: msp@80125000 { | ||
34 | compatible = "stericsson,ux500-msp-i2s"; | ||
35 | reg = <0x80125000 0x1000>; | ||
36 | interrupts = <0 62 0x4>; | ||
37 | v-ape-supply = <&db8500_vape_reg>; | ||
38 | }; | ||
39 | |||
40 | codec: ab8500-codec { | ||
41 | compatible = "stericsson,ab8500-codec"; | ||
42 | stericsson,earpeice-cmv = <950>; /* Units in mV. */ | ||
43 | }; | ||
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index 615142da4ef..157416e78cc 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 | |||
@@ -21,6 +21,7 @@ Supported adapters: | |||
21 | * Intel DH89xxCC (PCH) | 21 | * Intel DH89xxCC (PCH) |
22 | * Intel Panther Point (PCH) | 22 | * Intel Panther Point (PCH) |
23 | * Intel Lynx Point (PCH) | 23 | * Intel Lynx Point (PCH) |
24 | * Intel Lynx Point-LP (PCH) | ||
24 | Datasheets: Publicly available at the Intel website | 25 | Datasheets: Publicly available at the Intel website |
25 | 26 | ||
26 | On Intel Patsburg and later chipsets, both the normal host SMBus controller | 27 | On Intel Patsburg and later chipsets, both the normal host SMBus controller |