-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'asoc-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/broonie/sound into for-next ASoC: Updates for v4.4 Not much core work here, a few small tweaks to interfaces but mainly the changes here are driver ones. Highlights include: - Updates to the topology userspace interface - Big updates to the Renesas support from Morimoto-san - Most of the support for Intel Sky Lake systems. - New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10, Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip S/PDIF. - A new driver for the Atmel Class D speaker drivers
- Loading branch information
Showing
334 changed files
with
13,681 additions
and
1,628 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
This file contains documentation for running mainline | ||
kernel on omaps. | ||
|
||
KERNEL NEW DEPENDENCIES | ||
v4.3+ Update is needed for custom .config files to make sure | ||
CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work | ||
properly. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
* Atmel ClassD driver under ALSA SoC architecture | ||
|
||
Required properties: | ||
- compatible | ||
Should be "atmel,sama5d2-classd". | ||
- reg | ||
Should contain ClassD registers location and length. | ||
- interrupts | ||
Should contain the IRQ line for the ClassD. | ||
- dmas | ||
One DMA specifiers as described in atmel-dma.txt and dma.txt files. | ||
- dma-names | ||
Must be "tx". | ||
- clock-names | ||
Tuple listing input clock names. | ||
Required elements: "pclk", "gclk" and "aclk". | ||
- clocks | ||
Please refer to clock-bindings.txt. | ||
|
||
Optional properties: | ||
- pinctrl-names, pinctrl-0 | ||
Please refer to pinctrl-bindings.txt. | ||
- atmel,model | ||
The user-visible name of this sound complex. | ||
The default value is "CLASSD". | ||
- atmel,pwm-type | ||
PWM modulation type, "single" or "diff". | ||
The default value is "single". | ||
- atmel,non-overlap-time | ||
Set non-overlapping time, the unit is nanosecond(ns). | ||
There are four values, | ||
<5>, <10>, <15>, <20>, the default value is <10>. | ||
Non-overlapping will be disabled if not specified. | ||
|
||
Example: | ||
classd: classd@fc048000 { | ||
compatible = "atmel,sama5d2-classd"; | ||
reg = <0xfc048000 0x100>; | ||
interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>; | ||
dmas = <&dma0 | ||
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | ||
| AT91_XDMAC_DT_PERID(47))>; | ||
dma-names = "tx"; | ||
clocks = <&classd_clk>, <&classd_gclk>, <&audio_pll_pmc>; | ||
clock-names = "pclk", "gclk", "aclk"; | ||
|
||
pinctrl-names = "default"; | ||
pinctrl-0 = <&pinctrl_classd_default>; | ||
atmel,model = "classd @ SAMA5D2-Xplained"; | ||
atmel,pwm-type = "diff"; | ||
atmel,non-overlap-time = <10>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
Dialog Semiconductor DA7213 Audio Codec bindings | ||
|
||
====== | ||
|
||
Required properties: | ||
- compatible : Should be "dlg,da7213" | ||
- reg: Specifies the I2C slave address | ||
|
||
Optional properties: | ||
- clocks : phandle and clock specifier for codec MCLK. | ||
- clock-names : Clock name string for 'clocks' attribute, should be "mclk". | ||
|
||
- dlg,micbias1-lvl : Voltage (mV) for Mic Bias 1 | ||
[<1600>, <2200>, <2500>, <3000>] | ||
- dlg,micbias2-lvl : Voltage (mV) for Mic Bias 2 | ||
[<1600>, <2200>, <2500>, <3000>] | ||
- dlg,dmic-data-sel : DMIC channel select based on clock edge. | ||
["lrise_rfall", "lfall_rrise"] | ||
- dlg,dmic-samplephase : When to sample audio from DMIC. | ||
["on_clkedge", "between_clkedge"] | ||
- dlg,dmic-clkrate : DMIC clock frequency (Hz). | ||
[<1500000>, <3000000>] | ||
|
||
====== | ||
|
||
Example: | ||
|
||
codec_i2c: da7213@1a { | ||
compatible = "dlg,da7213"; | ||
reg = <0x1a>; | ||
|
||
clocks = <&clks 201>; | ||
clock-names = "mclk"; | ||
|
||
dlg,micbias1-lvl = <2500>; | ||
dlg,micbias2-lvl = <2500>; | ||
|
||
dlg,dmic-data-sel = "lrise_rfall"; | ||
dlg,dmic-samplephase = "between_clkedge"; | ||
dlg,dmic-clkrate = <3000000>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
Dialog Semiconductor DA7219 Audio Codec bindings | ||
|
||
DA7219 is an audio codec with advanced accessory detect features. | ||
|
||
====== | ||
|
||
Required properties: | ||
- compatible : Should be "dlg,da7219" | ||
- reg: Specifies the I2C slave address | ||
|
||
- interrupt-parent : Specifies the phandle of the interrupt controller to which | ||
the IRQs from DA7219 are delivered to. | ||
- interrupts : IRQ line info for DA7219. | ||
(See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for | ||
further information relating to interrupt properties) | ||
|
||
- VDD-supply: VDD power supply for the device | ||
- VDDMIC-supply: VDDMIC power supply for the device | ||
- VDDIO-supply: VDDIO power supply for the device | ||
(See Documentation/devicetree/bindings/regulator/regulator.txt for further | ||
information relating to regulators) | ||
|
||
Optional properties: | ||
- interrupt-names : Name associated with interrupt line. Should be "wakeup" if | ||
interrupt is to be used to wake system, otherwise "irq" should be used. | ||
- wakeup-source: Flag to indicate this device can wake system (suspend/resume). | ||
|
||
- clocks : phandle and clock specifier for codec MCLK. | ||
- clock-names : Clock name string for 'clocks' attribute, should be "mclk". | ||
|
||
- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine | ||
[<1050>, <1100>, <1200>, <1400>] | ||
- dlg,micbias-lvl : Voltage (mV) for Mic Bias | ||
[<1800>, <2000>, <2200>, <2400>, <2600>] | ||
- dlg,mic-amp-in-sel : Mic input source type | ||
["diff", "se_p", "se_n"] | ||
|
||
====== | ||
|
||
Child node - 'da7219_aad': | ||
|
||
Optional properties: | ||
- dlg,micbias-pulse-lvl : Mic bias higher voltage pulse level (mV). | ||
[<2800>, <2900>] | ||
- dlg,micbias-pulse-time : Mic bias higher voltage pulse duration (ms) | ||
- dlg,btn-cfg : Periodic button press measurements for 4-pole jack (ms) | ||
[<2>, <5>, <10>, <50>, <100>, <200>, <500>] | ||
- dlg,mic-det-thr : Impedance threshold for mic detection measurement (Ohms) | ||
[<200>, <500>, <750>, <1000>] | ||
- dlg,jack-ins-deb : Debounce time for jack insertion (ms) | ||
[<5>, <10>, <20>, <50>, <100>, <200>, <500>, <1000>] | ||
- dlg,jack-det-rate: Jack type detection latency (3/4 pole) | ||
["32ms_64ms", "64ms_128ms", "128ms_256ms", "256ms_512ms"] | ||
- dlg,jack-rem-deb : Debounce time for jack removal (ms) | ||
[<1>, <5>, <10>, <20>] | ||
- dlg,a-d-btn-thr : Impedance threshold between buttons A and D | ||
[0x0 - 0xFF] | ||
- dlg,d-b-btn-thr : Impedance threshold between buttons D and B | ||
[0x0 - 0xFF] | ||
- dlg,b-c-btn-thr : Impedance threshold between buttons B and C | ||
[0x0 - 0xFF] | ||
- dlg,c-mic-btn-thr : Impedance threshold between button C and Mic | ||
[0x0 - 0xFF] | ||
- dlg,btn-avg : Number of 8-bit readings for averaged button measurement | ||
[<1>, <2>, <4>, <8>] | ||
- dlg,adc-1bit-rpt : Repeat count for 1-bit button measurement | ||
[<1>, <2>, <4>, <8>] | ||
|
||
====== | ||
|
||
Example: | ||
|
||
codec: da7219@1a { | ||
compatible = "dlg,da7219"; | ||
reg = <0x1a>; | ||
|
||
interrupt-parent = <&gpio6>; | ||
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; | ||
|
||
VDD-supply = <®_audio>; | ||
VDDMIC-supply = <®_audio>; | ||
VDDIO-supply = <®_audio>; | ||
|
||
clocks = <&clks 201>; | ||
clock-names = "mclk"; | ||
|
||
dlg,ldo-lvl = <1200>; | ||
dlg,micbias-lvl = <2600>; | ||
dlg,mic-amp-in-sel = "diff"; | ||
|
||
da7219_aad { | ||
dlg,btn-cfg = <50>; | ||
dlg,mic-det-thr = <500>; | ||
dlg,jack-ins-deb = <20>; | ||
dlg,jack-det-rate = "32ms_64ms"; | ||
dlg,jack-rem-deb = <1>; | ||
|
||
dlg,a-d-btn-thr = <0xa>; | ||
dlg,d-b-btn-thr = <0x16>; | ||
dlg,b-c-btn-thr = <0x21>; | ||
dlg,c-mic-btn-thr = <0x3E>; | ||
|
||
dlg,btn-avg = <4>; | ||
dlg,adc-1bit-rpt = <1>; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
Nuvoton NAU8825 audio codec | ||
|
||
This device supports I2C only. | ||
|
||
Required properties: | ||
- compatible : Must be "nuvoton,nau8825" | ||
|
||
- reg : the I2C address of the device. This is either 0x1a (CSB=0) or 0x1b (CSB=1). | ||
|
||
Optional properties: | ||
- nuvoton,jkdet-enable: Enable jack detection via JKDET pin. | ||
- nuvoton,jkdet-pull-enable: Enable JKDET pin pull. If set - pin pull enabled, | ||
otherwise pin in high impedance state. | ||
- nuvoton,jkdet-pull-up: Pull-up JKDET pin. If set then JKDET pin is pull up, otherwise pull down. | ||
- nuvoton,jkdet-polarity: JKDET pin polarity. 0 - active high, 1 - active low. | ||
|
||
- nuvoton,vref-impedance: VREF Impedance selection | ||
0 - Open | ||
1 - 25 kOhm | ||
2 - 125 kOhm | ||
3 - 2.5 kOhm | ||
|
||
- nuvoton,micbias-voltage: Micbias voltage level. | ||
0 - VDDA | ||
1 - VDDA | ||
2 - VDDA * 1.1 | ||
3 - VDDA * 1.2 | ||
4 - VDDA * 1.3 | ||
5 - VDDA * 1.4 | ||
6 - VDDA * 1.53 | ||
7 - VDDA * 1.53 | ||
|
||
- nuvoton,sar-threshold-num: Number of buttons supported | ||
- nuvoton,sar-threshold: Impedance threshold for each button. Array that contains up to 8 buttons configuration. SAR value is calculated as | ||
SAR = 255 * MICBIAS / SAR_VOLTAGE * R / (2000 + R) | ||
where MICBIAS is configured by 'nuvoton,micbias-voltage', SAR_VOLTAGE is configured by 'nuvoton,sar-voltage', R - button impedance. | ||
Refer datasheet section 10.2 for more information about threshold calculation. | ||
|
||
- nuvoton,sar-hysteresis: Button impedance measurement hysteresis. | ||
|
||
- nuvoton,sar-voltage: Reference voltage for button impedance measurement. | ||
0 - VDDA | ||
1 - VDDA | ||
2 - VDDA * 1.1 | ||
3 - VDDA * 1.2 | ||
4 - VDDA * 1.3 | ||
5 - VDDA * 1.4 | ||
6 - VDDA * 1.53 | ||
7 - VDDA * 1.53 | ||
|
||
- nuvoton,sar-compare-time: SAR compare time | ||
0 - 500 ns | ||
1 - 1 us | ||
2 - 2 us | ||
3 - 4 us | ||
|
||
- nuvoton,sar-sampling-time: SAR sampling time | ||
0 - 2 us | ||
1 - 4 us | ||
2 - 8 us | ||
3 - 16 us | ||
|
||
- nuvoton,short-key-debounce: Button short key press debounce time. | ||
0 - 30 ms | ||
1 - 50 ms | ||
2 - 100 ms | ||
3 - 30 ms | ||
|
||
- nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms | ||
- nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms | ||
|
||
- clocks: list of phandle and clock specifier pairs according to common clock bindings for the | ||
clocks described in clock-names | ||
- clock-names: should include "mclk" for the MCLK master clock | ||
|
||
Example: | ||
|
||
headset: nau8825@1a { | ||
compatible = "nuvoton,nau8825"; | ||
reg = <0x1a>; | ||
interrupt-parent = <&gpio>; | ||
interrupts = <TEGRA_GPIO(E, 6) IRQ_TYPE_LEVEL_LOW>; | ||
nuvoton,jkdet-enable; | ||
nuvoton,jkdet-pull-enable; | ||
nuvoton,jkdet-pull-up; | ||
nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>; | ||
nuvoton,vref-impedance = <2>; | ||
nuvoton,micbias-voltage = <6>; | ||
// Setup 4 buttons impedance according to Android specification | ||
nuvoton,sar-threshold-num = <4>; | ||
nuvoton,sar-threshold = <0xc 0x1e 0x38 0x60>; | ||
nuvoton,sar-hysteresis = <1>; | ||
nuvoton,sar-voltage = <0>; | ||
nuvoton,sar-compare-time = <0>; | ||
nuvoton,sar-sampling-time = <0>; | ||
nuvoton,short-key-debounce = <2>; | ||
nuvoton,jack-insert-debounce = <7>; | ||
nuvoton,jack-eject-debounce = <7>; | ||
|
||
clock-names = "mclk"; | ||
clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.