Hi Mark,
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
The IP blocks are all fixed function audio controllers so there's no need to dedupe against other usages and the corresponding arch/arm updates got missed anyway so revert to the original names for the drivers.
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/s3c24xx/aquila_wm8994.c | 2 +- sound/soc/s3c24xx/goni_wm8994.c | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +- sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- sound/soc/s3c24xx/smartq_wm8987.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/s3c24xx/aquila_wm8994.c b/sound/soc/s3c24xx/aquila_wm8994.c index 44b06e9..235d197 100644 --- a/sound/soc/s3c24xx/aquila_wm8994.c +++ b/sound/soc/s3c24xx/aquila_wm8994.c @@ -233,7 +233,7 @@ static struct snd_soc_dai_link aquila_dai[] = { { .name = "WM8994", .stream_name = "WM8994 HiFi",
- .cpu_dai_name = "s3c64xx-i2s-v4-dai",
- .cpu_dai_name = "s3c64xx-i2s-v4",
This aquila board also use I2Sv4 from 's3c64xx-i2s-v4.c', so I think it'll not work if cpu_dai_name is 's3c64xx-i2s-v4' not 's3c64xx-iis-v4'. In this case, do we have to request to check this to Mr. Chanwoo or just modify this first?
And I think other machine codes also need to revert to original, if you want to work machine codes with 's3c24xx_iis_driver', 's3c2412_iis_driver' and 's3c64xx_iis_driver'.
.codec_dai_name = "wm8994-hifi", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8994-codec.0-0x1a",
(snip)
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c index 885040b..7cab4fc 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c @@ -195,7 +195,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { .probe = s3c64xx_i2sv4_dev_probe, .remove = s3c64xx_i2sv4_dev_remove, .driver = {
- .name = "s3c64xx-iis-v4-dai",
- .name = "s3c64xx-iis-v4",
.owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 161189b..a1d0b25 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { .probe = s3c64xx_iis_dev_probe, .remove = s3c64xx_iis_dev_remove, .driver = {
- .name = "s3c64xx-iis-dai",
- .name = "s3c64xx-iis",
.owner = THIS_MODULE, }, };
Thanks,
Claude