summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-30 10:36:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-30 10:36:23 +0000
commit98078bf90495729e59edbec088d00b9d98f4cc0f (patch)
tree5d6fc65a9d3b0b3540339755e89a675cc25ae84b /sound/soc/omap
parent07102f3cefc93aa742af91186830e282c0347e41 (diff)
parentb214f11fb92713fbb07d8c1f62dd1aa8077b56c9 (diff)
downloadlinux-0-day-98078bf90495729e59edbec088d00b9d98f4cc0f.tar.gz
linux-0-day-98078bf90495729e59edbec088d00b9d98f4cc0f.tar.xz
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/Kconfig13
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 6344456e7a09d..bb5731a22bed9 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -21,7 +21,18 @@ config SND_OMAP_SOC_AMS_DELTA
select SND_OMAP_SOC_MCBSP
select SND_SOC_CX20442
help
- Say Y if you want to add support for SoC audio on Amstrad Delta.
+ Say Y if you want to add support for SoC audio device connected to
+ a handset and a speakerphone found on Amstrad E3 (Delta) videophone.
+
+ Note that in order to get those devices fully supported, you have to
+ build the kernel with standard serial port driver included and
+ configured for at least 4 ports. Then, from userspace, you must load
+ a line discipline #19 on the modem (ttyS3) serial line. The simplest
+ way to achieve this is to install util-linux-ng and use the included
+ ldattach utility. This can be started automatically from udev,
+ a simple rule like this one should do the trick (it does for me):
+ ACTION=="add", KERNEL=="controlC0", \
+ RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
config SND_OMAP_SOC_OSK5912
tristate "SoC Audio support for omap osk5912"