Skip to content

Commit eeab517

Browse files
torvaldstorvalds
committed
Merge tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "There are no too intrusive changes in this update batch. The biggest LOC is found in the new DICE driver, and other small changes are scattered over the whole sound subtree (which is a common pattern). Below are highlights: - ALSA core: * Memory allocation support with genpool * Fix blocking in drain ioctl of compress_offload - HD-audio: * Improved AMD HDMI supports * Intel HDMI detection improvements * thinkpad_acpi mute-key integration * New PCI ID, New ALC255,285,293 codecs, CX20952 - USB-audio: * New buffer size management * Clean up endpoint handling codes - ASoC: * Further work on the dmaengine helpers, including support for configuring the parameters for DMA by reading the capabilities of the DMA controller which removes some guesswork and magic numbers from drivers. * A refresh of the documentation. * Conversions of many drivers to direct regmap API usage in order to allow the ASoC level register I/O code to be removed, this will hopefully be completed by v3.14. * Support for using async register I/O in DAPM, reducing the time taken to implement power transitions on systems that support it. - Firewire: DICE driver - Lots of small fixes for bugs reported by Coverity" * tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (382 commits) ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported ALSA: hda - Apply MacBook fixups for CS4208 correctly ASoC: fsl: imx-wm8962: remove an unneeded check ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable ALSA: hda/realtek - Make fixup regs persist after resume ALSA: hda_intel: ratelimit "spurious response" message ASoC: generic-dmaengine-pcm: Use SNDRV_DMA_TYPE_DEV_IRAM as default ASoC: dapm: Use WARN_ON() instead of BUG_ON() ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages ASoC: Replace BUG() with WARN() ASoC: wm_hubs: Replace BUG() with WARN() ASoC: wm8996: Replace BUG() with WARN() ASoC: wm8962: Replace BUG() with WARN() ASoC: wm8958: Replace BUG() with WARN() ASoC: wm8904: Replace BUG() with WARN() ASoC: wm8900: Replace BUG() with WARN() ASoC: wm8350: Replace BUG() with WARN() ASoC: txx9: Use WARN_ON() instead of BUG_ON() ASoC: sh: Use WARN_ON() instead of BUG_ON() ASoC: rcar: Use WARN_ON() instead of BUG_ON() ...
2 parents f095ca6 + a6bc732 commit eeab517

253 files changed

Lines changed: 8589 additions & 3973 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/sound/cs42l73.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CS42L73 audio CODEC
2+
3+
Required properties:
4+
5+
- compatible : "cirrus,cs42l73"
6+
7+
- reg : the I2C address of the device for I2C
8+
9+
Optional properties:
10+
11+
- reset_gpio : a GPIO spec for the reset pin.
12+
- chgfreq : Charge Pump Frequency values 0x00-0x0F
13+
14+
15+
Example:
16+
17+
codec: cs42l73@4a {
18+
compatible = "cirrus,cs42l73";
19+
reg = <0x4a>;
20+
reset_gpio = <&gpio 10 0>;
21+
chgfreq = <0x05>;
22+
};

‎Documentation/devicetree/bindings/sound/davinci-evm-audio.txt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
* Texas Instruments SoC audio setups with TLV320AIC3X Codec
2+
3+
Required properties:
4+
- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx
5+
- ti,model : The user-visible name of this sound complex.
6+
- ti,audio-codec : The phandle of the TLV320AIC3x audio codec
7+
- ti,mcasp-controller : The phandle of the McASP controller
8+
- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec
9+
- ti,audio-routing : A list of the connections between audio components.
10+
Each entry is a pair of strings, the first being the connection's sink,
11+
the second being the connection's source. Valid names for sources and
12+
sinks are the codec's pins, and the jacks on the board:
13+
14+
Board connectors:
15+
16+
* Headphone Jack
17+
* Line Out
18+
* Mic Jack
19+
* Line In
20+
21+
22+
Example:
23+
24+
sound {
25+
compatible = "ti,da830-evm-audio";
26+
ti,model = "DA830 EVM";
27+
ti,audio-codec = <&tlv320aic3x>;
28+
ti,mcasp-controller = <&mcasp1>;
29+
ti,codec-clock-rate = <12000000>;
30+
ti,audio-routing =
31+
"Headphone Jack", "HPLOUT",
32+
"Headphone Jack", "HPROUT",
33+
"Line Out", "LLOUT",
34+
"Line Out", "RLOUT",
35+
"MIC3L", "Mic Bias 2V",
36+
"MIC3R", "Mic Bias 2V",
37+
"Mic Bias 2V", "Mic Jack",
38+
"LINE1L", "Line In",
39+
"LINE2L", "Line In",
40+
"LINE1R", "Line In",
41+
"LINE2R", "Line In";
42+
};

‎Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ Required properties:
44
- compatible :
55
"ti,dm646x-mcasp-audio" : for DM646x platforms
66
"ti,da830-mcasp-audio" : for both DA830 & DA850 platforms
7-
"ti,omap2-mcasp-audio" : for OMAP2 platforms (TI81xx, AM33xx)
8-
9-
- reg : Should contain McASP registers offset and length
10-
- interrupts : Interrupt number for McASP
11-
- op-mode : I2S/DIT ops mode.
12-
- tdm-slots : Slots for TDM operation.
13-
- num-serializer : Serializers used by McASP.
14-
- serial-dir : A list of serializer pin mode. The list number should be equal
15-
to "num-serializer" parameter. Each entry is a number indication
16-
serializer pin direction. (0 - INACTIVE, 1 - TX, 2 - RX)
7+
"ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, TI81xx)
178

9+
- reg : Should contain reg specifiers for the entries in the reg-names property.
10+
- reg-names : Should contain:
11+
* "mpu" for the main registers (required). For compatibility with
12+
existing software, it is recommended this is the first entry.
13+
* "dat" for separate data port register access (optional).
14+
- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF,
15+
IEC60958-1, and AES-3 formats.
16+
- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted
17+
or received over one serializer.
18+
- serial-dir : A list of serializer configuration. Each entry is a number
19+
indication for serializer pin direction.
20+
(0 - INACTIVE, 1 - TX, 2 - RX)
21+
- dmas: two element list of DMA controller phandles and DMA request line
22+
ordered pairs.
23+
- dma-names: identifier string for each DMA request line in the dmas property.
24+
These strings correspond 1:1 with the ordered pairs in dmas. The dma
25+
identifiers must be "rx" and "tx".
1826

1927
Optional properties:
2028

@@ -23,18 +31,23 @@ Optional properties:
2331
- rx-num-evt : FIFO levels.
2432
- sram-size-playback : size of sram to be allocated during playback
2533
- sram-size-capture : size of sram to be allocated during capture
34+
- interrupts : Interrupt numbers for McASP, currently not used by the driver
35+
- interrupt-names : Known interrupt names are "tx" and "rx"
36+
- pinctrl-0: Should specify pin control group used for this controller.
37+
- pinctrl-names: Should contain only one value - "default", for more details
38+
please refer to pinctrl-bindings.txt
39+
2640

2741
Example:
2842

2943
mcasp0: mcasp0@1d00000 {
3044
compatible = "ti,da830-mcasp-audio";
31-
#address-cells = <1>;
32-
#size-cells = <0>;
3345
reg = <0x100000 0x3000>;
34-
interrupts = <82 83>;
46+
reg-names "mpu";
47+
interrupts = <82>, <83>;
48+
interrupts-names = "tx", "rx";
3549
op-mode = <0>; /* MCASP_IIS_MODE */
3650
tdm-slots = <2>;
37-
num-serializer = <16>;
3851
serial-dir = <
3952
0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */
4053
0 0 0 0

‎Documentation/devicetree/bindings/sound/tlv320aic3x.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,36 @@ Optional properties:
2424
3 - MICBIAS output is connected to AVDD,
2525
If this node is not mentioned or if the value is incorrect, then MicBias
2626
is powered down.
27+
- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
28+
device as covered in Documentation/devicetree/bindings/regulator/regulator.txt
29+
30+
CODEC output pins:
31+
* LLOUT
32+
* RLOUT
33+
* MONO_LOUT
34+
* HPLOUT
35+
* HPROUT
36+
* HPLCOM
37+
* HPRCOM
38+
39+
CODEC input pins:
40+
* MIC3L
41+
* MIC3R
42+
* LINE1L
43+
* LINE2L
44+
* LINE1R
45+
* LINE2R
46+
47+
The pins can be used in referring sound node's audio-routing property.
2748

2849
Example:
2950

3051
tlv320aic3x: tlv320aic3x@1b {
3152
compatible = "ti,tlv320aic3x";
3253
reg = <0x1b>;
54+
55+
AVDD-supply = <&regulator>;
56+
IOVDD-supply = <&regulator>;
57+
DRVDD-supply = <&regulator>;
58+
DVDD-supply = <&regulator>;
3359
};

‎Documentation/devicetree/bindings/sound/tpa6130a2.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Texas Instruments - tpa6130a2 Codec module
2+
3+
The tpa6130a2 serial control bus communicates through I2C protocols
4+
5+
Required properties:
6+
7+
- compatible - "string" - One of:
8+
"ti,tpa6130a2" - TPA6130A2
9+
"ti,tpa6140a2" - TPA6140A2
10+
11+
12+
- reg - <int> - I2C slave address
13+
14+
- Vdd-supply - <phandle> - power supply regulator
15+
16+
Optional properties:
17+
18+
- power-gpio - gpio pin to power the device
19+
20+
Example:
21+
22+
tpa6130a2: tpa6130a2@60 {
23+
compatible = "ti,tpa6130a2";
24+
reg = <0x60>;
25+
Vdd-supply = <&vmmc2>;
26+
power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
27+
};

‎Documentation/ioctl/ioctl-number.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ Code Seq#(hex) Include File Comments
138138
'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict!
139139
'H' C0-DF net/bluetooth/bnep/bnep.h conflict!
140140
'H' F1 linux/hid-roccat.h <mailto:erazor_de@users.sourceforge.net>
141+
'H' F8-FA sound/firewire.h
141142
'I' all linux/isdn.h conflict!
142143
'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict!
143144
'I' 40-4F linux/mISDNif.h conflict!

‎Documentation/laptops/thinkpad-acpi.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ThinkPad ACPI Extras Driver
22

3-
Version 0.24
4-
December 11th, 2009
3+
Version 0.25
4+
October 16th, 2013
55

66
Borislav Deianov <borislav@users.sf.net>
77
Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -741,6 +741,9 @@ compiled with the CONFIG_THINKPAD_ACPI_UNSAFE_LEDS option enabled.
741741
Distributions must never enable this option. Individual users that
742742
are aware of the consequences are welcome to enabling it.
743743

744+
Audio mute and microphone mute LEDs are supported, but currently not
745+
visible to userspace. They are used by the snd-hda-intel audio driver.
746+
744747
procfs notes:
745748

746749
The available commands are:

‎Documentation/sound/alsa/ALSA-Configuration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
616616

617617
As default, snd-dummy drivers doesn't allocate the real buffers
618618
but either ignores read/write or mmap a single dummy page to all
619-
buffer pages, in order to save the resouces. If your apps need
619+
buffer pages, in order to save the resources. If your apps need
620620
the read/ written buffer data to be consistent, pass fake_buffer=0
621621
option.
622622

‎Documentation/sound/alsa/Audiophile-Usb.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ The parameter can be given:
232232
# modprobe snd-usb-audio index=1 device_setup=0x09
233233

234234
* Or while configuring the modules options in your modules configuration file
235-
(tipically a .conf file in /etc/modprobe.d/ directory:
235+
(typically a .conf file in /etc/modprobe.d/ directory:
236236
alias snd-card-1 snd-usb-audio
237237
options snd-usb-audio index=1 device_setup=0x09
238238

‎Documentation/sound/alsa/CMIPCI.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ with 4 channels,
8787

8888
and use the interleaved 4 channel data.
8989

90-
There are some control switchs affecting to the speaker connections:
90+
There are some control switches affecting to the speaker connections:
9191

9292
"Line-In Mode" - an enum control to change the behavior of line-in
9393
jack. Either "Line-In", "Rear Output" or "Bass Output" can

0 commit comments

Comments
 (0)