Skip to content

L
linux
Commit 50201253 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
  ALSA: hda - Add quirk for Acer Ferrari 5000
  ALSA: hda - Use cached calls to get widget caps and pin caps
  ALSA: hda - Don't create empty/single-item input source
  ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
  ALSA: hda - Cache pin-cap values
  ALSA: hda - Avoid output amp manipulation to digital mic pins
  ALSA: hda - Add function id to proc output
  ALSA: pcm - Safer boundary checks
  ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
  ALSA: sound/ali5451: typo: s/resouces/resources/
  ALSA: hda - Don't show the current connection for power widgets
  ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
  ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
  ASoC: OMAP: N810: Add more jack functions
  ASoC: OMAP: N810: Mark not connected input pins
  ASoC: Add FLL support for WM8400
  ALSA: hda - Don't reset stream at each prepare callback
  ALSA: hda - Don't reset BDL unnecessarily
  ALSA: pcm - Fix delta calculation at boundary overlap
  ALSA: pcm - Reset invalid position even without debug option
  ...
parents 562f477a c441c297
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20387 additions and 9680 deletions
Documentation/DocBook/Makefile
View file @ 50201253
......@@ -12,7 +12,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
mac80211.xml debugobjects.xml sh.xml regulator.xml
mac80211.xml debugobjects.xml sh.xml regulator.xml \
alsa-driver-api.xml writing-an-alsa-driver.xml
###
# The build process is as follows (targets):
......
Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl → Documentation/DocBook/alsa-driver-api.tmpl
View file @ 50201253
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book>
<?dbhtml filename="index.html">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
<!-- ****************************************************** -->
<!-- Header -->
<!-- ****************************************************** -->
<book id="ALSA-Driver-API">
<bookinfo>
<title>The ALSA Driver API</title>
......@@ -35,6 +35,8 @@
</bookinfo>
<toc></toc>
<chapter><title>Management of Cards and Devices</title>
<sect1><title>Card Management</title>
!Esound/core/init.c
......@@ -71,6 +73,10 @@
!Esound/pci/ac97/ac97_codec.c
!Esound/pci/ac97/ac97_pcm.c
</sect1>
<sect1><title>Virtual Master Control API</title>
!Esound/core/vmaster.c
!Iinclude/sound/control.h
</sect1>
</chapter>
<chapter><title>MIDI API</title>
<sect1><title>Raw MIDI API</title>
......@@ -88,6 +94,9 @@
<chapter><title>Miscellaneous Functions</title>
<sect1><title>Hardware-Dependent Devices API</title>
!Esound/core/hwdep.c
</sect1>
<sect1><title>Jack Abstraction Layer API</title>
!Esound/core/jack.c
</sect1>
<sect1><title>ISA DMA Helpers</title>
!Esound/core/isadma.c
......
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl → Documentation/DocBook/writing-an-alsa-driver.tmpl
View file @ 50201253
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book>
<?dbhtml filename="index.html">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
<!-- ****************************************************** -->
<!-- Header -->
<!-- ****************************************************** -->
<book id="Writing-an-ALSA-Driver">
<bookinfo>
<title>Writing an ALSA Driver</title>
<author>
......@@ -492,9 +492,9 @@
}
/* (2) */
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;
/* (3) */
err = snd_mychip_create(card, pci, &chip);
......@@ -590,8 +590,9 @@
<programlisting>
<![CDATA[
struct snd_card *card;
int err;
....
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
]]>
</programlisting>
</informalexample>
......@@ -809,26 +810,28 @@
<para>
As mentioned above, to create a card instance, call
<function>snd_card_new()</function>.
<function>snd_card_create()</function>.
<informalexample>
<programlisting>
<![CDATA[
struct snd_card *card;
card = snd_card_new(index, id, module, extra_size);
int err;
err = snd_card_create(index, id, module, extra_size, &card);
]]>
</programlisting>
</informalexample>
</para>
<para>
The function takes four arguments, the card-index number, the
The function takes five arguments, the card-index number, the
id string, the module pointer (usually
<constant>THIS_MODULE</constant>),
and the size of extra-data space. The last argument is used to
the size of extra-data space, and the pointer to return the
card instance. The extra_size argument is used to
allocate card-&gt;private_data for the
chip-specific data. Note that these data
are allocated by <function>snd_card_new()</function>.
are allocated by <function>snd_card_create()</function>.
</para>
</section>
......@@ -915,15 +918,16 @@
</para>
<section id="card-management-chip-specific-snd-card-new">
<title>1. Allocating via <function>snd_card_new()</function>.</title>
<title>1. Allocating via <function>snd_card_create()</function>.</title>
<para>
As mentioned above, you can pass the extra-data-length
to the 4th argument of <function>snd_card_new()</function>, i.e.
to the 4th argument of <function>snd_card_create()</function>, i.e.
<informalexample>
<programlisting>
<![CDATA[
card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct mychip));
err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(struct mychip), &card);
]]>
</programlisting>
</informalexample>
......@@ -952,8 +956,8 @@
<para>
After allocating a card instance via
<function>snd_card_new()</function> (with
<constant>NULL</constant> on the 4th arg), call
<function>snd_card_create()</function> (with
<constant>0</constant> on the 4th arg), call
<function>kzalloc()</function>.
<informalexample>
......@@ -961,7 +965,7 @@
<![CDATA[
struct snd_card *card;
struct mychip *chip;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL);
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
.....
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
]]>
......@@ -5750,8 +5754,9 @@ struct _snd_pcm_runtime {
....
struct snd_card *card;
struct mychip *chip;
int err;
....
card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL);
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
....
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
....
......@@ -5763,7 +5768,7 @@ struct _snd_pcm_runtime {
</informalexample>
When you created the chip data with
<function>snd_card_new()</function>, it's anyway accessible
<function>snd_card_create()</function>, it's anyway accessible
via <structfield>private_data</structfield> field.
<informalexample>
......@@ -5775,9 +5780,10 @@ struct _snd_pcm_runtime {
....
struct snd_card *card;
struct mychip *chip;
int err;
....
card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(struct mychip));
err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(struct mychip), &card);
....
chip = card->private_data;
....
......
Documentation/sound/alsa/ALSA-Configuration.txt
View file @ 50201253
......@@ -346,6 +346,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
sbirq - IRQ # for CMI8330 chip (SB16)
sbdma8 - 8bit DMA # for CMI8330 chip (SB16)
sbdma16 - 16bit DMA # for CMI8330 chip (SB16)
fmport - (optional) OPL3 I/O port
mpuport - (optional) MPU401 I/O port
mpuirq - (optional) MPU401 irq #
This module supports multiple cards and autoprobe.
......@@ -388,34 +391,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
The power-management is supported.
Module snd-cs4232
-----------------
Module for sound cards based on CS4232/CS4232A ISA chips.
isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
with isapnp=0, the following options are available:
port - port # for CS4232 chip (PnP setup - 0x534)
cport - control port # for CS4232 chip (PnP setup - 0x120,0x210,0xf00)
mpu_port - port # for MPU-401 UART (PnP setup - 0x300), -1 = disable
fm_port - FM port # for CS4232 chip (PnP setup - 0x388), -1 = disable
irq - IRQ # for CS4232 chip (5,7,9,11,12,15)
mpu_irq - IRQ # for MPU-401 UART (9,11,12,15)
dma1 - first DMA # for CS4232 chip (0,1,3)
dma2 - second DMA # for Yamaha CS4232 chip (0,1,3), -1 = disable
This module supports multiple cards. This module does not support autoprobe
(if ISA PnP is not used) thus main port must be specified!!! Other ports are
optional.
The power-management is supported.
Module snd-cs4236
-----------------
Module for sound cards based on CS4235/CS4236/CS4236B/CS4237B/
Module for sound cards based on CS4232/CS4232A,
CS4235/CS4236/CS4236B/CS4237B/
CS4238B/CS4239 ISA chips.
isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
......@@ -437,6 +417,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
The power-management is supported.
This module is aliased as snd-cs4232 since it provides the old
snd-cs4232 functionality, too.
Module snd-cs4281
-----------------
......@@ -606,6 +589,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
Module for ESS AudioDrive ES-1688 and ES-688 sound cards.
port - port # for ES-1688 chip (0x220,0x240,0x260)
fm_port - port # for OPL3 (option; share the same port as default)
mpu_port - port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)
irq - IRQ # for ES-1688 chip (5,7,9,10)
mpu_irq - IRQ # for MPU-401 port (5,7,9,10)
......@@ -757,6 +741,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
model - force the model name
position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF)
probe_mask - Bitmask to probe codecs (default = -1, meaning all slots)
When the bit 8 (0x100) is set, the lower 8 bits are used
as the "fixed" codec slots; i.e. the driver probes the
slots regardless what hardware reports back
probe_only - Only probing and no codec initialization (default=off);
Useful to check the initial codec status for debugging
bdl_pos_adj - Specifies the DMA IRQ timing delay in samples.
......@@ -1185,6 +1172,54 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
This module supports multiple devices and PnP.
Module snd-msnd-classic
-----------------------
Module for Turtle Beach MultiSound Classic, Tahiti or Monterey
soundcards.
io - Port # for msnd-classic card
irq - IRQ # for msnd-classic card
mem - Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000,
0xe0000 or 0xe8000)
write_ndelay - enable write ndelay (default = 1)
calibrate_signal - calibrate signal (default = 0)
isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
digital - Digital daughterboard present (default = 0)
cfg - Config port (0x250, 0x260 or 0x270) default = PnP
reset - Reset all devices
mpu_io - MPU401 I/O port
mpu_irq - MPU401 irq#
ide_io0 - IDE port #0
ide_io1 - IDE port #1
ide_irq - IDE irq#
joystick_io - Joystick I/O port
The driver requires firmware files "turtlebeach/msndinit.bin" and
"turtlebeach/msndperm.bin" in the proper firmware directory.
See Documentation/sound/oss/MultiSound for important information
about this driver. Note that it has been discontinued, but the
Voyetra Turtle Beach knowledge base entry for it is still available
at
http://www.turtlebeach.com/site/kb_ftp/790.asp
Module snd-msnd-pinnacle
------------------------
Module for Turtle Beach MultiSound Pinnacle/Fiji soundcards.
io - Port # for pinnacle/fiji card
irq - IRQ # for pinnalce/fiji card
mem - Memory address (0xb0000, 0xc8000, 0xd0000, 0xd8000,
0xe0000 or 0xe8000)
write_ndelay - enable write ndelay (default = 1)
calibrate_signal - calibrate signal (default = 0)
isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
The driver requires firmware files "turtlebeach/pndspini.bin" and
"turtlebeach/pndsperm.bin" in the proper firmware directory.
Module snd-mtpav
----------------
......@@ -1824,7 +1859,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
-------------------
Module for sound cards based on the Asus AV100/AV200 chips,
i.e., Xonar D1, DX, D2, D2X and HDAV1.3 (Deluxe).
i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX.
This module supports autoprobe and multiple cards.
......
Documentation/sound/alsa/HD-Audio-Models.txt
View file @ 50201253
......@@ -56,6 +56,7 @@ ALC262
sony-assamd Sony ASSAMD
toshiba-s06 Toshiba S06
toshiba-rx1 Toshiba RX1
tyan Tyan Thunder n6650W (S2915-E)
ultra Samsung Q1 Ultra Vista model
lenovo-3000 Lenovo 3000 y410
nec NEC Versa S9100
......@@ -261,6 +262,8 @@ Conexant 5051
=============
laptop Basic Laptop config (default)
hp HP Spartan laptop
hp-dv6736 HP dv6736
lenovo-x200 Lenovo X200 laptop
STAC9200
========
......@@ -278,6 +281,7 @@ STAC9200
gateway-m4 Gateway laptops with EAPD control
gateway-m4-2 Gateway laptops with EAPD control
panasonic Panasonic CF-74
auto BIOS setup (default)
STAC9205/9254
=============
......@@ -285,6 +289,8 @@ STAC9205/9254
dell-m42 Dell (unknown)
dell-m43 Dell Precision
dell-m44 Dell Inspiron
eapd Keep EAPD on (e.g. Gateway T1616)
auto BIOS setup (default)
STAC9220/9221
=============
......@@ -308,6 +314,7 @@ STAC9220/9221
dell-d82 Dell (unknown)
dell-m81 Dell (unknown)
dell-m82 Dell XPS M1210
auto BIOS setup (default)
STAC9202/9250/9251
==================
......@@ -319,6 +326,7 @@ STAC9202/9250/9251
m3 Some Gateway MX series laptops
m5 Some Gateway MX series laptops (MP6954)
m6 Some Gateway NX series laptops
auto BIOS setup (default)
STAC9227/9228/9229/927x
=======================
......@@ -328,6 +336,7 @@ STAC9227/9228/9229/927x
5stack D965 5stack + SPDIF
dell-3stack Dell Dimension E520
dell-bios Fixes with Dell BIOS setup
auto BIOS setup (default)
STAC92HD71B*
============
......@@ -335,7 +344,10 @@ STAC92HD71B*
dell-m4-1 Dell desktops
dell-m4-2 Dell desktops
dell-m4-3 Dell desktops
hp-m4 HP dv laptops
hp-m4 HP mini 1000
hp-dv5 HP dv series
hp-hdx HP HDX series
auto BIOS setup (default)
STAC92HD73*
===========
......@@ -345,13 +357,16 @@ STAC92HD73*
dell-m6-dmic Dell desktops/laptops with digital mics
dell-m6 Dell desktops/laptops with both type of mics
dell-eq Dell desktops/laptops
auto BIOS setup (default)
STAC92HD83*
===========
ref Reference board
mic-ref Reference board with power managment for ports
dell-s14 Dell laptop
auto BIOS setup (default)
STAC9872
========
vaio Setup for VAIO FE550G/SZ110
vaio-ar Setup for VAIO AR
vaio VAIO laptop without SPDIF
auto BIOS setup (default)
Documentation/sound/alsa/HD-Audio.txt
View file @ 50201253
......@@ -109,6 +109,13 @@ slot, pass `probe_mask=1`. For the first and the third slots, pass
Since 2.6.29 kernel, the driver has a more robust probing method, so
this error might happen rarely, though.
On a machine with a broken BIOS, sometimes you need to force the
driver to probe the codec slots the hardware doesn't report for use.
In such a case, turn the bit 8 (0x100) of `probe_mask` option on.
Then the rest 8 bits are passed as the codec slots to probe
unconditionally. For example, `probe_mask=0x103` will force to probe
the codec slots 0 and 1 no matter what the hardware reports.
Interrupt Handling
~~~~~~~~~~~~~~~~~~
......@@ -358,10 +365,26 @@ modelname::
to this file.
init_verbs::
The extra verbs to execute at initialization. You can add a verb by
writing to this file. Pass tree numbers, nid, verb and parameter.
writing to this file. Pass three numbers: nid, verb and parameter
(separated with a space).
hints::
Shows hint strings for codec parsers for any use. Right now it's
not used.
Shows / stores hint strings for codec parsers for any use.
Its format is `key = value`. For example, passing `hp_detect = yes`
to IDT/STAC codec parser will result in the disablement of the
headphone detection.
init_pin_configs::
Shows the initial pin default config values set by BIOS.
driver_pin_configs::
Shows the pin default values set by the codec parser explicitly.
This doesn't show all pin values but only the changed values by
the parser. That is, if the parser doesn't change the pin default
config values by itself, this will contain nothing.
user_pin_configs::
Shows the pin default config values to override the BIOS setup.
Writing this (with two numbers, NID and value) appends the new
value. The given will be used instead of the initial BIOS value at
the next reconfiguration time. Note that this config will override
even the driver pin configs, too.
reconfig::
Triggers the codec re-configuration. When any value is written to
this file, the driver re-initialize and parses the codec tree
......@@ -371,6 +394,14 @@ clear::
Resets the codec, removes the mixer elements and PCM stuff of the
specified codec, and clear all init verbs and hints.
For example, when you want to change the pin default configuration
value of the pin widget 0x14 to 0x9993013f, and let the driver
re-configure based on that state, run like below:
------------------------------------------------------------------------
# echo 0x14 0x9993013f > /sys/class/sound/hwC0D0/user_pin_configs
# echo 1 > /sys/class/sound/hwC0D0/reconfig
------------------------------------------------------------------------
Power-Saving
~~~~~~~~~~~~
......@@ -461,6 +492,16 @@ run with `--no-upload` option, and attach the generated file.
There are some other useful options. See `--help` option output for
details.
When a probe error occurs or when the driver obviously assigns a
mismatched model, it'd be helpful to load the driver with
`probe_only=1` option (at best after the cold reboot) and run
alsa-info at this state. With this option, the driver won't configure
the mixer and PCM but just tries to probe the codec slot. After
probing, the proc file is available, so you can get the raw codec
information before modified by the driver. Of course, the driver
isn't usable with `probe_only=1`. But you can continue the
configuration via hwdep sysfs file if hda-reconfig option is enabled.
hda-verb
~~~~~~~~
......
Documentation/sound/alsa/soc/dapm.txt
View file @ 50201253
......@@ -116,6 +116,9 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,
ARRAY_SIZE(wm8731_output_mixer_controls)),
If you dont want the mixer elements prefixed with the name of the mixer widget,
you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
as for SND_SOC_DAPM_MIXER.
2.3 Platform/Machine domain Widgets
-----------------------------------
......
Documentation/sound/oss/CS4232 deleted 100644 → 0
View file @ 562f477a
To configure the Crystal CS423x sound chip and activate its DSP functions,
modules may be loaded in this order:
modprobe sound
insmod ad1848
insmod uart401
insmod cs4232 io=* irq=* dma=* dma2=*
This is the meaning of the parameters:
io--I/O address of the Windows Sound System (normally 0x534)
irq--IRQ of this device
dma and dma2--DMA channels (DMA2 may be 0)
On some cards, the board attempts to do non-PnP setup, and fails. If you
have problems, use Linux' PnP facilities.
To get MIDI facilities add
insmod opl3 io=*
where "io" is the I/O address of the OPL3 synthesizer. This will be shown
in /proc/sys/pnp and is normally 0x388.
Documentation/sound/oss/Introduction
View file @ 50201253
......@@ -80,7 +80,7 @@ Notes:
additional features.
2. The commercial OSS driver may be obtained from the site:
http://www/opensound.com. This may be used for cards that
http://www.opensound.com. This may be used for cards that
are unsupported by the kernel driver, or may be used
by other operating systems.
......
arch/arm/mach-pxa/e740.c
View file @ 50201253
......@@ -135,6 +135,11 @@ static unsigned long e740_pin_config[] __initdata = {
/* IrDA */
GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
/* Audio power control */
GPIO16_GPIO, /* AC97 codec AVDD2 supply (analogue power) */
GPIO40_GPIO, /* Mic amp power */
GPIO41_GPIO, /* Headphone amp power */
/* PC Card */
GPIO8_GPIO, /* CD0 */
GPIO44_GPIO, /* CD1 */
......
arch/arm/mach-pxa/e750.c
View file @ 50201253
......@@ -133,6 +133,11 @@ static unsigned long e750_pin_config[] __initdata = {
/* IrDA */
GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,
/* Audio power control */
GPIO4_GPIO, /* Headphone amp power */
GPIO7_GPIO, /* Speaker amp power */
GPIO37_GPIO, /* Headphone detect */
/* PC Card */
GPIO8_GPIO, /* CD0 */
GPIO44_GPIO, /* CD1 */
......
arch/arm/mach-pxa/h5000.c
View file @ 50201253
......@@ -153,6 +153,13 @@ static unsigned long h5000_pin_config[] __initdata = {
GPIO23_SSP1_SCLK,
GPIO25_SSP1_TXD,
GPIO26_SSP1_RXD,
/* I2S */
GPIO28_I2S_BITCLK_OUT,
GPIO29_I2S_SDATA_IN,
GPIO30_I2S_SDATA_OUT,
GPIO31_I2S_SYNC,
GPIO32_I2S_SYSCLK,
};
/*
......
arch/arm/mach-pxa/include/mach/eseries-gpio.h
View file @ 50201253
......@@ -45,6 +45,21 @@
/* e7xx IrDA power control */
#define GPIO_E7XX_IR_OFF 38
/* e740 audio control GPIOs */
#define GPIO_E740_WM9705_nAVDD2 16
#define GPIO_E740_MIC_ON 40
#define GPIO_E740_AMP_ON 41
/* e750 audio control GPIOs */
#define GPIO_E750_HP_AMP_OFF 4
#define GPIO_E750_SPK_AMP_OFF 7
#define GPIO_E750_HP_DETECT 37
/* e800 audio control GPIOs */
#define GPIO_E800_HP_DETECT 81
#define GPIO_E800_HP_AMP_OFF 82
#define GPIO_E800_SPK_AMP_ON 83
/* ASIC related GPIOs */
#define GPIO_ESERIES_TMIO_IRQ 5
#define GPIO_ESERIES_TMIO_PCLR 19
......
arch/arm/mach-pxa/include/mach/regs-ssp.h
View file @ 50201253
......@@ -50,7 +50,7 @@
#define SSCR0_TUM (1 << 23) /* Transmit FIFO underrun interrupt mask */
#define SSCR0_FRDC (0x07000000) /* Frame rate divider control (mask) */
#define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] */
#define SSCR0_ADC (1 << 30) /* Audio clock select */
#define SSCR0_ACS (1 << 30) /* Audio clock select */
#define SSCR0_MOD (1 << 31) /* Mode (normal or network) */
#endif
......@@ -109,6 +109,11 @@
#define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */
#define SSSR_PINT (1 << 18) /* Peripheral Trailing Byte Interrupt */
#if defined(CONFIG_PXA3xx)
#define SSPSP_EDMYSTOP(x) ((x) << 28) /* Extended Dummy Stop */
#define SSPSP_EDMYSTRT(x) ((x) << 26) /* Extended Dummy Start */
#endif
#define SSPSP_FSRT (1 << 25) /* Frame Sync Relative Timing */
#define SSPSP_DMYSTOP(x) ((x) << 23) /* Dummy Stop */
#define SSPSP_SFRMWDTH(x) ((x) << 16) /* Serial Frame Width */
......
arch/arm/mach-pxa/spitz.c
View file @ 50201253
......@@ -105,6 +105,12 @@ static unsigned long spitz_pin_config[] __initdata = {
GPIO57_nIOIS16,
GPIO104_PSKTSEL,
/* I2S */
GPIO28_I2S_BITCLK_OUT,
GPIO29_I2S_SDATA_IN,
GPIO30_I2S_SDATA_OUT,
GPIO31_I2S_SYNC,
/* MMC */
GPIO32_MMC_CLK,
GPIO112_MMC_CMD,
......
arch/arm/mach-s3c2410/dma.c
View file @ 50201253
......@@ -28,7 +28,7 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
......
arch/arm/mach-s3c2412/dma.c
View file @ 50201253
......@@ -29,8 +29,8 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <plat/regs-s3c2412-iis.h>
#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
......
arch/arm/mach-s3c2440/dma.c
View file @ 50201253
......@@ -28,7 +28,7 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
......
arch/arm/mach-s3c2443/dma.c
View file @ 50201253
......@@ -29,7 +29,7 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <plat/regs-iis.h>
#include <plat/regs-spi.h>
#define MAP(x) { \
......
include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h → arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
View file @ 50201253
......@@ -33,6 +33,9 @@
#define S3C2412_IISCON_RXDMA_ACTIVE (1 << 1)
#define S3C2412_IISCON_IIS_ACTIVE (1 << 0)
#define S3C64XX_IISMOD_IMS_PCLK (0 << 10)
#define S3C64XX_IISMOD_IMS_SYSMUX (1 << 10)
#define S3C2412_IISMOD_MASTER_INTERNAL (0 << 10)
#define S3C2412_IISMOD_MASTER_EXTERNAL (1 << 10)
#define S3C2412_IISMOD_SLAVE (2 << 10)
......@@ -44,8 +47,8 @@
#define S3C2412_IISMOD_LR_LLOW (0 << 7)
#define S3C2412_IISMOD_LR_RLOW (1 << 7)
#define S3C2412_IISMOD_SDF_IIS (0 << 5)
#define S3C2412_IISMOD_SDF_MSB (0 << 5)
#define S3C2412_IISMOD_SDF_LSB (0 << 5)
#define S3C2412_IISMOD_SDF_MSB (1 << 5)
#define S3C2412_IISMOD_SDF_LSB (2 << 5)
#define S3C2412_IISMOD_SDF_MASK (3 << 5)
#define S3C2412_IISMOD_RCLK_256FS (0 << 3)
#define S3C2412_IISMOD_RCLK_512FS (1 << 3)
......
drivers/media/video/cx88/cx88-alsa.c
View file @ 50201253
......@@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,
return (-ENOENT);
}
card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t));
if (!card)
return (-ENOMEM);
err = snd_card_create(index[devno], id[devno], THIS_MODULE,
sizeof(snd_cx88_card_t), &card);
if (err < 0)
return err;
card->private_free = snd_cx88_dev_free;
......
drivers/media/video/em28xx/em28xx-audio.c
View file @ 50201253
......@@ -448,9 +448,10 @@ static int em28xx_audio_init(struct em28xx *dev)
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
"Rechberger\n");
card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
&card);
if (err < 0)
return err;
spin_lock_init(&adev->slock);
err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);
......
drivers/media/video/saa7134/saa7134-alsa.c
View file @ 50201253
......@@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
if (!enable[devnum])
return -ENODEV;
card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t));
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
sizeof(snd_card_saa7134_t), &card);
if (err < 0)
return err;
strcpy(card->driver, "SAA7134");
......
drivers/staging/go7007/snd-go7007.c
View file @ 50201253
......@@ -248,10 +248,11 @@ int go7007_snd_init(struct go7007 *go)
spin_lock_init(&gosnd->lock);
gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0;
gosnd->capturing = 0;
gosnd->card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (gosnd->card == NULL) {
ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0,
&gosnd->card);
if (ret < 0) {
kfree(gosnd);
return -ENOMEM;
return ret;
}
ret = snd_device_new(gosnd->card, SNDRV_DEV_LOWLEVEL, go,
&go7007_snd_device_ops);
......
drivers/usb/gadget/gmidi.c
View file @ 50201253
......@@ -1099,10 +1099,9 @@ static int gmidi_register_card(struct gmidi_device *dev)
.dev_free = gmidi_snd_free,
};
card = snd_card_new(index, id, THIS_MODULE, 0);
if (!card) {
ERROR(dev, "snd_card_new failed\n");
err = -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0) {
ERROR(dev, "snd_card_create failed\n");
goto fail;
}
dev->card = card;
......
include/linux/input.h
View file @ 50201253
......@@ -661,6 +661,7 @@ struct input_absinfo {
#define SW_DOCK 0x05 /* set = plugged into dock */
#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */
#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)
......
include/linux/mfd/wm8350/audio.h
View file @ 50201253
......@@ -490,6 +490,7 @@
/*
* R231 (0xE7) - Jack Status
*/
#define WM8350_JACK_L_LVL 0x0800
#define WM8350_JACK_R_LVL 0x0400
/*
......
include/linux/mfd/wm8400-audio.h
View file @ 50201253
......@@ -1181,6 +1181,7 @@
#define WM8400_FLL_OUTDIV_SHIFT 0 /* FLL_OUTDIV - [2:0] */
#define WM8400_FLL_OUTDIV_WIDTH 3 /* FLL_OUTDIV - [2:0] */
struct wm8400;
void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400);
#endif
include/linux/pci_ids.h
View file @ 50201253
......@@ -2112,6 +2112,8 @@
#define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c
#define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274
#define PCI_VENDOR_ID_DFI 0x15bd
#define PCI_VENDOR_ID_QUICKNET 0x15e2
#define PCI_DEVICE_ID_QUICKNET_XJ 0x0500
......
include/sound/ad1816a.h
View file @ 50201253
......@@ -169,5 +169,7 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port,
extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm);
extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);
extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
struct snd_timer **rtimer);
#endif /* __SOUND_AD1816A_H */
include/sound/asound.h
View file @ 50201253
This diff is collapsed.
include/sound/atmel-abdac.h 0 → 100644
View file @ 50201253
/*
* Driver for the Atmel Audio Bitstream DAC (ABDAC)
*
* Copyright (C) 2009 Atmel Corporation
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef __INCLUDE_SOUND_ATMEL_ABDAC_H
#define __INCLUDE_SOUND_ATMEL_ABDAC_H
#include <linux/dw_dmac.h>
/**
* struct atmel_abdac_pdata - board specific ABDAC configuration
* @dws: DMA slave interface to use for sound playback.
*/
struct atmel_abdac_pdata {
struct dw_dma_slave dws;
};
#endif /* __INCLUDE_SOUND_ATMEL_ABDAC_H */
include/sound/atmel-ac97c.h 0 → 100644
View file @ 50201253
/*
* Driver for the Atmel AC97C controller
*
* Copyright (C) 2005-2009 Atmel Corporation
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef __INCLUDE_SOUND_ATMEL_AC97C_H
#define __INCLUDE_SOUND_ATMEL_AC97C_H
#include <linux/dw_dmac.h>
#define AC97C_CAPTURE 0x01
#define AC97C_PLAYBACK 0x02
#define AC97C_BOTH (AC97C_CAPTURE | AC97C_PLAYBACK)
/**
* struct atmel_ac97c_pdata - board specific AC97C configuration
* @rx_dws: DMA slave interface to use for sound capture.
* @tx_dws: DMA slave interface to use for sound playback.
* @reset_pin: GPIO pin wired to the reset input on the external AC97 codec,
* optional to use, set to -ENODEV if not in use. AC97 layer will
* try to do a software reset of the external codec anyway.
* @flags: Flags for which directions should be enabled.
*
* If the user do not want to use a DMA channel for playback or capture, i.e.
* only one feature is required on the board. The slave for playback or capture
* can be set to NULL. The AC97C driver will take use of this when setting up
* the sound streams.
*/
struct ac97c_platform_data {
struct dw_dma_slave rx_dws;
struct dw_dma_slave tx_dws;
unsigned int flags;
int reset_pin;
};
#endif /* __INCLUDE_SOUND_ATMEL_AC97C_H */
include/sound/control.h
View file @ 50201253
......@@ -171,6 +171,54 @@ int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
*/
struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
const unsigned int *tlv);
int snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave);
int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
unsigned int flags);
/* optional flags for slave */
#define SND_CTL_SLAVE_NEED_UPDATE (1 << 0)
/**
* snd_ctl_add_slave - Add a virtual slave control
* @master: vmaster element
* @slave: slave element to add
*
* Add a virtual slave control to the given master element created via
* snd_ctl_create_virtual_master() beforehand.
* Returns zero if successful or a negative error code.
*
* All slaves must be the same type (returning the same information
* via info callback). The fucntion doesn't check it, so it's your
* responsibility.
*
* Also, some additional limitations:
* at most two channels,
* logarithmic volume control (dB level) thus no linear volume,
* master can only attenuate the volume without gain
*/
static inline int
snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
{
return _snd_ctl_add_slave(master, slave, 0);
}
/**
* snd_ctl_add_slave_uncached - Add a virtual slave control
* @master: vmaster element
* @slave: slave element to add
*
* Add a virtual slave control to the given master.
* Unlike snd_ctl_add_slave(), the element added via this function
* is supposed to have volatile values, and get callback is called
* at each time quried from the master.
*
* When the control peeks the hardware values directly and the value
* can be changed by other means than the put callback of the element,
* this function should be used to keep the value always up-to-date.
*/
static inline int
snd_ctl_add_slave_uncached(struct snd_kcontrol *master,
struct snd_kcontrol *slave)
{
return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE);
}
#endif /* __SOUND_CONTROL_H */
include/sound/core.h
View file @ 50201253
......@@ -97,9 +97,9 @@ struct snd_device {
struct snd_monitor_file {
struct file *file;
struct snd_monitor_file *next;
const struct file_operations *disconnected_f_op;
struct list_head shutdown_list;
struct list_head shutdown_list; /* still need to shutdown */
struct list_head list; /* link of monitor files */
};
/* main structure for soundcard */
......@@ -134,7 +134,7 @@ struct snd_card {
struct snd_info_entry *proc_id; /* the card id */
struct proc_dir_entry *proc_root_link; /* number link to real id */
struct snd_monitor_file *files; /* all files associated to this card */
struct list_head files_list; /* all files associated to this card */
struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown
state */
spinlock_t files_lock; /* lock the files for this card */
......@@ -296,8 +296,20 @@ int snd_card_locked(int card);
extern int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int cmd);
#endif
int snd_card_create(int idx, const char *id,
struct module *module, int extra_size,
struct snd_card **card_ret);
static inline __deprecated
struct snd_card *snd_card_new(int idx, const char *id,
struct module *module, int extra_size);
struct module *module, int extra_size)
{
struct snd_card *card;
if (snd_card_create(idx, id, module, extra_size, &card) < 0)
return NULL;
return card;
}
int snd_card_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(struct snd_card *card);
......@@ -446,21 +458,33 @@ static inline int __snd_bug_on(int cond)
struct snd_pci_quirk {
unsigned short subvendor; /* PCI subvendor ID */
unsigned short subdevice; /* PCI subdevice ID */
unsigned short subdevice_mask; /* bitmask to match */
int value; /* value */
#ifdef CONFIG_SND_DEBUG_VERBOSE
const char *name; /* name of the device (optional) */
#endif
};
#define _SND_PCI_QUIRK_ID(vend,dev) \
.subvendor = (vend), .subdevice = (dev)
#define _SND_PCI_QUIRK_ID_MASK(vend, mask, dev) \
.subvendor = (vend), .subdevice = (dev), .subdevice_mask = (mask)
#define _SND_PCI_QUIRK_ID(vend, dev) \
_SND_PCI_QUIRK_ID_MASK(vend, 0xffff, dev)
#define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
#ifdef CONFIG_SND_DEBUG_VERBOSE
#define SND_PCI_QUIRK(vend,dev,xname,val) \
{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
#define SND_PCI_QUIRK_VENDOR(vend, xname, val) \
{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val), .name = (xname)}
#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val) \
{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), \
.value = (val), .name = (xname)}
#else
#define SND_PCI_QUIRK(vend,dev,xname,val) \
{_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
#define SND_PCI_QUIRK_MASK(vend, mask, dev, xname, val) \
{_SND_PCI_QUIRK_ID_MASK(vend, mask, dev), .value = (val)}
#define SND_PCI_QUIRK_VENDOR(vend, xname, val) \
{_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)}
#endif
const struct snd_pci_quirk *
......
include/sound/hwdep.h
View file @ 50201253
......@@ -27,18 +27,28 @@
struct snd_hwdep;
/* hwdep file ops; all ops can be NULL */
struct snd_hwdep_ops {
long long (*llseek) (struct snd_hwdep *hw, struct file * file, long long offset, int orig);
long (*read) (struct snd_hwdep *hw, char __user *buf, long count, loff_t *offset);
long (*write) (struct snd_hwdep *hw, const char __user *buf, long count, loff_t *offset);
int (*open) (struct snd_hwdep * hw, struct file * file);
int (*release) (struct snd_hwdep *hw, struct file * file);
unsigned int (*poll) (struct snd_hwdep *hw, struct file * file, poll_table * wait);
int (*ioctl) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
int (*ioctl_compat) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
int (*mmap) (struct snd_hwdep *hw, struct file * file, struct vm_area_struct * vma);
int (*dsp_status) (struct snd_hwdep *hw, struct snd_hwdep_dsp_status *status);
int (*dsp_load) (struct snd_hwdep *hw, struct snd_hwdep_dsp_image *image);
long long (*llseek)(struct snd_hwdep *hw, struct file *file,
long long offset, int orig);
long (*read)(struct snd_hwdep *hw, char __user *buf,
long count, loff_t *offset);
long (*write)(struct snd_hwdep *hw, const char __user *buf,
long count, loff_t *offset);
int (*open)(struct snd_hwdep *hw, struct file * file);
int (*release)(struct snd_hwdep *hw, struct file * file);
unsigned int (*poll)(struct snd_hwdep *hw, struct file *file,
poll_table *wait);
int (*ioctl)(struct snd_hwdep *hw, struct file *file,
unsigned int cmd, unsigned long arg);
int (*ioctl_compat)(struct snd_hwdep *hw, struct file *file,
unsigned int cmd, unsigned long arg);
int (*mmap)(struct snd_hwdep *hw, struct file *file,
struct vm_area_struct *vma);
int (*dsp_status)(struct snd_hwdep *hw,
struct snd_hwdep_dsp_status *status);
int (*dsp_load)(struct snd_hwdep *hw,
struct snd_hwdep_dsp_image *image);
};
struct snd_hwdep {
......@@ -61,9 +71,9 @@ struct snd_hwdep {
void (*private_free) (struct snd_hwdep *hwdep);
struct mutex open_mutex;
int used;
unsigned int dsp_loaded;
unsigned int exclusive: 1;
int used; /* reference counter */
unsigned int dsp_loaded; /* bit fields of loaded dsp indices */
unsigned int exclusive:1; /* exclusive access mode */
};
extern int snd_hwdep_new(struct snd_card *card, char *id, int device,
......
include/sound/jack.h
View file @ 50201253
......@@ -30,6 +30,9 @@ struct input_dev;
/**
* Jack types which can be reported. These values are used as a
* bitmask.
*
* Note that this must be kept in sync with the lookup table in
* sound/core/jack.c.
*/
enum snd_jack_types {
SND_JACK_HEADPHONE = 0x0001,
......@@ -37,6 +40,8 @@ enum snd_jack_types {
SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
SND_JACK_LINEOUT = 0x0004,
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
SND_JACK_VIDEOOUT = 0x0010,
SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
};
struct snd_jack {
......
include/sound/pcm.h
View file @ 50201253
......@@ -364,7 +364,6 @@ struct snd_pcm_substream {
/* -- timer section -- */
struct snd_timer *timer; /* timer */
unsigned timer_running: 1; /* time is running */
spinlock_t timer_lock;
/* -- next substream -- */
struct snd_pcm_substream *next;
/* -- linked substreams -- */
......@@ -451,7 +450,7 @@ struct snd_pcm_notify {
extern const struct file_operations snd_pcm_f_ops[2];
int snd_pcm_new(struct snd_card *card, char *id, int device,
int snd_pcm_new(struct snd_card *card, const char *id, int device,
int playback_count, int capture_count,
struct snd_pcm **rpcm);
int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count);
......
include/sound/pxa2xx-lib.h
View file @ 50201253
......@@ -42,4 +42,19 @@ extern int pxa2xx_ac97_hw_resume(void);
extern int pxa2xx_ac97_hw_probe(struct platform_device *dev);
extern void pxa2xx_ac97_hw_remove(struct platform_device *dev);
/* AC97 platform_data */
/**
* struct pxa2xx_ac97_platform_data - pxa ac97 platform data
* @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)
* a -1 value means no gpio will be used for reset
*
* Platform data should only be specified for pxa27x CPUs where a silicon bug
* prevents correct operation of the reset line. If not specified, the default
* behaviour is to consider gpio 113 as the AC97 reset line, which is the
* default on most boards.
*/
struct pxa2xx_ac97_platform_data {
int reset_gpio;
};
#endif
include/sound/rawmidi.h
View file @ 50201253
......@@ -42,7 +42,6 @@
#define SNDRV_RAWMIDI_LFLG_INPUT (1<<1)
#define SNDRV_RAWMIDI_LFLG_OPEN (3<<0)
#define SNDRV_RAWMIDI_LFLG_APPEND (1<<2)
#define SNDRV_RAWMIDI_LFLG_NOOPENLOCK (1<<3)
struct snd_rawmidi;
struct snd_rawmidi_substream;
......
include/sound/sb.h
View file @ 50201253
......@@ -249,6 +249,7 @@ struct snd_sb {
#define SB_ALS4000_3D_AUTO_MUTE 0x52
#define SB_ALS4000_ANALOG_BLOCK_CTRL 0x53
#define SB_ALS4000_3D_DELAYLINE_PATTERN 0x54
#define SB_ALS4000_CR3_CONFIGURATION 0xc3 /* bit 7 is Digital Loop Enable */
#define SB_ALS4000_QSOUND 0xdb
/* IRQ setting bitmap */
......@@ -330,7 +331,8 @@ enum {
SB_MIX_DOUBLE,
SB_MIX_INPUT_SW,
SB_MIX_CAPTURE_PRO,
SB_MIX_CAPTURE_DT019X
SB_MIX_CAPTURE_DT019X,
SB_MIX_MONO_CAPTURE_ALS4K
};
#define SB_MIXVAL_DOUBLE(left_reg, right_reg, left_shift, right_shift, mask) \
......
include/sound/sfnt_info.h
View file @ 50201253
......@@ -202,13 +202,11 @@ struct snd_emux_misc_mode {
int value2; /* reserved */
};
enum {
SNDRV_EMUX_IOCTL_VERSION = _IOR('H', 0x80, unsigned int),
SNDRV_EMUX_IOCTL_LOAD_PATCH = _IOWR('H', 0x81, struct soundfont_patch_info),
SNDRV_EMUX_IOCTL_RESET_SAMPLES = _IO('H', 0x82),
SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES = _IO('H', 0x83),
SNDRV_EMUX_IOCTL_MEM_AVAIL = _IOW('H', 0x84, int),
SNDRV_EMUX_IOCTL_MISC_MODE = _IOWR('H', 0x84, struct snd_emux_misc_mode),
};
#define SNDRV_EMUX_IOCTL_VERSION _IOR('H', 0x80, unsigned int)
#define SNDRV_EMUX_IOCTL_LOAD_PATCH _IOWR('H', 0x81, struct soundfont_patch_info)
#define SNDRV_EMUX_IOCTL_RESET_SAMPLES _IO('H', 0x82)
#define SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES _IO('H', 0x83)
#define SNDRV_EMUX_IOCTL_MEM_AVAIL _IOW('H', 0x84, int)
#define SNDRV_EMUX_IOCTL_MISC_MODE _IOWR('H', 0x84, struct snd_emux_misc_mode)
#endif /* __SOUND_SFNT_INFO_H */
include/sound/soc-dai.h
View file @ 50201253
......@@ -203,7 +203,7 @@ struct snd_soc_dai {
int (*resume)(struct snd_soc_dai *dai);
/* ops */
struct snd_soc_dai_ops ops;
struct snd_soc_dai_ops *ops;
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
......
include/sound/soc-dapm.h
View file @ 50201253
......@@ -76,6 +76,11 @@
wcontrols, wncontrols)\
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
#define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
wcontrols, wncontrols)\
{ .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \
.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
.num_kcontrols = wncontrols}
#define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
{ .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0}
......@@ -101,6 +106,11 @@
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
.event = wevent, .event_flags = wflags}
#define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
wcontrols, wncontrols, wevent, wflags) \
{ .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = wcontrols, \
.num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}
#define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \
{ .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \
......@@ -182,6 +192,12 @@
.get = snd_soc_dapm_get_value_enum_double, \
.put = snd_soc_dapm_put_value_enum_double, \
.private_value = (unsigned long)&xenum }
#define SOC_DAPM_PIN_SWITCH(xname) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
.info = snd_soc_dapm_info_pin_switch, \
.get = snd_soc_dapm_get_pin_switch, \
.put = snd_soc_dapm_put_pin_switch, \
.private_value = (unsigned long)xname }
/* dapm stream operations */
#define SND_SOC_DAPM_STREAM_NOP 0x0
......@@ -228,6 +244,12 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *uncontrol);
int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *uncontrol);
int snd_soc_dapm_new_control(struct snd_soc_codec *codec,
const struct snd_soc_dapm_widget *widget);
int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
......@@ -250,10 +272,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
int snd_soc_dapm_sys_add(struct device *dev);
/* dapm audio pin control and status */
int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);
int snd_soc_dapm_sync(struct snd_soc_codec *codec);
/* dapm widget types */
......@@ -263,6 +285,7 @@ enum snd_soc_dapm_type {
snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */
snd_soc_dapm_value_mux, /* selects 1 analog signal from many inputs */
snd_soc_dapm_mixer, /* mixes several analog signals together */
snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */
snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */
snd_soc_dapm_adc, /* analog to digital converter */
snd_soc_dapm_dac, /* digital to analog converter */
......
include/sound/soc.h
View file @ 50201253
......@@ -16,6 +16,8 @@
#include <linux/platform_device.h>
#include <linux/types.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/control.h>
......@@ -154,6 +156,8 @@ enum snd_soc_bias_level {
SND_SOC_BIAS_OFF,
};
struct snd_jack;
struct snd_soc_card;
struct snd_soc_device;
struct snd_soc_pcm_stream;
struct snd_soc_ops;
......@@ -164,6 +168,11 @@ struct snd_soc_platform;
struct snd_soc_codec;
struct soc_enum;
struct snd_soc_ac97_ops;
struct snd_soc_jack;
struct snd_soc_jack_pin;
#ifdef CONFIG_GPIOLIB
struct snd_soc_jack_gpio;
#endif
typedef int (*hw_write_t)(void *,const char* ,int);
typedef int (*hw_read_t)(void *,char* ,int);
......@@ -184,6 +193,19 @@ int snd_soc_init_card(struct snd_soc_device *socdev);
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
const struct snd_pcm_hardware *hw);
/* Jack reporting */
int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
struct snd_soc_jack *jack);
void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_pin *pins);
#ifdef CONFIG_GPIOLIB
int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_gpio *gpios);
void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
struct snd_soc_jack_gpio *gpios);
#endif
/* codec IO */
#define snd_soc_read(codec, reg) codec->read(codec, reg)
#define snd_soc_write(codec, reg, value) codec->write(codec, reg, value)
......@@ -203,6 +225,8 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec);
*/
struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
void *data, char *long_name);
int snd_soc_add_controls(struct snd_soc_codec *codec,
const struct snd_kcontrol_new *controls, int num_controls);
int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
......@@ -237,6 +261,48 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
/**
* struct snd_soc_jack_pin - Describes a pin to update based on jack detection
*
* @pin: name of the pin to update
* @mask: bits to check for in reported jack status
* @invert: if non-zero then pin is enabled when status is not reported
*/
struct snd_soc_jack_pin {
struct list_head list;
const char *pin;
int mask;
bool invert;
};
/**
* struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
*
* @gpio: gpio number
* @name: gpio name
* @report: value to report when jack detected
* @invert: report presence in low state
* @debouce_time: debouce time in ms
*/
#ifdef CONFIG_GPIOLIB
struct snd_soc_jack_gpio {
unsigned int gpio;
const char *name;
int report;
int invert;
int debounce_time;
struct snd_soc_jack *jack;
struct work_struct work;
};
#endif
struct snd_soc_jack {
struct snd_jack *jack;
struct snd_soc_card *card;
struct list_head pins;
int status;
};
/* SoC PCM stream information */
struct snd_soc_pcm_stream {
char *stream_name;
......@@ -384,6 +450,8 @@ struct snd_soc_card {
struct snd_soc_device *socdev;
struct snd_soc_codec *codec;
struct snd_soc_platform *platform;
struct delayed_work delayed_work;
struct work_struct deferred_resume_work;
......@@ -393,7 +461,6 @@ struct snd_soc_card {
struct snd_soc_device {
struct device *dev;
struct snd_soc_card *card;
struct snd_soc_codec *codec;
struct snd_soc_codec_device *codec_dev;
void *codec_data;
};
......
include/sound/uda1341.h deleted 100644 → 0
View file @ 562f477a
/*
* linux/include/linux/l3/uda1341.h
*
* Philips UDA1341 mixer device driver for ALSA
*
* Copyright (c) 2002 Tomas Kasparek <tomas.kasparek@seznam.cz>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License.
*
* History:
*
* 2002-03-13 Tomas Kasparek Initial release - based on uda1341.h from OSS
* 2002-03-30 Tomas Kasparek Proc filesystem support, complete mixer and DSP
* features support
*/
#define UDA1341_ALSA_NAME "snd-uda1341"
/*
* Default rate set after inicialization
*/
#define AUDIO_RATE_DEFAULT 44100
/*
* UDA1341 L3 address and command types
*/
#define UDA1341_L3ADDR 5
#define UDA1341_DATA0 (UDA1341_L3ADDR << 2 | 0)
#define UDA1341_DATA1 (UDA1341_L3ADDR << 2 | 1)
#define UDA1341_STATUS (UDA1341_L3ADDR << 2 | 2)
enum uda1341_onoff {
OFF=0,
ON,
};
enum uda1341_format {
I2S=0,
LSB16,
LSB18,
LSB20,
MSB,
LSB16MSB,
LSB18MSB,
LSB20MSB,
};
enum uda1341_fs {
F512=0,
F384,
F256,
Funused,
};
enum uda1341_peak {
BEFORE=0,
AFTER,
};
enum uda1341_filter {
FLAT=0,
MIN,
MIN2,
MAX,
};
enum uda1341_mixer {
DOUBLE,
LINE,
MIC,
MIXER,
};
enum uda1341_deemp {
NONE,
D32,
D44,
D48,
};
enum uda1341_config {
CMD_READ_REG = 0,
CMD_RESET,
CMD_FS,
CMD_FORMAT,
CMD_OGAIN,
CMD_IGAIN,
CMD_DAC,
CMD_ADC,
CMD_VOLUME,
CMD_BASS,
CMD_TREBBLE,
CMD_PEAK,
CMD_DEEMP,
CMD_MUTE,
CMD_FILTER,
CMD_CH1,
CMD_CH2,
CMD_MIC,
CMD_MIXER,
CMD_AGC,
CMD_IG,
CMD_AGC_TIME,
CMD_AGC_LEVEL,
#ifdef CONFIG_PM
CMD_SUSPEND,
CMD_RESUME,
#endif
CMD_LAST,
};
enum write_through {
//used in update_bits (write_cfg) to avoid l3_write - just update local copy of regs.
REGS_ONLY=0,
//update local regs and write value to uda1341 - do l3_write
FLUSH,
};
int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client **clnt);
/*
* Local variables:
* indent-tabs-mode: t
* End:
*/
include/sound/version.h
View file @ 50201253
/* include/version.h */
#define CONFIG_SND_VERSION "1.0.18a"
#define CONFIG_SND_VERSION "1.0.19"
#define CONFIG_SND_DATE ""
include/sound/wss.h
View file @ 50201253
......@@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card,
unsigned short hardware,
unsigned short hwshare,
struct snd_wss **rchip);
int snd_wss_free(struct snd_wss *chip);
int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
int snd_wss_mixer(struct snd_wss *chip);
......
sound/Kconfig
View file @ 50201253
......@@ -60,6 +60,8 @@ source "sound/aoa/Kconfig"
source "sound/arm/Kconfig"
source "sound/atmel/Kconfig"
source "sound/spi/Kconfig"
source "sound/mips/Kconfig"
......
sound/Makefile
View file @ 50201253
......@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
obj-$(CONFIG_SOUND_PRIME) += oss/
obj-$(CONFIG_DMASOUND) += oss/
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
sparc/ spi/ parisc/ pcmcia/ mips/ soc/
sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/
obj-$(CONFIG_SND_AOA) += aoa/
# This one must be compilable even if sound is configured out
......
sound/aoa/aoa-gpio.h
View file @ 50201253
......@@ -34,10 +34,12 @@ struct gpio_methods {
void (*set_headphone)(struct gpio_runtime *rt, int on);
void (*set_speakers)(struct gpio_runtime *rt, int on);
void (*set_lineout)(struct gpio_runtime *rt, int on);
void (*set_master)(struct gpio_runtime *rt, int on);
int (*get_headphone)(struct gpio_runtime *rt);
int (*get_speakers)(struct gpio_runtime *rt);
int (*get_lineout)(struct gpio_runtime *rt);
int (*get_master)(struct gpio_runtime *rt);
void (*set_hw_reset)(struct gpio_runtime *rt, int on);
......
sound/aoa/core/alsa.c
View file @ 50201253
......@@ -23,9 +23,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
/* cannot be EEXIST due to usage in aoa_fabric_register */
return -EBUSY;
alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));
if (!alsa_card)
return -ENOMEM;
err = snd_card_create(index, name, mod, sizeof(struct aoa_card),
&alsa_card);
if (err < 0)
return err;
aoa_card = alsa_card->private_data;
aoa_card->alsa_card = alsa_card;
alsa_card->dev = dev;
......
sound/aoa/core/gpio-feature.c
View file @ 50201253
......@@ -14,7 +14,7 @@
#include <linux/interrupt.h>
#include "../aoa.h"
/* TODO: these are 20 global variables
/* TODO: these are lots of global variables
* that aren't used on most machines...
* Move them into a dynamically allocated
* structure and use that.
......@@ -23,6 +23,7 @@
/* these are the GPIO numbers (register addresses as offsets into
* the GPIO space) */
static int headphone_mute_gpio;
static int master_mute_gpio;
static int amp_mute_gpio;
static int lineout_mute_gpio;
static int hw_reset_gpio;
......@@ -32,6 +33,7 @@ static int linein_detect_gpio;
/* see the SWITCH_GPIO macro */
static int headphone_mute_gpio_activestate;
static int master_mute_gpio_activestate;
static int amp_mute_gpio_activestate;
static int lineout_mute_gpio_activestate;
static int hw_reset_gpio_activestate;
......@@ -156,6 +158,7 @@ static int ftr_gpio_get_##name(struct gpio_runtime *rt) \
FTR_GPIO(headphone, 0);
FTR_GPIO(amp, 1);
FTR_GPIO(lineout, 2);
FTR_GPIO(master, 3);
static void ftr_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
{
......@@ -172,6 +175,8 @@ static void ftr_gpio_set_hw_reset(struct gpio_runtime *rt, int on)
hw_reset_gpio, v);
}
static struct gpio_methods methods;
static void ftr_gpio_all_amps_off(struct gpio_runtime *rt)
{
int saved;
......@@ -181,6 +186,8 @@ static void ftr_gpio_all_amps_off(struct gpio_runtime *rt)
ftr_gpio_set_headphone(rt, 0);
ftr_gpio_set_amp(rt, 0);
ftr_gpio_set_lineout(rt, 0);
if (methods.set_master)
ftr_gpio_set_master(rt, 0);
rt->implementation_private = saved;
}
......@@ -193,6 +200,8 @@ static void ftr_gpio_all_amps_restore(struct gpio_runtime *rt)
ftr_gpio_set_headphone(rt, (s>>0)&1);
ftr_gpio_set_amp(rt, (s>>1)&1);
ftr_gpio_set_lineout(rt, (s>>2)&1);
if (methods.set_master)
ftr_gpio_set_master(rt, (s>>3)&1);
}
static void ftr_handle_notify(struct work_struct *work)
......@@ -231,6 +240,12 @@ static void ftr_gpio_init(struct gpio_runtime *rt)
get_gpio("hw-reset", "audio-hw-reset",
&hw_reset_gpio,
&hw_reset_gpio_activestate);
if (get_gpio("master-mute", NULL,
&master_mute_gpio,
&master_mute_gpio_activestate)) {
methods.set_master = ftr_gpio_set_master;
methods.get_master = ftr_gpio_get_master;
}
headphone_detect_node = get_gpio("headphone-detect", NULL,
&headphone_detect_gpio,
......
sound/aoa/fabrics/layout.c
View file @ 50201253
/*
* Apple Onboard Audio driver -- layout fabric
* Apple Onboard Audio driver -- layout/machine id fabric
*
* Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2006-2008 Johannes Berg <johannes@sipsolutions.net>
*
* GPL v2, can be found in COPYING.
*
*
* This fabric module looks for sound codecs
* based on the layout-id property in the device tree.
*
* This fabric module looks for sound codecs based on the
* layout-id or device-id property in the device tree.
*/
#include <asm/prom.h>
#include <linux/list.h>
#include <linux/module.h>
......@@ -63,7 +61,7 @@ struct codec_connect_info {
#define LAYOUT_FLAG_COMBO_LINEOUT_SPDIF (1<<0)
struct layout {
unsigned int layout_id;
unsigned int layout_id, device_id;
struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
int flags;
......@@ -111,6 +109,10 @@ MODULE_ALIAS("sound-layout-96");
MODULE_ALIAS("sound-layout-98");
MODULE_ALIAS("sound-layout-100");
MODULE_ALIAS("aoa-device-id-14");
MODULE_ALIAS("aoa-device-id-22");
MODULE_ALIAS("aoa-device-id-35");
/* onyx with all but microphone connected */
static struct codec_connection onyx_connections_nomic[] = {
{
......@@ -518,6 +520,27 @@ static struct layout layouts[] = {
.connections = onyx_connections_noheadphones,
},
},
/* PowerMac3,4 */
{ .device_id = 14,
.codecs[0] = {
.name = "tas",
.connections = tas_connections_noline,
},
},
/* PowerMac3,6 */
{ .device_id = 22,
.codecs[0] = {
.name = "tas",
.connections = tas_connections_all,
},
},
/* PowerBook5,2 */
{ .device_id = 35,
.codecs[0] = {
.name = "tas",
.connections = tas_connections_all,
},
},
{}
};
......@@ -526,7 +549,7 @@ static struct layout *find_layout_by_id(unsigned int id)
struct layout *l;
l = layouts;
while (l->layout_id) {
while (l->codecs[0].name) {
if (l->layout_id == id)
return l;
l++;
......@@ -534,6 +557,19 @@ static struct layout *find_layout_by_id(unsigned int id)
return NULL;
}
static struct layout *find_layout_by_device(unsigned int id)
{
struct layout *l;
l = layouts;
while (l->codecs[0].name) {
if (l->device_id == id)
return l;
l++;
}
return NULL;
}
static void use_layout(struct layout *l)
{
int i;
......@@ -564,6 +600,7 @@ struct layout_dev {
struct snd_kcontrol *headphone_ctrl;
struct snd_kcontrol *lineout_ctrl;
struct snd_kcontrol *speaker_ctrl;
struct snd_kcontrol *master_ctrl;
struct snd_kcontrol *headphone_detected_ctrl;
struct snd_kcontrol *lineout_detected_ctrl;
......@@ -615,6 +652,7 @@ static struct snd_kcontrol_new n##_ctl = { \
AMP_CONTROL(headphone, "Headphone Switch");
AMP_CONTROL(speakers, "Speakers Switch");
AMP_CONTROL(lineout, "Line-Out Switch");
AMP_CONTROL(master, "Master Switch");
static int detect_choice_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
......@@ -855,6 +893,11 @@ static void layout_attached_codec(struct aoa_codec *codec)
lineout = codec->gpio->methods->get_detect(codec->gpio,
AOA_NOTIFY_LINE_OUT);
if (codec->gpio->methods->set_master) {
ctl = snd_ctl_new1(&master_ctl, codec->gpio);
ldev->master_ctrl = ctl;
aoa_snd_ctl_add(ctl);
}
while (cc->connected) {
if (cc->connected & CC_SPEAKERS) {
if (headphones <= 0 && lineout <= 0)
......@@ -938,8 +981,8 @@ static struct aoa_fabric layout_fabric = {
static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
{
struct device_node *sound = NULL;
const unsigned int *layout_id;
struct layout *layout;
const unsigned int *id;
struct layout *layout = NULL;
struct layout_dev *ldev = NULL;
int err;
......@@ -952,15 +995,18 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
break;
}
if (!sound) return -ENODEV;
if (!sound)
return -ENODEV;
layout_id = of_get_property(sound, "layout-id", NULL);
if (!layout_id)
goto outnodev;
printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
*layout_id);
id = of_get_property(sound, "layout-id", NULL);
if (id) {
layout = find_layout_by_id(*id);
} else {
id = of_get_property(sound, "device-id", NULL);
if (id)
layout = find_layout_by_device(*id);
}
layout = find_layout_by_id(*layout_id);
if (!layout) {
printk(KERN_ERR "snd-aoa-fabric-layout: unknown layout\n");
goto outnodev;
......@@ -976,6 +1022,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
ldev->layout = layout;
ldev->gpio.node = sound->parent;
switch (layout->layout_id) {
case 0: /* anything with device_id, not layout_id */
case 41: /* that unknown machine no one seems to have */
case 51: /* PowerBook5,4 */
case 58: /* Mac Mini */
......
sound/aoa/soundbus/i2sbus/core.c
View file @ 50201253
/*
* i2sbus driver
*
* Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2006-2008 Johannes Berg <johannes@sipsolutions.net>
*
* GPL v2, can be found in COPYING.
*/
......@@ -186,13 +186,25 @@ static int i2sbus_add_dev(struct macio_dev *macio,
}
}
if (i == 1) {
const u32 *layout_id =
of_get_property(sound, "layout-id", NULL);
if (layout_id) {
layout = *layout_id;
const u32 *id = of_get_property(sound, "layout-id", NULL);
if (id) {
layout = *id;
snprintf(dev->sound.modalias, 32,
"sound-layout-%d", layout);
ok = 1;
} else {
id = of_get_property(sound, "device-id", NULL);
/*
* We probably cannot handle all device-id machines,
* so restrict to those we do handle for now.
*/
if (id && (*id == 22 || *id == 14 || *id == 35)) {
snprintf(dev->sound.modalias, 32,
"aoa-device-id-%d", *id);
ok = 1;
layout = -1;
}
}
}
/* for the time being, until we can handle non-layout-id
......
sound/arm/Kconfig
View file @ 50201253
......@@ -11,17 +11,6 @@ menuconfig SND_ARM
if SND_ARM
config SND_SA11XX_UDA1341
tristate "SA11xx UDA1341TS driver (iPaq H3600)"
depends on ARCH_SA1100 && L3
select SND_PCM
help
Say Y here if you have a Compaq iPaq H3x00 handheld computer
and want to use its Philips UDA 1341 audio chip.
To compile this driver as a module, choose M here: the module
will be called snd-sa11xx-uda1341.
config SND_ARMAACI
tristate "ARM PrimeCell PL041 AC Link support"
depends on ARM_AMBA
......
sound/arm/Makefile
View file @ 50201253
......@@ -2,9 +2,6 @@
# Makefile for ALSA
#
obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o
snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o
snd-aaci-objs := aaci.o devdma.o
......
sound/arm/aaci.c
View file @ 50201253
......@@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
{
struct aaci *aaci;
struct snd_card *card;
int err;
card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, sizeof(struct aaci));
if (card == NULL)
err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, sizeof(struct aaci), &card);
if (err < 0)
return NULL;
card->private_free = aaci_free_card;
......
sound/arm/pxa2xx-ac97-lib.c
View file @ 50201253
......@@ -31,6 +31,7 @@ static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
static volatile long gsr_bits;
static struct clk *ac97_clk;
static struct clk *ac97conf_clk;
static int reset_gpio;
/*
* Beware PXA27x bugs:
......@@ -42,6 +43,45 @@ static struct clk *ac97conf_clk;
* 1 jiffy timeout if interrupt never comes).
*/
enum {
RESETGPIO_FORCE_HIGH,
RESETGPIO_FORCE_LOW,
RESETGPIO_NORMAL_ALTFUNC
};
/**
* set_resetgpio_mode - computes and sets the AC97_RESET gpio mode on PXA
* @mode: chosen action
*
* As the PXA27x CPUs suffer from a AC97 bug, a manual control of the reset line
* must be done to insure proper work of AC97 reset line. This function
* computes the correct gpio_mode for further use by reset functions, and
* applied the change through pxa_gpio_mode.
*/
static void set_resetgpio_mode(int resetgpio_action)
{
int mode = 0;
if (reset_gpio)
switch (resetgpio_action) {
case RESETGPIO_NORMAL_ALTFUNC:
if (reset_gpio == 113)
mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;
if (reset_gpio == 95)
mode = 95 | GPIO_ALT_FN_1_OUT;
break;
case RESETGPIO_FORCE_LOW:
mode = reset_gpio | GPIO_OUT | GPIO_DFLT_LOW;
break;
case RESETGPIO_FORCE_HIGH:
mode = reset_gpio | GPIO_OUT | GPIO_DFLT_HIGH;
break;
};
if (mode)
pxa_gpio_mode(mode);
}
unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{
unsigned short val = -1;
......@@ -137,10 +177,10 @@ static inline void pxa_ac97_warm_pxa27x(void)
/* warm reset broken on Bulverde,
so manually keep AC97 reset high */
pxa_gpio_mode(113 | GPIO_OUT | GPIO_DFLT_HIGH);
set_resetgpio_mode(RESETGPIO_FORCE_HIGH);
udelay(10);
GCR |= GCR_WARM_RST;
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
udelay(500);
}
......@@ -308,8 +348,8 @@ int pxa2xx_ac97_hw_resume(void)
pxa_gpio_mode(GPIO29_SDATA_IN_AC97_MD);
}
if (cpu_is_pxa27x()) {
/* Use GPIO 113 as AC97 Reset on Bulverde */
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
/* Use GPIO 113 or 95 as AC97 Reset on Bulverde */
set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
}
clk_enable(ac97_clk);
return 0;
......@@ -320,6 +360,27 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
{
int ret;
struct pxa2xx_ac97_platform_data *pdata = dev->dev.platform_data;
if (pdata) {
switch (pdata->reset_gpio) {
case 95:
case 113:
reset_gpio = pdata->reset_gpio;
break;
case 0:
reset_gpio = 113;
break;
case -1:
break;
default:
dev_err(&dev->dev, "Invalid reset GPIO %d\n",
pdata->reset_gpio);
}
} else {
if (cpu_is_pxa27x())
reset_gpio = 113;
}
if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
......@@ -330,7 +391,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
if (cpu_is_pxa27x()) {
/* Use GPIO 113 as AC97 Reset on Bulverde */
pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
set_resetgpio_mode(RESETGPIO_NORMAL_ALTFUNC);
ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
if (IS_ERR(ac97conf_clk)) {
ret = PTR_ERR(ac97conf_clk);
......
sound/arm/pxa2xx-ac97.c
View file @ 50201253
......@@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
struct snd_ac97_template ac97_template;
int ret;
ret = -ENOMEM;
card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, 0);
if (!card)
ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, 0, &card);
if (ret < 0)
goto err;
card->dev = &dev->dev;
......
sound/arm/sa11xx-uda1341.c deleted 100644 → 0
View file @ 562f477a
This diff is collapsed.
sound/atmel/Kconfig 0 → 100644
View file @ 50201253
menu "Atmel devices (AVR32 and AT91)"
depends on AVR32 || ARCH_AT91
config SND_ATMEL_ABDAC
tristate "Atmel Audio Bitstream DAC (ABDAC) driver"
select SND_PCM
depends on DW_DMAC && AVR32
help
ALSA sound driver for the Atmel Audio Bitstream DAC (ABDAC).
config SND_ATMEL_AC97C
tristate "Atmel AC97 Controller (AC97C) driver"
select SND_PCM
select SND_AC97_CODEC
depends on DW_DMAC && AVR32
help
ALSA sound driver for the Atmel AC97 controller.
endmenu
sound/atmel/Makefile 0 → 100644
View file @ 50201253
snd-atmel-abdac-objs := abdac.o
snd-atmel-ac97c-objs := ac97c.o
obj-$(CONFIG_SND_ATMEL_ABDAC) += snd-atmel-abdac.o
obj-$(CONFIG_SND_ATMEL_AC97C) += snd-atmel-ac97c.o
sound/atmel/abdac.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/atmel/ac97c.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/atmel/ac97c.h 0 → 100644
View file @ 50201253
/*
* Register definitions for the Atmel AC97C controller
*
* Copyright (C) 2005-2009 Atmel Corporation
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef __SOUND_ATMEL_AC97C_H
#define __SOUND_ATMEL_AC97C_H
#define AC97C_MR 0x08
#define AC97C_ICA 0x10
#define AC97C_OCA 0x14
#define AC97C_CARHR 0x20
#define AC97C_CATHR 0x24
#define AC97C_CASR 0x28
#define AC97C_CAMR 0x2c
#define AC97C_CBRHR 0x30
#define AC97C_CBTHR 0x34
#define AC97C_CBSR 0x38
#define AC97C_CBMR 0x3c
#define AC97C_CORHR 0x40
#define AC97C_COTHR 0x44
#define AC97C_COSR 0x48
#define AC97C_COMR 0x4c
#define AC97C_SR 0x50
#define AC97C_IER 0x54
#define AC97C_IDR 0x58
#define AC97C_IMR 0x5c
#define AC97C_VERSION 0xfc
#define AC97C_CATPR PDC_TPR
#define AC97C_CATCR PDC_TCR
#define AC97C_CATNPR PDC_TNPR
#define AC97C_CATNCR PDC_TNCR
#define AC97C_CARPR PDC_RPR
#define AC97C_CARCR PDC_RCR
#define AC97C_CARNPR PDC_RNPR
#define AC97C_CARNCR PDC_RNCR
#define AC97C_PTCR PDC_PTCR
#define AC97C_MR_ENA (1 << 0)
#define AC97C_MR_WRST (1 << 1)
#define AC97C_MR_VRA (1 << 2)
#define AC97C_CSR_TXRDY (1 << 0)
#define AC97C_CSR_UNRUN (1 << 2)
#define AC97C_CSR_RXRDY (1 << 4)
#define AC97C_CSR_ENDTX (1 << 10)
#define AC97C_CSR_ENDRX (1 << 14)
#define AC97C_CMR_SIZE_20 (0 << 16)
#define AC97C_CMR_SIZE_18 (1 << 16)
#define AC97C_CMR_SIZE_16 (2 << 16)
#define AC97C_CMR_SIZE_10 (3 << 16)
#define AC97C_CMR_CEM_LITTLE (1 << 18)
#define AC97C_CMR_CEM_BIG (0 << 18)
#define AC97C_CMR_CENA (1 << 21)
#define AC97C_CMR_DMAEN (1 << 22)
#define AC97C_SR_CAEVT (1 << 3)
#define AC97C_CH_ASSIGN(slot, channel) \
(AC97C_CHANNEL_##channel << (3 * (AC97_SLOT_##slot - 3)))
#define AC97C_CHANNEL_NONE 0x0
#define AC97C_CHANNEL_A 0x1
#define AC97C_CHANNEL_B 0x2
#endif /* __SOUND_ATMEL_AC97C_H */
sound/core/hwdep.c
View file @ 50201253
......@@ -99,9 +99,6 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
if (hw == NULL)
return -ENODEV;
if (!hw->ops.open)
return -ENXIO;
if (!try_module_get(hw->card->module))
return -EFAULT;
......@@ -113,6 +110,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
err = -EBUSY;
break;
}
if (!hw->ops.open) {
err = 0;
break;
}
err = hw->ops.open(hw, file);
if (err >= 0)
break;
......@@ -151,7 +152,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
static int snd_hwdep_release(struct inode *inode, struct file * file)
{
int err = -ENXIO;
int err = 0;
struct snd_hwdep *hw = file->private_data;
struct module *mod = hw->card->module;
......
sound/core/init.c
View file @ 50201253
......@@ -121,31 +121,44 @@ static inline int init_info_for_card(struct snd_card *card)
#endif
/**
* snd_card_new - create and initialize a soundcard structure
* snd_card_create - create and initialize a soundcard structure
* @idx: card index (address) [0 ... (SNDRV_CARDS-1)]
* @xid: card identification (ASCII string)
* @module: top level module for locking
* @extra_size: allocate this extra size after the main soundcard structure
* @card_ret: the pointer to store the created card instance
*
* Creates and initializes a soundcard structure.
*
* Returns kmallocated snd_card structure. Creates the ALSA control interface
* (which is blocked until snd_card_register function is called).
* The function allocates snd_card instance via kzalloc with the given
* space for the driver to use freely. The allocated struct is stored
* in the given card_ret pointer.
*
* Returns zero if successful or a negative error code.
*/
struct snd_card *snd_card_new(int idx, const char *xid,
struct module *module, int extra_size)
int snd_card_create(int idx, const char *xid,
struct module *module, int extra_size,
struct snd_card **card_ret)
{
struct snd_card *card;
int err, idx2;
if (snd_BUG_ON(!card_ret))
return -EINVAL;
*card_ret = NULL;
if (extra_size < 0)
extra_size = 0;
card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
if (card == NULL)
return NULL;
if (!card)
return -ENOMEM;
if (xid) {
if (!snd_info_check_reserved_words(xid))
if (!snd_info_check_reserved_words(xid)) {
snd_printk(KERN_ERR
"given id string '%s' is reserved.\n", xid);
err = -EBUSY;
goto __error;
}
strlcpy(card->id, xid, sizeof(card->id));
}
err = 0;
......@@ -195,6 +208,7 @@ struct snd_card *snd_card_new(int idx, const char *xid,
INIT_LIST_HEAD(&card->controls);
INIT_LIST_HEAD(&card->ctl_files);
spin_lock_init(&card->files_lock);
INIT_LIST_HEAD(&card->files_list);
init_waitqueue_head(&card->shutdown_sleep);
#ifdef CONFIG_PM
mutex_init(&card->power_lock);
......@@ -202,26 +216,28 @@ struct snd_card *snd_card_new(int idx, const char *xid,
#endif
/* the control interface cannot be accessed from the user space until */
/* snd_cards_bitmask and snd_cards are set with snd_card_register */
if ((err = snd_ctl_create(card)) < 0) {
snd_printd("unable to register control minors\n");
err = snd_ctl_create(card);
if (err < 0) {
snd_printk(KERN_ERR "unable to register control minors\n");
goto __error;
}
if ((err = snd_info_card_create(card)) < 0) {
snd_printd("unable to create card info\n");
err = snd_info_card_create(card);
if (err < 0) {
snd_printk(KERN_ERR "unable to create card info\n");
goto __error_ctl;
}
if (extra_size > 0)
card->private_data = (char *)card + sizeof(struct snd_card);
return card;
*card_ret = card;
return 0;
__error_ctl:
snd_device_free_all(card, SNDRV_DEV_CMD_PRE);
__error:
kfree(card);
return NULL;
return err;
}
EXPORT_SYMBOL(snd_card_new);
EXPORT_SYMBOL(snd_card_create);
/* return non-zero if a card is already locked */
int snd_card_locked(int card)
......@@ -259,6 +275,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)
list_for_each_entry(_df, &shutdown_files, shutdown_list) {
if (_df->file == file) {
df = _df;
list_del_init(&df->shutdown_list);
break;
}
}
......@@ -347,8 +364,7 @@ int snd_card_disconnect(struct snd_card *card)
/* phase 2: replace file->f_op with special dummy operations */
spin_lock(&card->files_lock);
mfile = card->files;
while (mfile) {
list_for_each_entry(mfile, &card->files_list, list) {
file = mfile->file;
/* it's critical part, use endless loop */
......@@ -361,8 +377,6 @@ int snd_card_disconnect(struct snd_card *card)
mfile->file->f_op = &snd_shutdown_f_ops;
fops_get(mfile->file->f_op);
mfile = mfile->next;
}
spin_unlock(&card->files_lock);
......@@ -442,7 +456,7 @@ int snd_card_free_when_closed(struct snd_card *card)
return ret;
spin_lock(&card->files_lock);
if (card->files == NULL)
if (list_empty(&card->files_list))
free_now = 1;
else
card->free_on_last_close = 1;
......@@ -462,7 +476,7 @@ int snd_card_free(struct snd_card *card)
return ret;
/* wait, until all devices are ready for the free operation */
wait_event(card->shutdown_sleep, card->files == NULL);
wait_event(card->shutdown_sleep, list_empty(&card->files_list));
snd_card_do_free(card);
return 0;
}
......@@ -809,15 +823,13 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
return -ENOMEM;
mfile->file = file;
mfile->disconnected_f_op = NULL;
mfile->next = NULL;
spin_lock(&card->files_lock);
if (card->shutdown) {
spin_unlock(&card->files_lock);
kfree(mfile);
return -ENODEV;
}
mfile->next = card->files;
card->files = mfile;
list_add(&mfile->list, &card->files_list);
spin_unlock(&card->files_lock);
return 0;
}
......@@ -839,29 +851,20 @@ EXPORT_SYMBOL(snd_card_file_add);
*/
int snd_card_file_remove(struct snd_card *card, struct file *file)
{
struct snd_monitor_file *mfile, *pfile = NULL;
struct snd_monitor_file *mfile, *found = NULL;
int last_close = 0;
spin_lock(&card->files_lock);
mfile = card->files;
while (mfile) {
list_for_each_entry(mfile, &card->files_list, list) {
if (mfile->file == file) {
if (pfile)
pfile->next = mfile->next;
else
card->files = mfile->next;
list_del(&mfile->list);
if (mfile->disconnected_f_op)
fops_put(mfile->disconnected_f_op);
found = mfile;
break;
}
pfile = mfile;
mfile = mfile->next;
}
if (mfile && mfile->disconnected_f_op) {
fops_put(mfile->disconnected_f_op);
spin_lock(&shutdown_lock);
list_del(&mfile->shutdown_list);
spin_unlock(&shutdown_lock);
}
if (card->files == NULL)
if (list_empty(&card->files_list))
last_close = 1;
spin_unlock(&card->files_lock);
if (last_close) {
......@@ -869,11 +872,11 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
if (card->free_on_last_close)
snd_card_do_free(card);
}
if (!mfile) {
if (!found) {
snd_printk(KERN_ERR "ALSA card file remove problem (%p)\n", file);
return -ENOENT;
}
kfree(mfile);
kfree(found);
return 0;
}
......
sound/core/jack.c
View file @ 50201253
This diff is collapsed.
sound/core/misc.c
View file @ 50201253
......@@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)
{
const struct snd_pci_quirk *q;
for (q = list; q->subvendor; q++)
if (q->subvendor == pci->subsystem_vendor &&
(!q->subdevice || q->subdevice == pci->subsystem_device))
for (q = list; q->subvendor; q++) {
if (q->subvendor != pci->subsystem_vendor)
continue;
if (!q->subdevice ||
(pci->subsystem_device & q->subdevice_mask) == q->subdevice)
return q;
}
return NULL;
}
EXPORT_SYMBOL(snd_pci_quirk_lookup);
#endif
sound/core/oss/pcm_oss.c
View file @ 50201253
This diff is collapsed.
sound/core/oss/pcm_plugin.h
View file @ 50201253
......@@ -176,9 +176,9 @@ static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_
#endif
#ifdef PLUGIN_DEBUG
#define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)
#define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args)
#else
#define pdprintf( fmt, args... )
#define pdprintf(fmt, args...)
#endif
#endif /* __PCM_PLUGIN_H */
sound/core/pcm.c
View file @ 50201253
......@@ -667,7 +667,6 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
spin_lock_init(&substream->self_group.lock);
INIT_LIST_HEAD(&substream->self_group.substreams);
list_add_tail(&substream->link_list, &substream->self_group.substreams);
spin_lock_init(&substream->timer_lock);
atomic_set(&substream->mmap_count, 0);
prev = substream;
}
......@@ -692,7 +691,7 @@ EXPORT_SYMBOL(snd_pcm_new_stream);
*
* Returns zero if successful, or a negative error code on failure.
*/
int snd_pcm_new(struct snd_card *card, char *id, int device,
int snd_pcm_new(struct snd_card *card, const char *id, int device,
int playback_count, int capture_count,
struct snd_pcm ** rpcm)
{
......
sound/core/pcm_lib.c
View file @ 50201253
This diff is collapsed.
sound/core/pcm_native.c
View file @ 50201253
This diff is collapsed.
sound/core/pcm_timer.c
View file @ 50201253
This diff is collapsed.
sound/core/rawmidi.c
View file @ 50201253
This diff is collapsed.
sound/core/seq/oss/seq_oss_device.h
View file @ 50201253
......@@ -181,7 +181,7 @@ char *enabled_str(int bool);
/* for debug */
#ifdef SNDRV_SEQ_OSS_DEBUG
extern int seq_oss_debug;
#define debug_printk(x) do { if (seq_oss_debug > 0) snd_printk x; } while (0)
#define debug_printk(x) do { if (seq_oss_debug > 0) snd_printd x; } while (0)
#else
#define debug_printk(x) /**/
#endif
......
sound/core/seq/seq_prioq.c
View file @ 50201253
This diff is collapsed.
sound/core/vmaster.c
View file @ 50201253
This diff is collapsed.
sound/drivers/dummy.c
View file @ 50201253
This diff is collapsed.
sound/drivers/ml403-ac97cr.c
View file @ 50201253
This diff is collapsed.
sound/drivers/mpu401/mpu401.c
View file @ 50201253
This diff is collapsed.
sound/drivers/mtpav.c
View file @ 50201253
This diff is collapsed.
sound/drivers/mts64.c
View file @ 50201253
This diff is collapsed.
sound/drivers/opl3/opl3_lib.c
View file @ 50201253
This diff is collapsed.
sound/drivers/opl3/opl3_midi.c
View file @ 50201253
This diff is collapsed.
sound/drivers/opl3/opl3_oss.c
View file @ 50201253
This diff is collapsed.
sound/drivers/opl3/opl3_synth.c
View file @ 50201253
This diff is collapsed.
sound/drivers/pcsp/pcsp.c
View file @ 50201253
This diff is collapsed.
sound/drivers/portman2x4.c
View file @ 50201253
This diff is collapsed.
sound/drivers/serial-u16550.c
View file @ 50201253
This diff is collapsed.
sound/drivers/virmidi.c
View file @ 50201253
This diff is collapsed.
sound/drivers/vx/vx_core.c
View file @ 50201253
This diff is collapsed.
sound/drivers/vx/vx_hwdep.c
View file @ 50201253
This diff is collapsed.
sound/drivers/vx/vx_uer.c
View file @ 50201253
This diff is collapsed.
sound/i2c/Makefile
View file @ 50201253
This diff is collapsed.
sound/i2c/l3/Makefile deleted 100644 → 0
View file @ 562f477a
This diff is collapsed.
sound/i2c/l3/uda1341.c deleted 100644 → 0
View file @ 562f477a
This diff is collapsed.
sound/isa/Kconfig
View file @ 50201253
This diff is collapsed.
sound/isa/Makefile
View file @ 50201253
This diff is collapsed.
sound/isa/ad1816a/ad1816a.c
View file @ 50201253
This diff is collapsed.
sound/isa/ad1816a/ad1816a_lib.c
View file @ 50201253
This diff is collapsed.
sound/isa/ad1848/ad1848.c
View file @ 50201253
This diff is collapsed.
sound/isa/adlib.c
View file @ 50201253
This diff is collapsed.
sound/isa/als100.c
View file @ 50201253
This diff is collapsed.
sound/isa/azt2320.c
View file @ 50201253
This diff is collapsed.
sound/isa/cmi8330.c
View file @ 50201253
This diff is collapsed.
sound/isa/cs423x/Makefile
View file @ 50201253
This diff is collapsed.
sound/isa/cs423x/cs4231.c
View file @ 50201253
This diff is collapsed.
sound/isa/cs423x/cs4232.c deleted 100644 → 0
View file @ 562f477a
This diff is collapsed.
sound/isa/cs423x/cs4236.c
View file @ 50201253
This diff is collapsed.
sound/isa/cs423x/cs4236_lib.c
View file @ 50201253
This diff is collapsed.
sound/isa/dt019x.c
View file @ 50201253
This diff is collapsed.
sound/isa/es1688/es1688.c
View file @ 50201253
This diff is collapsed.
sound/isa/es1688/es1688_lib.c
View file @ 50201253
This diff is collapsed.
sound/isa/es18xx.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gus_dma.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gus_irq.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gus_pcm.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gus_uart.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gusclassic.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gusextreme.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/gusmax.c
View file @ 50201253
This diff is collapsed.
sound/isa/gus/interwave.c
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/Makefile 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_classic.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_classic.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_midi.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_pinnacle.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_pinnacle.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/msnd/msnd_pinnacle_mixer.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/isa/opl3sa2.c
View file @ 50201253
This diff is collapsed.
sound/isa/opti9xx/miro.c
View file @ 50201253
This diff is collapsed.
sound/isa/opti9xx/opti92x-ad1848.c
View file @ 50201253
This diff is collapsed.
sound/isa/sb/es968.c
View file @ 50201253
This diff is collapsed.
sound/isa/sb/sb16.c
View file @ 50201253
This diff is collapsed.
sound/isa/sb/sb8.c
View file @ 50201253
This diff is collapsed.
sound/isa/sb/sb_mixer.c
View file @ 50201253
This diff is collapsed.
sound/isa/sc6000.c
View file @ 50201253
This diff is collapsed.
sound/isa/sgalaxy.c
View file @ 50201253
This diff is collapsed.
sound/isa/sscape.c
View file @ 50201253
This diff is collapsed.
sound/isa/wavefront/wavefront.c
View file @ 50201253
This diff is collapsed.
sound/isa/wavefront/wavefront_synth.c
View file @ 50201253
This diff is collapsed.
sound/isa/wss/wss_lib.c
View file @ 50201253
This diff is collapsed.
sound/mips/au1x00.c
View file @ 50201253
This diff is collapsed.
sound/mips/hal2.c
View file @ 50201253
This diff is collapsed.
sound/mips/sgio2audio.c
View file @ 50201253
This diff is collapsed.
sound/oss/ad1848.c
View file @ 50201253
This diff is collapsed.
sound/oss/dmabuf.c
View file @ 50201253
This diff is collapsed.
sound/oss/pas2_card.c
View file @ 50201253
This diff is collapsed.
sound/oss/pss.c
View file @ 50201253
This diff is collapsed.
sound/oss/sequencer.c
View file @ 50201253
This diff is collapsed.
sound/parisc/harmony.c
View file @ 50201253
This diff is collapsed.
sound/pci/Kconfig
View file @ 50201253
This diff is collapsed.
sound/pci/ac97/ac97_codec.c
View file @ 50201253
This diff is collapsed.
sound/pci/ac97/ac97_proc.c
View file @ 50201253
This diff is collapsed.
sound/pci/ad1889.c
View file @ 50201253
This diff is collapsed.
sound/pci/ak4531_codec.c
View file @ 50201253
This diff is collapsed.
sound/pci/ali5451/ali5451.c
View file @ 50201253
This diff is collapsed.
sound/pci/als300.c
View file @ 50201253
This diff is collapsed.
sound/pci/als4000.c
View file @ 50201253
This diff is collapsed.
sound/pci/atiixp.c
View file @ 50201253
This diff is collapsed.
sound/pci/atiixp_modem.c
View file @ 50201253
This diff is collapsed.
sound/pci/au88x0/au88x0.c
View file @ 50201253
This diff is collapsed.
sound/pci/au88x0/au88x0_a3d.c
View file @ 50201253
This diff is collapsed.
sound/pci/au88x0/au88x0_core.c
View file @ 50201253
This diff is collapsed.
sound/pci/au88x0/au88x0_synth.c
View file @ 50201253
This diff is collapsed.
sound/pci/aw2/aw2-alsa.c
View file @ 50201253
This diff is collapsed.
sound/pci/azt3328.c
View file @ 50201253
This diff is collapsed.
sound/pci/bt87x.c
View file @ 50201253
This diff is collapsed.
sound/pci/ca0106/ca0106_main.c
View file @ 50201253
This diff is collapsed.
sound/pci/cmipci.c
View file @ 50201253
This diff is collapsed.
sound/pci/cs4281.c
View file @ 50201253
This diff is collapsed.
sound/pci/cs46xx/cs46xx.c
View file @ 50201253
This diff is collapsed.
sound/pci/cs46xx/cs46xx_lib.c
View file @ 50201253
This diff is collapsed.
sound/pci/cs46xx/cs46xx_lib.h
View file @ 50201253
This diff is collapsed.
sound/pci/cs5530.c
View file @ 50201253
This diff is collapsed.
sound/pci/cs5535audio/cs5535audio.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/Makefile
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echo3g_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echoaudio.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echoaudio.h
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echoaudio_3g.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echoaudio_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/echoaudio_dsp.h
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/gina20_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigo_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigo_express_dsp.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigodj_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigodjx.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigodjx_dsp.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigoio_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigoiox.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/indigoiox_dsp.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/layla20_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/mia_dsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/echoaudio/midi.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emu10k1.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emu10k1_callback.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emu10k1_main.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emu10k1x.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emufx.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/emupcm.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/io.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/p16v.c
View file @ 50201253
This diff is collapsed.
sound/pci/emu10k1/voice.c
View file @ 50201253
This diff is collapsed.
sound/pci/ens1370.c
View file @ 50201253
This diff is collapsed.
sound/pci/es1938.c
View file @ 50201253
This diff is collapsed.
sound/pci/es1968.c
View file @ 50201253
This diff is collapsed.
sound/pci/fm801.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_beep.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_beep.h
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_codec.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_codec.h
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_generic.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_hwdep.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_intel.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_local.h
View file @ 50201253
This diff is collapsed.
sound/pci/hda/hda_proc.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_analog.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_cmedia.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_conexant.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_realtek.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_sigmatel.c
View file @ 50201253
This diff is collapsed.
sound/pci/hda/patch_via.c
View file @ 50201253
This diff is collapsed.
sound/pci/ice1712/ice1712.c
View file @ 50201253
This diff is collapsed.
sound/pci/ice1712/ice1724.c
View file @ 50201253
This diff is collapsed.
sound/pci/ice1712/juli.c
View file @ 50201253
This diff is collapsed.
sound/pci/ice1712/prodigy192.c
View file @ 50201253
This diff is collapsed.
sound/pci/intel8x0.c
View file @ 50201253
This diff is collapsed.
sound/pci/intel8x0m.c
View file @ 50201253
This diff is collapsed.
sound/pci/korg1212/korg1212.c
View file @ 50201253
This diff is collapsed.
sound/pci/maestro3.c
View file @ 50201253
This diff is collapsed.
sound/pci/mixart/mixart.c
View file @ 50201253
This diff is collapsed.
sound/pci/mixart/mixart_hwdep.c
View file @ 50201253
This diff is collapsed.
sound/pci/nm256/nm256.c
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/hifier.c
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/oxygen.c
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/oxygen.h
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/oxygen_io.c
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/oxygen_lib.c
View file @ 50201253
This diff is collapsed.
sound/pci/oxygen/virtuoso.c
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr.c
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr.h
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr_core.h
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr_hwdep.c
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr_mix22.c
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr_mix22.h
View file @ 50201253
This diff is collapsed.
sound/pci/pcxhr/pcxhr_mixer.c
View file @ 50201253
This diff is collapsed.
sound/pci/riptide/riptide.c
View file @ 50201253
This diff is collapsed.
sound/pci/rme32.c
View file @ 50201253
This diff is collapsed.
sound/pci/rme96.c
View file @ 50201253
This diff is collapsed.
sound/pci/rme9652/hdsp.c
View file @ 50201253
This diff is collapsed.
sound/pci/rme9652/hdspm.c
View file @ 50201253
This diff is collapsed.
sound/pci/rme9652/rme9652.c
View file @ 50201253
This diff is collapsed.
sound/pci/sis7019.c
View file @ 50201253
This diff is collapsed.
sound/pci/sonicvibes.c
View file @ 50201253
This diff is collapsed.
sound/pci/trident/trident.c
View file @ 50201253
This diff is collapsed.
sound/pci/trident/trident_main.c
View file @ 50201253
This diff is collapsed.
sound/pci/via82xx.c
View file @ 50201253
This diff is collapsed.
sound/pci/via82xx_modem.c
View file @ 50201253
This diff is collapsed.
sound/pci/vx222/vx222.c
View file @ 50201253
This diff is collapsed.
sound/pci/vx222/vx222_ops.c
View file @ 50201253
This diff is collapsed.
sound/pci/ymfpci/ymfpci.c
View file @ 50201253
This diff is collapsed.
sound/pci/ymfpci/ymfpci_main.c
View file @ 50201253
This diff is collapsed.
sound/pcmcia/pdaudiocf/pdaudiocf.c
View file @ 50201253
This diff is collapsed.
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
View file @ 50201253
This diff is collapsed.
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
View file @ 50201253
This diff is collapsed.
sound/pcmcia/vx/vxpocket.c
View file @ 50201253
This diff is collapsed.
sound/ppc/Kconfig
View file @ 50201253
This diff is collapsed.
sound/ppc/awacs.c
View file @ 50201253
This diff is collapsed.
sound/ppc/burgundy.c
View file @ 50201253
This diff is collapsed.
sound/ppc/daca.c
View file @ 50201253
This diff is collapsed.
sound/ppc/pmac.c
View file @ 50201253
This diff is collapsed.
sound/ppc/powermac.c
View file @ 50201253
This diff is collapsed.
sound/ppc/snd_ps3.c
View file @ 50201253
This diff is collapsed.
sound/ppc/tumbler.c
View file @ 50201253
This diff is collapsed.
sound/sh/aica.c
View file @ 50201253
This diff is collapsed.
sound/soc/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/atmel/atmel-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/atmel/atmel_ssc_dai.c
View file @ 50201253
This diff is collapsed.
sound/soc/atmel/playpaq_wm8510.c
View file @ 50201253
This diff is collapsed.
sound/soc/atmel/sam9g20_wm8731.c
View file @ 50201253
This diff is collapsed.
sound/soc/au1x/dbdma2.c
View file @ 50201253
This diff is collapsed.
sound/soc/au1x/psc-ac97.c
View file @ 50201253
This diff is collapsed.
sound/soc/au1x/psc-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-ac97-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-ac97.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-ad73311.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-i2s-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/blackfin/bf5xx-sport.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ac97.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ad1980.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ad73311.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ad73311.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ak4104.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ak4104.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ak4535.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/cs4270.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/pcm3008.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/ssm2602.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/tlv320aic23.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/tlv320aic26.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/tlv320aic3x.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/twl4030.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/twl4030.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/uda134x.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/uda1380.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8350.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8350.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8400.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8400.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8510.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8580.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8580.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8728.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8731.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8731.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8750.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8753.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8753.h
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8900.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8903.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8971.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm8990.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm9705.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm9705.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm9712.c
View file @ 50201253
This diff is collapsed.
sound/soc/codecs/wm9713.c
View file @ 50201253
This diff is collapsed.
sound/soc/davinci/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/davinci/davinci-evm.c
View file @ 50201253
This diff is collapsed.
sound/soc/davinci/davinci-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/davinci/davinci-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/davinci/davinci-sffsdr.c
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/fsl_dma.c
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/fsl_ssi.c
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/fsl_ssi.h
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/mpc5200_psc_i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/fsl/mpc8610_hpcd.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/omap/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/omap/n810.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/omap-mcbsp.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/omap-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/omap3pandora.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/osk5912.c
View file @ 50201253
This diff is collapsed.
sound/soc/omap/sdp3430.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/corgi.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/e740_wm9705.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/e750_wm9705.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/e800_wm9712.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/mioa701_wm9713.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/palm27x.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/poodle.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/pxa-ssp.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/pxa2xx-ac97.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/pxa2xx-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/spitz.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/tosa.c
View file @ 50201253
This diff is collapsed.
sound/soc/pxa/zylonite.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/Kconfig
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/Makefile
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/jive_wm8750.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/neo1973_wm8753.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c-i2s-v2.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c-i2s-v2.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c2412-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c2412-i2s.h
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c2443-ac97.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c24xx-i2s.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c24xx-pcm.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c24xx_uda134x.c
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c64xx-i2s.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/s3c24xx/s3c64xx-i2s.h 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/soc/sh/hac.c
View file @ 50201253
This diff is collapsed.
sound/soc/sh/ssi.c
View file @ 50201253
This diff is collapsed.
sound/soc/soc-core.c
View file @ 50201253
This diff is collapsed.
sound/soc/soc-dapm.c
View file @ 50201253
This diff is collapsed.
sound/soc/soc-jack.c 0 → 100644
View file @ 50201253
This diff is collapsed.
sound/sparc/amd7930.c
View file @ 50201253
This diff is collapsed.
sound/sparc/cs4231.c
View file @ 50201253
This diff is collapsed.
sound/sparc/dbri.c
View file @ 50201253
This diff is collapsed.
sound/spi/at73c213.c
View file @ 50201253
This diff is collapsed.
sound/synth/emux/emux_hwdep.c
View file @ 50201253
This diff is collapsed.
sound/synth/emux/emux_oss.c
View file @ 50201253
This diff is collapsed.
sound/synth/emux/emux_seq.c
View file @ 50201253
This diff is collapsed.
sound/synth/emux/emux_synth.c
View file @ 50201253
This diff is collapsed.
sound/synth/emux/soundfont.c
View file @ 50201253
This diff is collapsed.
sound/usb/Kconfig
View file @ 50201253
This diff is collapsed.
sound/usb/caiaq/caiaq-audio.c
View file @ 50201253
This diff is collapsed.
sound/usb/caiaq/caiaq-control.c
View file @ 50201253
This diff is collapsed.
sound/usb/caiaq/caiaq-device.c
View file @ 50201253
This diff is collapsed.
sound/usb/caiaq/caiaq-device.h
View file @ 50201253
This diff is collapsed.
sound/usb/usbaudio.c
View file @ 50201253
This diff is collapsed.
sound/usb/usbmixer.c
View file @ 50201253
This diff is collapsed.
sound/usb/usbmixer_maps.c
View file @ 50201253
This diff is collapsed.
sound/usb/usbquirks.h
View file @ 50201253
This diff is collapsed.
sound/usb/usx2y/us122l.c
View file @ 50201253
This diff is collapsed.
sound/usb/usx2y/usX2Yhwdep.c
View file @ 50201253
This diff is collapsed.
sound/usb/usx2y/usb_stream.c
View file @ 50201253
This diff is collapsed.
sound/usb/usx2y/usbusx2y.c
View file @ 50201253
This diff is collapsed.
sound/usb/usx2y/usx2yhwdeppcm.h
View file @ 50201253
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7