[alsa-devel] [PATCH 1/5] ASoC: Remove -dai suffix from Samsung DAI devices
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", .codec_dai_name = "wm8994-hifi", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8994-codec.0-0x1a", diff --git a/sound/soc/s3c24xx/goni_wm8994.c b/sound/soc/s3c24xx/goni_wm8994.c index 6ada34e..694f702 100644 --- a/sound/soc/s3c24xx/goni_wm8994.c +++ b/sound/soc/s3c24xx/goni_wm8994.c @@ -236,7 +236,7 @@ static struct snd_soc_dai_link goni_dai[] = { { .name = "WM8994", .stream_name = "WM8994 HiFi", - .cpu_dai_name = "s3c64xx-i2s-v4-dai", + .cpu_dai_name = "s3c64xx-i2s-v4", .codec_dai_name = "wm8994-hifi", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8994-codec.0-0x1a", diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 61e3067..49605cd 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -139,7 +139,7 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link jive_dai = { .name = "wm8750", .stream_name = "WM8750", - .cpu_dai_name = "s3c2412-i2s-dai", + .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8750-codec.0-0x1a", diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index ef234c7..abe64ab 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c @@ -32,7 +32,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "s3c-ac97-dai", + .cpu_dai_name = "s3c-ac97", .codec_dai_name = "ac97-hifi", .codec_name = "ac97-codec", .platform_name = "s3c24xx-pcm-audio", diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index be1e81c..c457bfd 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -397,7 +397,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { { /* Hifi Playback - for similatious use with voice below */ .name = "WM8753", .stream_name = "WM8753 HiFi", - .cpu_dai_name = "s3c24xx-i2s-dai", + .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .init = neo1973_gta02_wm8753_init, .platform_name = "s3c24xx-pcm-audio", diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 8b5472e..d7a39a0 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -557,7 +557,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { .name = "WM8753", .stream_name = "WM8753 HiFi", .platform_name = "s3c24xx-pcm-audio", - .cpu_dai_name = "s3c24xx-i2s-dai", + .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "wm8753-hifi", .codec_name = "wm8753-codec.0-0x1a", .init = neo1973_wm8753_init, diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index aa116f6..acd0096 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -188,7 +188,7 @@ static struct platform_driver s3c2412_iis_driver = { .probe = s3c2412_iis_dev_probe, .remove = s3c2412_iis_dev_remove, .driver = { - .name = "s3c2412-iis-dai", + .name = "s3c2412-iis", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index a6cbeef..1d0bade 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -495,7 +495,7 @@ static struct platform_driver s3c24xx_iis_driver = { .probe = s3c24xx_iis_dev_probe, .remove = s3c24xx_iis_dev_remove, .driver = { - .name = "s3c24xx-iis-dai", + .name = "s3c24xx-iis", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c index 00ead0d..f884537 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c @@ -97,7 +97,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { .name = "tlv320aic33", .stream_name = "TLV320AIC33", .codec_name = "tlv320aic3x-codec.0-0x1a", - .cpu_dai_name = "s3c24xx-i2s-dai", + .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "s3c24xx-pcm-audio", .init = simtec_hermes_init, diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c index 4ee4412..c096759 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c @@ -86,7 +86,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { .name = "tlv320aic23", .stream_name = "TLV320AIC23", .codec_name = "tlv320aic3x-codec.0-0x1a", - .cpu_dai_name = "s3c24xx-i2s-dai", + .cpu_dai_name = "s3c24xx-i2s", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "s3c24xx-pcm-audio", .init = simtec_tlv320aic23_init, diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index 7d049ed..bd48ffb 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c @@ -229,7 +229,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { .stream_name = "UDA134X", .codec_name = "uda134x-hifi", .codec_dai_name = "uda134x-hifi", - .cpu_dai_name = "s3c24xx-i2s-dai", + .cpu_dai_name = "s3c24xx-i2s", .ops = &s3c24xx_uda134x_ops, .platform_name = "s3c24xx-pcm-audio", }; 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, }, }; diff --git a/sound/soc/s3c24xx/smartq_wm8987.c b/sound/soc/s3c24xx/smartq_wm8987.c index a908055..dd20ca7 100644 --- a/sound/soc/s3c24xx/smartq_wm8987.c +++ b/sound/soc/s3c24xx/smartq_wm8987.c @@ -211,7 +211,7 @@ static struct snd_soc_dai_link smartq_dai[] = { { .name = "wm8987", .stream_name = "SmartQ Hi-Fi", - .cpu_dai_name = "s3c64xx-i2s-dai.0", + .cpu_dai_name = "s3c64xx-i2s.0", .codec_dai_name = "wm8750-hifi", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8750-codec.0-0x1a", diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index 9d959a0..5c21e26 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -223,7 +223,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { { /* Primary Playback i/f */ .name = "WM8580 PAIF RX", .stream_name = "Playback", - .cpu_dai_name = "s3c64xx-i2s-v4-dai", + .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-playback", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8580-codec.0-001b", @@ -233,7 +233,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { { /* Primary Capture i/f */ .name = "WM8580 PAIF TX", .stream_name = "Capture", - .cpu_dai_name = "s3c64xx-i2s-v4-dai", + .cpu_dai_name = "s3c64xx-iis-v4", .codec_dai_name = "wm8580-hifi-capture", .platform_name = "s3c24xx-pcm-audio", .codec_name = "wm8580-codec.0-001b",
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/s3c24xx/s3c-ac97.c | 1 + sound/soc/s3c24xx/s3c-dma.c | 1 + sound/soc/s3c24xx/s3c-pcm.c | 1 + sound/soc/s3c24xx/s3c2412-i2s.c | 1 + sound/soc/s3c24xx/s3c24xx-i2s.c | 1 + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 1 + sound/soc/s3c24xx/s3c64xx-i2s.c | 1 + 7 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-ac97.c b/sound/soc/s3c24xx/s3c-ac97.c index 86f4a9b..26f4ed9 100644 --- a/sound/soc/s3c24xx/s3c-ac97.c +++ b/sound/soc/s3c24xx/s3c-ac97.c @@ -513,3 +513,4 @@ module_exit(s3c_ac97_exit); MODULE_AUTHOR("Jaswinder Singh, jassi.brar@samsung.com"); MODULE_DESCRIPTION("AC97 driver for the Samsung SoC"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c-ac97"); diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c index 4f8b498..bb8ba07 100644 --- a/sound/soc/s3c24xx/s3c-dma.c +++ b/sound/soc/s3c24xx/s3c-dma.c @@ -500,3 +500,4 @@ module_exit(snd_s3c24xx_pcm_exit); MODULE_AUTHOR("Ben Dooks, ben@simtec.co.uk"); MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c24xx-pcm-audio"); diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index 653ffa2..6174e26 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -543,3 +543,4 @@ module_exit(s3c_pcm_exit); MODULE_AUTHOR("Jaswinder Singh, jassi.brar@samsung.com"); MODULE_DESCRIPTION("S3C PCM Controller Driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:samsung-pcm-audio"); diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index acd0096..4a861cf 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -209,3 +209,4 @@ module_exit(s3c2412_i2s_exit); MODULE_AUTHOR("Ben Dooks, ben@simtec.co.uk"); MODULE_DESCRIPTION("S3C2412 I2S SoC Interface"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c2412-iis"); diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 1d0bade..e060daa 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -516,3 +516,4 @@ module_exit(s3c24xx_i2s_exit); MODULE_AUTHOR("Ben Dooks, ben@simtec.co.uk"); MODULE_DESCRIPTION("s3c24xx I2S SoC Interface"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c24xx-iis"); diff --git a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c index 7cab4fc..a13415a 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c @@ -216,3 +216,4 @@ module_exit(s3c64xx_i2sv4_exit); MODULE_AUTHOR("Jaswinder Singh, jassi.brar@samsung.com"); MODULE_DESCRIPTION("S3C64XX I2Sv4 SoC Interface"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c64xx-iis-v4"); diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index a1d0b25..ae7acb6 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -239,3 +239,4 @@ module_exit(s3c64xx_i2s_exit); MODULE_AUTHOR("Ben Dooks, ben@simtec.co.uk"); MODULE_DESCRIPTION("S3C64XX I2S SoC Interface"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:s3c64xx-iis");
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- arch/arm/mach-s3c64xx/dev-audio.c | 13 +++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 2 ++ 2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index c3e9e73..55ae1b0 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c @@ -333,3 +333,16 @@ void __init s3c64xx_ac97_setup_gpio(int num) else s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; } + +static u64 s3c_device_audio_dmamask = 0xffffffffUL; + +struct platform_device s3c_device_pcm = { + .name = "s3c24xx-pcm-audio", + .id = -1, + .dev = { + .dma_mask = &s3c_device_audio_dmamask, + .coherent_dma_mask = 0xffffffffUL + } +}; +EXPORT_SYMBOL(s3c_device_pcm); + diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index e6144e4..9ea6786 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -32,6 +32,8 @@ extern struct platform_device s3c64xx_device_iisv4; extern struct platform_device s3c64xx_device_spi0; extern struct platform_device s3c64xx_device_spi1;
+extern struct platform_device s3c_device_pcm; + extern struct platform_device s3c64xx_device_pcm0; extern struct platform_device s3c64xx_device_pcm1;
Needed for multi-component.
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index d9a0355..362fc76 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -256,6 +256,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, + &s3c_device_pcm, &s3c64xx_device_iisv4,
#ifdef CONFIG_REGULATOR
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c index bb8ba07..54bff83 100644 --- a/sound/soc/s3c24xx/s3c-dma.c +++ b/sound/soc/s3c24xx/s3c-dma.c @@ -477,8 +477,8 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)
static struct platform_driver s3c24xx_pcm_driver = { .driver = { - .name = "s3c24xx-pcm-audio", - .owner = THIS_MODULE, + .name = "s3c24xx-pcm-audio", + .owner = THIS_MODULE, },
.probe = s3c24xx_soc_platform_probe,
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c index bb8ba07..54bff83 100644 --- a/sound/soc/s3c24xx/s3c-dma.c +++ b/sound/soc/s3c24xx/s3c-dma.c @@ -477,8 +477,8 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)
static struct platform_driver s3c24xx_pcm_driver = { .driver = {
- .name = "s3c24xx-pcm-audio",
- .owner = THIS_MODULE,
- .name = "s3c24xx-pcm-audio",
- .owner = THIS_MODULE,
},
.probe = s3c24xx_soc_platform_probe,
Ok but I think we need to involve Ben too, for I have the impression that he is not very interested in such valid but inconsequential changes. If he agrees, maybe we can prepare a patchset for complete polish and overhauling the drivers.
On Fri, Aug 13, 2010 at 2:38 PM, Jassi Brar jassisinghbrar@gmail.com wrote:
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/s3c24xx/s3c-dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c index bb8ba07..54bff83 100644 --- a/sound/soc/s3c24xx/s3c-dma.c +++ b/sound/soc/s3c24xx/s3c-dma.c @@ -477,8 +477,8 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)
static struct platform_driver s3c24xx_pcm_driver = { .driver = {
- .name = "s3c24xx-pcm-audio",
- .owner = THIS_MODULE,
- .name = "s3c24xx-pcm-audio",
- .owner = THIS_MODULE,
},
.probe = s3c24xx_soc_platform_probe,
Ok but I think we need to involve Ben too, for I have the impression that he is not very interested in such valid but inconsequential changes. If he agrees, maybe we can prepare a patchset for complete polish and overhauling the drivers.
Yes, I agree. And I really hope that we can make a fine conclusion about naming and location in this time with, if we have a time enough.
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
On 13 Aug 2010, at 06:38, Jassi Brar wrote:
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown
static struct platform_driver s3c24xx_pcm_driver = { .driver = {
.name = "s3c24xx-pcm-audio",.owner = THIS_MODULE,
.name = "s3c24xx-pcm-audio",.owner = THIS_MODULE, }, .probe = s3c24xx_soc_platform_probe,Ok but I think we need to involve Ben too, for I have the impression that he is not very interested in such valid but inconsequential changes. If he agrees, maybe we can prepare a patchset for complete polish and overhauling the drivers.
I'm afraid I can't follow what you're saying here at all. The above change is an indentation only change in the ASoC code. I can't see why Ben would need to be involved, it doesn't touch arch/arm at all.
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
Hi,
On 2010-08-13 오후 2:12, Seungwhan Youn wrote:
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 Brownbroonie@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'.
It confused me a little to use two names "iis" and "i2s". Can we unify to one?
On 13 Aug 2010, at 07:14, Joonyoung Shim wrote:
On 2010-08-13 오후 2:12, Seungwhan Youn wrote:
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown
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'.
It confused me a little to use two names "iis" and "i2s". Can we unify to one?
There's no change between -i2s and -iis introduced by this patch, all this patch did was strip the -dai suffix from the names. It looks like this is an error in the Aquilla driver which should be corrected.
2010/8/13 Mark Brown broonie@opensource.wolfsonmicro.com:
On 13 Aug 2010, at 07:14, Joonyoung Shim wrote:
On 2010-08-13 오후 2:12, Seungwhan Youn wrote:
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown
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'.
It confused me a little to use two names "iis" and "i2s". Can we unify to one?
There's no change between -i2s and -iis introduced by this patch, all this patch did was strip the -dai suffix from the names. It looks like this is an error in the Aquilla driver which should be corrected.
I didn't mean to tell about this patch. I would like to just say about i2s and iis naming on samsung platform driver.
Thanks.
On Fri, Aug 13, 2010 at 5:59 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On 13 Aug 2010, at 07:14, Joonyoung Shim wrote:
On 2010-08-13 오후 2:12, Seungwhan Youn wrote:
On Thu, Aug 12, 2010 at 7:02 PM, Mark Brown
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'.
It confused me a little to use two names "iis" and "i2s". Can we unify to one?
There's no change between -i2s and -iis introduced by this patch, all this patch did was strip the -dai suffix from the names. It looks like this is an error in the Aquilla driver which should be corrected.
I see. I just think that this patch modify to fix naming of i2s platform driver with setting corresponding arm/arch like your modification of 'smdk64xx_wm8580.c' in this patch. I think that aquila board was wrong example, but I'm afraid that other boards which was modified cpu_dai_name from Liam's multi-comp patches, also look not-correct. Because I don't know they are using platform driver on arch/arm, but I think that they(other machine code, like jive_wm8750.c) use I2S driver named 's3c24xx-iis', 's3c2412-iis' and 's3c64xx-iis'.
Of course, that things can be handled another patch with another guy who can verify its work. But, I think that fix on this patch will be more nice to me.
I'm sorry, if I'm bothering you, and thank you for your comment,
Claude
On Fri, Aug 13, 2010 at 08:20:22PM +0900, Seungwhan Youn wrote:
On Fri, Aug 13, 2010 at 5:59 PM, Mark Brown
There's no change between -i2s and -iis introduced by this patch, all this patch did was strip the -dai suffix from the names. It looks like this is an error in the Aquilla driver which should be corrected.
I see. I just think that this patch modify to fix naming of i2s platform driver with setting corresponding arm/arch like your modification of 'smdk64xx_wm8580.c' in this patch. I think that aquila board was wrong example, but I'm afraid that other boards which was modified cpu_dai_name from Liam's multi-comp patches, also look not-correct. Because I don't know they are using platform driver on arch/arm, but I think that they(other machine code, like jive_wm8750.c) use I2S driver named 's3c24xx-iis', 's3c2412-iis' and 's3c64xx-iis'.
Like I say this is an orthogonal issue to this patch.
Of course, that things can be handled another patch with another guy who can verify its work. But, I think that fix on this patch will be more nice to me.
No, one patch for one change. With this sort of fairly wide patch it is much easier to review if each line of the patch only does one thing so that each change can be quickly compared against the single repetitive change which is expected. If multiple changes are done in the same commit then each line needs to be thought about more to determine if the correct set of changes are being applied in that change.
participants (5)
-
Jassi Brar -
Joonyoung Shim -
Joonyoung Shim -
Mark Brown -
Seungwhan Youn