summaryrefslogtreecommitdiff
path: root/sound/soc/s3c24xx/s3c64xx-i2s.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-24 19:33:10 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-24 20:39:38 +0400
commit172fd9e26200668ebaf3e1d6d09b36d5d531bfa6 (patch)
tree882a34484549fc258e0eca25dbf7588bcfb4fd13 /sound/soc/s3c24xx/s3c64xx-i2s.h
parent7629ad24f2b3df95c8b4cd8869e3c04e1df6c442 (diff)
downloadlinux-172fd9e26200668ebaf3e1d6d09b36d5d531bfa6.tar.xz
ASoC: Fix S3C64xx IIS device registration and support both ports
The S3C64xx IIS code had a number of problems with device registration. The hardware has two IIS ports of which the driver supported only one at once via a single exported DAI, attempting to identify the DAI to use based on the dev->id of the ASoC platform device. As well as limiting the driver to only supporting one IIS port at once this also meant that the ID of the soc-audio device (or in future the card device) had to match the IIS ID. Fix both problems by converting the driver to register the DAIs based on probing of platform devices registered by the arch/arm code, using those platform devices to interact with the clock API. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c64xx-i2s.h')
-rw-r--r--sound/soc/s3c24xx/s3c64xx-i2s.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.h b/sound/soc/s3c24xx/s3c64xx-i2s.h
index b7ffe3c38b66..597822a4658f 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -24,7 +24,7 @@
#define S3C64XX_CLKSRC_PCLK (0)
#define S3C64XX_CLKSRC_MUX (1)
-extern struct snd_soc_dai s3c64xx_i2s_dai;
+extern struct snd_soc_dai s3c64xx_i2s_dai[];
extern unsigned long s3c64xx_i2s_get_clockrate(struct snd_soc_dai *cpu_dai);