diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2010-07-21 08:06:56 +0900 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-12 14:00:14 +0100 |
| commit | 3782a528974c9607bde03ec265bbebd2dc300ea1 (patch) | |
| tree | d75ce305a0d0344836d208b6763ac9024cda72c8 /sound/soc/s3c24xx/s3c-i2s-v2.c | |
| parent | f0fba2ad1b6b53d5360125c41953b7afcd6deff0 (diff) | |
ASoC: multi-component - Add Aquila sound driver
This patch add sound support for the Aquila board based on S5PC110.
The Aquila board is based on Samsung SoC(S5PC110) and include
WM8994 codec over I2S to support sound. This uses the I2Sv4 driver
compatible with I2Sv5 to run sound.
The kind of jack is below states :
* SND_JACK_HEADPHONE
* SND_JACK_HEADSET
* SND_JACK_MECHANICAL
: When TV-OUT cable is inserted on Aquila board,
the TV-OUT cable isn't connected to television.
* SND_JACK_AVOUT
: When TV-OUT cable is inserted on Aquila board,
the TV-OUT cable is connected to television.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
ASoC: multi-component: SAMSUNG: Fix wrong field name on Aquila board
This patch modify the wrong field name on Aquila board.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/s3c24xx/s3c-i2s-v2.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index f4fbc0e61733..b3866d5b19e9 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -750,7 +750,7 @@ int s3c_i2sv2_register_dai(struct device *dev, int id, drv->suspend = s3c2412_i2s_suspend; drv->resume = s3c2412_i2s_resume; - return snd_soc_register_dai(dev, id, drv); + return snd_soc_register_dai(dev, drv); } EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); |