mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 13:41:55 +00:00
bae41e45b7
This became a fairly large pull request. In addition to the usual
driver updates / fixes, there have been a high amount of cleanups in
ASoC area, as well as control API helpers and kernel documentations
fixes touching through the whole tree.
In the driver side, the biggest changes are the support for new Intel
SoC found on new x86 machines, and the updates of FireWire dice and
oxfw drivers.
Some remarkable items are below:
* ALSA core
- PCM mmap code cleanup, removal of arch-dependent codes
- PCM xrun injection support
- PCM hwptr tracepoint support
- Refactoring of snd_pcm_action(), simplification of PCM locking
- Robustified sequecner auto-load functionality
- New control API helpers and lots of cleanups along with them
- Lots of kerneldoc fixes and cleanups
* USB-audio
- The mixer resume code was largely rewritten, and the devices with
quirks are resumed properly.
- New hardware support: Focusrite Scarlett, Digidesign Mbox1,
Denon/Marantz DACs, Zoom R16/24
* FireWire
- DICE driver updates with better duplex and sync support, including
MIDI support
- New OXFW driver for Oxford Semiconductor FW970/971 chipset,
including the previous LaCie Speakers device. Fullduplex and MIDI
support included as well as DICE driver.
* HD-audio
- Refactoring the driver-caps quirk handling in snd-hda-intel
- More consistent control names representing the topology better
- Fixups: HP mute LED with ALC268 codec, Ideapad S210 built-in mic
fix, ASUS Z99He laptop EAPD
* ASoC
- Conversion of AC'97 drivers to use regmap, bringing us closer to
the removal of the ASoC level I/O code
- Clean up a lot of old drivers that were open coding things that
have subsequently been implemented in the core
- Some DAPM performance improvements
- Removal of the now seldom used CODEC mutex
- Lots of updates for the newer Intel SoC support, including support
for the DSP and some Cherrytrail and Braswell machine drivers
- Support for Samsung boards using rt5631 as the CODEC
- Removal of the obsolete AFEB9260 machine driver
- Driver support for the TI TS3A227E headset driver used in some
Chrombeooks
* Others
- ASIHPI driver update and cleanups
- Lots of dev_*() printk conversions
- Lots of trivial cleanups for the codes spotted by Coccinelle
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABAgAGBQJUiYaqAAoJEGwxgFQ9KSmkeo0P/2aDx2w8iVi8n7Og/7VBubkm
VZkk08IOpP3h1ojyQRsBQPI0H5AquqQTZN1TJUDcy+6PD9vckYYcag9JWhA+0RBr
I+BfTMLB3E4umIkzOjxeoyOzheL7GoZ+eZYEm8DkAhaue+cFhjNJz+S6g8ENkxJ9
lSjErXQxyiowc39I0v1WBZcuq6glX1psEsVup9U8m7KhNx6lexj28A2MkqicW4hs
DZE6pYrk57W7y3+/NWxaBiglrItvScBAPpPqoyDm9zuDNTmAtGjf1uMRmRyHe30Z
iunHXki8Fc2yBBapmfYrcLC2jyIyZykcxniF8Hd4nXUvddisFUEFFhNmB6v392d0
4/NXSqTnsq48vm0Ezjia2LySWKZZVQtam8t9262BKHcosKYObxirekD6vijSoWO8
ZWoXa+U1oWSFEoOAFDsu6GFqFHFRi5VhqBgIaPEIxrT2MQGHL3KU1bp8CJi/5CTU
pNh0wC9SMtnSJJXBIP/nYH81WQxaik3c4eiHFPN4+0McBZQiIaIqMG6x+iiVNvPB
MNLLVAzk0QiWeCmSo8OBdjOV0/T+pfQ7lrTCn2B1jdJi1CkAO8m2SwQrG4PpRx8k
lUTBd4zTx5DYR+yPF69OyoCQg0XKjW9g62Qo5rmxrQreiidROZOBS1bljWzIPeft
otupLmK5kz67n3eB2eto
=sB6v
-----END PGP SIGNATURE-----
Merge tag 'sound-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"This became a fairly large pull request. In addition to the usual
driver updates / fixes, there have been a high amount of cleanups in
ASoC area, as well as control API helpers and kernel documentations
fixes touching through the whole tree.
In the driver side, the biggest changes are the support for new Intel
SoC found on new x86 machines, and the updates of FireWire dice and
oxfw drivers.
Some remarkable items are below:
ALSA core:
- PCM mmap code cleanup, removal of arch-dependent codes
- PCM xrun injection support
- PCM hwptr tracepoint support
- Refactoring of snd_pcm_action(), simplification of PCM locking
- Robustified sequecner auto-load functionality
- New control API helpers and lots of cleanups along with them
- Lots of kerneldoc fixes and cleanups
USB-audio:
- The mixer resume code was largely rewritten, and the devices with
quirks are resumed properly.
- New hardware support: Focusrite Scarlett, Digidesign Mbox1,
Denon/Marantz DACs, Zoom R16/24
FireWire:
- DICE driver updates with better duplex and sync support, including
MIDI support
- New OXFW driver for Oxford Semiconductor FW970/971 chipset,
including the previous LaCie Speakers device. Fullduplex and MIDI
support included as well as DICE driver.
HD-audio:
- Refactoring the driver-caps quirk handling in snd-hda-intel
- More consistent control names representing the topology better
- Fixups: HP mute LED with ALC268 codec, Ideapad S210 built-in mic
fix, ASUS Z99He laptop EAPD
ASoC:
- Conversion of AC'97 drivers to use regmap, bringing us closer to
the removal of the ASoC level I/O code
- Clean up a lot of old drivers that were open coding things that
have subsequently been implemented in the core
- Some DAPM performance improvements
- Removal of the now seldom used CODEC mutex
- Lots of updates for the newer Intel SoC support, including support
for the DSP and some Cherrytrail and Braswell machine drivers
- Support for Samsung boards using rt5631 as the CODEC
- Removal of the obsolete AFEB9260 machine driver
- Driver support for the TI TS3A227E headset driver used in some
Chrombeooks
Others:
- ASIHPI driver update and cleanups
- Lots of dev_*() printk conversions
- Lots of trivial cleanups for the codes spotted by Coccinelle"
* tag 'sound-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (594 commits)
ALSA: pcxhr: NULL dereference on probe failure
ALSA: lola: NULL dereference on probe failure
ALSA: hda - Add "eapd" model string for AD1986A codec
ALSA: hda - Add EAPD fixup for ASUS Z99He laptop
ALSA: oxfw: Add hwdep interface
ALSA: oxfw: Add support for capture/playback MIDI messages
ALSA: oxfw: add support for capturing PCM samples
ALSA: oxfw: Add support AMDTP in-stream
ALSA: oxfw: Add support for Behringer/Mackie devices
ALSA: oxfw: Change the way to start stream
ALSA: oxfw: Add proc interface for debugging purpose
ALSA: oxfw: Change the way to make PCM rules/constraints
ALSA: oxfw: Add support for AV/C stream format command to get/set supported stream formation
ALSA: oxfw: Change the way to name card
ALSA: dice: Add support for MIDI capture/playback
ALSA: dice: Add support for capturing PCM samples
ALSA: dice: Support for non SYT-Match sampling clock source mode
ALSA: dice: Add support for duplex streams with synchronization
ALSA: dice: Change the way to start stream
ALSA: jack: Add dummy snd_jack_set_key() definition
...
122 lines
4.1 KiB
Plaintext
122 lines
4.1 KiB
Plaintext
config SND_OMAP_SOC
|
|
tristate "SoC Audio for the Texas Instruments OMAP chips"
|
|
depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)
|
|
select SND_DMAENGINE_PCM
|
|
|
|
config SND_OMAP_SOC_DMIC
|
|
tristate
|
|
|
|
config SND_OMAP_SOC_MCBSP
|
|
tristate
|
|
|
|
config SND_OMAP_SOC_MCPDM
|
|
tristate
|
|
|
|
config SND_OMAP_SOC_HDMI_AUDIO
|
|
tristate "HDMI audio support for OMAP4+ based SoCs"
|
|
depends on SND_OMAP_SOC
|
|
help
|
|
For HDMI audio to work OMAPDSS HDMI support should be
|
|
enabled.
|
|
The hdmi audio driver implements cpu-dai component using the
|
|
callbacks provided by OMAPDSS and registers the component
|
|
under DSS HDMI device. Omap-pcm is registered for platform
|
|
component also under DSS HDMI device. Dummy codec is used as
|
|
as codec component. The hdmi audio driver implements also
|
|
the card and registers it under its own platform device.
|
|
The device for the dirver is registered by OMAPDSS hdmi
|
|
driver.
|
|
|
|
config SND_OMAP_SOC_N810
|
|
tristate "SoC Audio support for Nokia N810"
|
|
depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
|
|
depends on OMAP_MUX
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TLV320AIC3X
|
|
help
|
|
Say Y if you want to add support for SoC audio on Nokia N810.
|
|
|
|
config SND_OMAP_SOC_RX51
|
|
tristate "SoC Audio support for Nokia N900 (RX-51)"
|
|
depends on SND_OMAP_SOC && ARM && I2C
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TLV320AIC3X
|
|
select SND_SOC_TPA6130A2
|
|
depends on GPIOLIB
|
|
help
|
|
Say Y if you want to add support for SoC audio on Nokia N900
|
|
cellphone.
|
|
|
|
config SND_OMAP_SOC_AMS_DELTA
|
|
tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
|
|
depends on SND_OMAP_SOC && MACH_AMS_DELTA && TTY
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_CX20442
|
|
help
|
|
Say Y if you want to add support for SoC audio device connected to
|
|
a handset and a speakerphone found on Amstrad E3 (Delta) videophone.
|
|
|
|
Note that in order to get those devices fully supported, you have to
|
|
build the kernel with standard serial port driver included and
|
|
configured for at least 4 ports. Then, from userspace, you must load
|
|
a line discipline #19 on the modem (ttyS3) serial line. The simplest
|
|
way to achieve this is to install util-linux-ng and use the included
|
|
ldattach utility. This can be started automatically from udev,
|
|
a simple rule like this one should do the trick (it does for me):
|
|
ACTION=="add", KERNEL=="controlC0", \
|
|
RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
|
|
|
|
config SND_OMAP_SOC_OSK5912
|
|
tristate "SoC Audio support for omap osk5912"
|
|
depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TLV320AIC23_I2C
|
|
help
|
|
Say Y if you want to add support for SoC audio on osk5912.
|
|
|
|
config SND_OMAP_SOC_AM3517EVM
|
|
tristate "SoC Audio support for OMAP3517 / AM3517 EVM"
|
|
depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TLV320AIC23_I2C
|
|
help
|
|
Say Y if you want to add support for SoC audio on the OMAP3517 / AM3517
|
|
EVM.
|
|
|
|
config SND_OMAP_SOC_OMAP_TWL4030
|
|
tristate "SoC Audio support for TI SoC based boards with twl4030 codec"
|
|
depends on TWL4030_CORE && SND_OMAP_SOC
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TWL4030
|
|
help
|
|
Say Y if you want to add support for SoC audio on TI SoC based boards
|
|
using twl4030 as c codec. This driver currently supports:
|
|
- Beagleboard or Devkit8000
|
|
- Gumstix Overo or CompuLab CM-T35/CM-T3730
|
|
- IGEP v2
|
|
- OMAP3EVM
|
|
- SDP3430
|
|
- Zoom2
|
|
|
|
config SND_OMAP_SOC_OMAP_ABE_TWL6040
|
|
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
|
|
depends on TWL6040_CORE && SND_OMAP_SOC && (ARCH_OMAP4 || COMPILE_TEST)
|
|
select SND_OMAP_SOC_DMIC
|
|
select SND_OMAP_SOC_MCPDM
|
|
select SND_SOC_TWL6040
|
|
select SND_SOC_DMIC
|
|
help
|
|
Say Y if you want to add support for SoC audio on OMAP boards using
|
|
ABE and twl6040 codec. This driver currently supports:
|
|
- SDP4430/Blaze boards
|
|
- PandaBoard (4430)
|
|
- PandaBoardES (4460)
|
|
|
|
config SND_OMAP_SOC_OMAP3_PANDORA
|
|
tristate "SoC Audio support for OMAP3 Pandora"
|
|
depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA
|
|
select SND_OMAP_SOC_MCBSP
|
|
select SND_SOC_TWL4030
|
|
help
|
|
Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
|