November 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: Convert jz4740 directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/jz4740/jz4740-i2s.c | 12 +----------- sound/soc/jz4740/jz4740-pcm.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index cd22a54..fbcdd51 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -519,17 +519,7 @@ static struct platform_driver jz4740_i2s_driver = { }, }; -static int __init jz4740_i2s_init(void) -{ - return platform_driver_register(&jz4740_i2s_driver); -} -module_init(jz4740_i2s_init); - -static void __exit jz4740_i2s_exit(void) -{ - platform_driver_unregister(&jz4740_i2s_driver); -} -module_exit(jz4740_i2s_exit); +module_platform_driver(jz4740_i2s_driver); MODULE_AUTHOR("Lars-Peter Clausen, <lars(a)metafoo.de>"); MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver"); diff --git a/sound/soc/jz4740/jz4740-pcm.c b/sound/soc/jz4740/jz4740-pcm.c index d1989cd..50cda9e 100644 --- a/sound/soc/jz4740/jz4740-pcm.c +++ b/sound/soc/jz4740/jz4740-pcm.c @@ -356,17 +356,7 @@ static struct platform_driver jz4740_pcm_driver = { }, }; -static int __init jz4740_soc_platform_init(void) -{ - return platform_driver_register(&jz4740_pcm_driver); -} -module_init(jz4740_soc_platform_init); - -static void __exit jz4740_soc_platform_exit(void) -{ - return platform_driver_unregister(&jz4740_pcm_driver); -} -module_exit(jz4740_soc_platform_exit); +module_platform_driver(jz4740_pcm_driver); MODULE_AUTHOR("Lars-Peter Clausen <lars(a)metafoo.de>"); MODULE_DESCRIPTION("Ingenic SoC JZ4740 PCM driver"); -- 1.7.5.4

2 1

[alsa-devel] [PATCH v7 0/3] ARM: mxs: add recording support for saif
by Dong Aisheng 24 Nov '11

24 Nov '11

Changes since v6: * fix a typo suggested by Shawn * add tag from Marek Vasut Changes since v5: Only one change is that: * remove the unneccesary parenthesis for [PATCH 1/3] suggested by Marek Vasut. Changes since v4: * use new added master_id and master_mode in platform_data. The new changes depend on another patch: 0001-ASoC-mxs-saif-remove-function-in-platform_data.patch Changes since v3: * remove unneeded locking according to Sascha. The patches are based on imx-features branch since commit: ca4e419c2. Changes since v2: * separate clkmux code into another patch according to Uwe * add lock according to Wolfram * Other minus fixes suggested by Uwe and Wolfram. * remove Wolfram's fix saif clock setting patch which is in v2 series since Wolfram will reform the clock code and send it out himself. For test purpose, user still needs that patch. People can get it from v2 series. The patch is: [PATCH v2 3/3] arm: mxs: disable clock-gates when setting saif-clocks The patches are based on imx-features branch since commit: f4f01e31835f. Changes since v1: The main changes are move mach-specific code(clkmux in DIGCTL) from saif driver to mach-specific layer based on Wolfram's suggestion. Note that the last patch is a RFC patch and sent out for testing since without that patch the saif may not work. Dong Aisheng (3): ARM: mxs: add saif clkmux functions ARM: mx28evk: add platform data for saif ARM: mx28evk: set a initial clock rate for saif arch/arm/mach-mxs/clock-mx28.c | 38 +++++++++++++++++++++++ arch/arm/mach-mxs/devices-mx28.h | 3 +- arch/arm/mach-mxs/devices/platform-mxs-saif.c | 5 ++- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/include/mach/devices-common.h | 4 ++- arch/arm/mach-mxs/include/mach/digctl.h | 21 ++++++++++++ arch/arm/mach-mxs/mach-mx28evk.c | 18 +++++++++- 7 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 arch/arm/mach-mxs/include/mach/digctl.h

4 6

[alsa-devel] ASoC: ak4642/fsi: add ak4648 support
by kuninori.morimoto.gx＠renesas.com 24 Nov '11

24 Nov '11

Dear Mark, Liam, Paul These are ak4648 suport for ak4642 driver, and fsi update patch set Kuninori Morimoto (5): ASoC: fsi-ak4642: modify specification method of FSI / ak464x ASoC: ak4642: ak4642 was tested ASoC: ak4642: headphone/stereo-line output control ASoC: ak4642: add ak4648 support ASoC: fsi: add valid data position control support >> Paul Can you please check #1 patch which modify arch/sh and arch/arm

3 29

[alsa-devel] [PATCH] ASoC: Convert s6000 directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/s6000/s6000-i2s.c | 12 +----------- sound/soc/s6000/s6000-pcm.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 3052f64..4cc4181 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -604,17 +604,7 @@ static struct platform_driver s6000_i2s_driver = { }, }; -static int __init s6000_i2s_init(void) -{ - return platform_driver_register(&s6000_i2s_driver); -} -module_init(s6000_i2s_init); - -static void __exit s6000_i2s_exit(void) -{ - platform_driver_unregister(&s6000_i2s_driver); -} -module_exit(s6000_i2s_exit); +module_platform_driver(s6000_i2s_driver); MODULE_AUTHOR("Daniel Gloeckner"); MODULE_DESCRIPTION("Stretch s6000 family I2S SoC Interface"); diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 55efc2b..43c014f 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c @@ -520,17 +520,7 @@ static struct platform_driver s6000_pcm_driver = { .remove = __devexit_p(s6000_soc_platform_remove), }; -static int __init snd_s6000_pcm_init(void) -{ - return platform_driver_register(&s6000_pcm_driver); -} -module_init(snd_s6000_pcm_init); - -static void __exit snd_s6000_pcm_exit(void) -{ - platform_driver_unregister(&s6000_pcm_driver); -} -module_exit(snd_s6000_pcm_exit); +module_platform_driver(s6000_pcm_driver); MODULE_AUTHOR("Daniel Gloeckner"); MODULE_DESCRIPTION("Stretch s6000 family PCM DMA module"); -- 1.7.5.4

2 1

[alsa-devel] [PATCH] ASoC: Convert mips directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/mips/hal2.c | 13 +------------ sound/mips/sgio2audio.c | 13 +------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 2e6c858..5f88d1f 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -935,15 +935,4 @@ static struct platform_driver hal2_driver = { } }; -static int __init alsa_card_hal2_init(void) -{ - return platform_driver_register(&hal2_driver); -} - -static void __exit alsa_card_hal2_exit(void) -{ - platform_driver_unregister(&hal2_driver); -} - -module_init(alsa_card_hal2_init); -module_exit(alsa_card_hal2_exit); +module_platform_driver(hal2_driver); diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 69425d4..ceaa593 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -976,15 +976,4 @@ static struct platform_driver sgio2audio_driver = { } }; -static int __init alsa_card_sgio2audio_init(void) -{ - return platform_driver_register(&sgio2audio_driver); -} - -static void __exit alsa_card_sgio2audio_exit(void) -{ - platform_driver_unregister(&sgio2audio_driver); -} - -module_init(alsa_card_sgio2audio_init) -module_exit(alsa_card_sgio2audio_exit) +module_platform_driver(sgio2audio_driver); -- 1.7.5.4

2 1

[alsa-devel] question on alsa's kernel API concerning snd_power_change_state()
by Oliver Neukum 24 Nov '11

24 Nov '11

Hi, if this function has been used to tell the sound core that a device is in a powersave mode, will the soundcore allow user space to open it? Regards Oliver

2 1

[alsa-devel] [PATCH] ASoC: Convert mxs directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/mxs/mxs-pcm.c | 12 +----------- sound/soc/mxs/mxs-saif.c | 12 +----------- sound/soc/mxs/mxs-sgtl5000.c | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index dea5aa4..612ad3d 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c @@ -346,14 +346,4 @@ static struct platform_driver mxs_pcm_driver = { .remove = __devexit_p(mxs_soc_platform_remove), }; -static int __init snd_mxs_pcm_init(void) -{ - return platform_driver_register(&mxs_pcm_driver); -} -module_init(snd_mxs_pcm_init); - -static void __exit snd_mxs_pcm_exit(void) -{ - platform_driver_unregister(&mxs_pcm_driver); -} -module_exit(snd_mxs_pcm_exit); +module_platform_driver(mxs_pcm_driver); diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 76dc74d..ffc83761 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -781,18 +781,8 @@ static struct platform_driver mxs_saif_driver = { }, }; -static int __init mxs_saif_init(void) -{ - return platform_driver_register(&mxs_saif_driver); -} - -static void __exit mxs_saif_exit(void) -{ - platform_driver_unregister(&mxs_saif_driver); -} +module_platform_driver(mxs_saif_driver); -module_init(mxs_saif_init); -module_exit(mxs_saif_exit); MODULE_AUTHOR("Freescale Semiconductor, Inc."); MODULE_DESCRIPTION("MXS ASoC SAIF driver"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 7fbeaec..200a928 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -156,17 +156,7 @@ static struct platform_driver mxs_sgtl5000_audio_driver = { .remove = __devexit_p(mxs_sgtl5000_remove), }; -static int __init mxs_sgtl5000_init(void) -{ - return platform_driver_register(&mxs_sgtl5000_audio_driver); -} -module_init(mxs_sgtl5000_init); - -static void __exit mxs_sgtl5000_exit(void) -{ - platform_driver_unregister(&mxs_sgtl5000_audio_driver); -} -module_exit(mxs_sgtl5000_exit); +module_platform_driver(mxs_sgtl5000_audio_driver); MODULE_AUTHOR("Freescale Semiconductor, Inc."); MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); -- 1.7.5.4

3 2

[alsa-devel] [PATCH] ASoC: Convert mid-x86 directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/mid-x86/mfld_machine.c | 14 +------------- sound/soc/mid-x86/sst_platform.c | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c index cca693a..e53f8e4 100644 --- a/sound/soc/mid-x86/mfld_machine.c +++ b/sound/soc/mid-x86/mfld_machine.c @@ -428,19 +428,7 @@ static struct platform_driver snd_mfld_mc_driver = { .remove = __devexit_p(snd_mfld_mc_remove), }; -static int __init snd_mfld_driver_init(void) -{ - pr_debug("snd_mfld_driver_init called\n"); - return platform_driver_register(&snd_mfld_mc_driver); -} -module_init(snd_mfld_driver_init); - -static void __exit snd_mfld_driver_exit(void) -{ - pr_debug("snd_mfld_driver_exit called\n"); - platform_driver_unregister(&snd_mfld_mc_driver); -} -module_exit(snd_mfld_driver_exit); +module_platform_driver(snd_mfld_mc_driver); MODULE_DESCRIPTION("ASoC Intel(R) MID Machine driver"); MODULE_AUTHOR("Vinod Koul <vinod.koul(a)intel.com>"); diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index 2305702..94f70b3 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c @@ -472,19 +472,7 @@ static struct platform_driver sst_platform_driver = { .remove = sst_platform_remove, }; -static int __init sst_soc_platform_init(void) -{ - pr_debug("sst_soc_platform_init called\n"); - return platform_driver_register(&sst_platform_driver); -} -module_init(sst_soc_platform_init); - -static void __exit sst_soc_platform_exit(void) -{ - platform_driver_unregister(&sst_platform_driver); - pr_debug("sst_soc_platform_exit success\n"); -} -module_exit(sst_soc_platform_exit); +module_platform_driver(sst_platform_driver); MODULE_DESCRIPTION("ASoC Intel(R) MID Platform driver"); MODULE_AUTHOR("Vinod Koul <vinod.koul(a)intel.com>"); -- 1.7.5.4

2 1

[alsa-devel] [PATCH v2 1/1] ASoC: mxs-saif: remove function in platform_data
by Dong Aisheng 24 Nov '11

24 Nov '11

Add master_mode and master_id in platfrom_data since it's board specific and board knows it. Then we can remove the function pointer in platfrom_data to make the driver more devicetree friendly. Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Changes v1->v2: Missed a parenthesis as follows, add it and resend. Sorry for inconvenience. Changes based on v1: - saif->master_id == saif->id) + saif->master_id == saif->id) { dev_err(&pdev->dev, "get wrong master id\n"); return -EINVAL; + } --- include/sound/saif.h | 4 ++-- sound/soc/mxs/mxs-saif.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/sound/saif.h b/include/sound/saif.h index d0e0de7..f22f3e1 100644 --- a/include/sound/saif.h +++ b/include/sound/saif.h @@ -10,7 +10,7 @@ #define __SOUND_SAIF_H__ struct mxs_saif_platform_data { - int (*init) (void); - int (*get_master_id) (unsigned int saif_id); + bool master_mode; /* if true use master mode */ + int master_id; /* id of the master if in slave mode */ }; #endif diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 76dc74d..1ef697f 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev) if (pdev->id >= ARRAY_SIZE(mxs_saif)) return -EINVAL; - pdata = pdev->dev.platform_data; - if (pdata && pdata->init) { - ret = pdata->init(); - if (ret) - return ret; - } - saif = kzalloc(sizeof(*saif), GFP_KERNEL); if (!saif) return -ENOMEM; @@ -639,12 +632,17 @@ static int mxs_saif_probe(struct platform_device *pdev) mxs_saif[pdev->id] = saif; saif->id = pdev->id; - saif->master_id = saif->id; - if (pdata && pdata->get_master_id) { - saif->master_id = pdata->get_master_id(saif->id); + pdata = pdev->dev.platform_data; + if (pdata && !pdata->master_mode) { + saif->master_id = pdata->master_id; if (saif->master_id < 0 || - saif->master_id >= ARRAY_SIZE(mxs_saif)) + saif->master_id >= ARRAY_SIZE(mxs_saif) || + saif->master_id == saif->id) { + dev_err(&pdev->dev, "get wrong master id\n"); return -EINVAL; + } + } else { + saif->master_id = saif->id; } saif->clk = clk_get(&pdev->dev, NULL); -- 1.7.0.4

2 1

[alsa-devel] [PATCH] ASoC: Convert ep93xx directory to module_platform_driver
by Axel Lin 24 Nov '11

24 Nov '11

Factor out some boilerplate code. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/ep93xx/edb93xx.c | 12 +----------- sound/soc/ep93xx/ep93xx-ac97.c | 12 +----------- sound/soc/ep93xx/ep93xx-i2s.c | 13 +------------ sound/soc/ep93xx/ep93xx-pcm.c | 13 +------------ sound/soc/ep93xx/simone.c | 12 +----------- sound/soc/ep93xx/snappercl15.c | 13 +------------ 6 files changed, 6 insertions(+), 69 deletions(-) diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c index 51930b6..6b90c75 100644 --- a/sound/soc/ep93xx/edb93xx.c +++ b/sound/soc/ep93xx/edb93xx.c @@ -131,17 +131,7 @@ static struct platform_driver edb93xx_driver = { .remove = __devexit_p(edb93xx_remove), }; -static int __init edb93xx_init(void) -{ - return platform_driver_register(&edb93xx_driver); -} -module_init(edb93xx_init); - -static void __exit edb93xx_exit(void) -{ - platform_driver_unregister(&edb93xx_driver); -} -module_exit(edb93xx_exit); +module_platform_driver(edb93xx_driver); MODULE_AUTHOR("Alexander Sverdlin <subaparts(a)yandex.ru>"); MODULE_DESCRIPTION("ALSA SoC EDB93xx"); diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c index 3cd6158..ca0b07a 100644 --- a/sound/soc/ep93xx/ep93xx-ac97.c +++ b/sound/soc/ep93xx/ep93xx-ac97.c @@ -449,17 +449,7 @@ static struct platform_driver ep93xx_ac97_driver = { }, }; -static int __init ep93xx_ac97_init(void) -{ - return platform_driver_register(&ep93xx_ac97_driver); -} -module_init(ep93xx_ac97_init); - -static void __exit ep93xx_ac97_exit(void) -{ - platform_driver_unregister(&ep93xx_ac97_driver); -} -module_exit(ep93xx_ac97_exit); +module_platform_driver(ep93xx_ac97_driver); MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver"); MODULE_AUTHOR("Mika Westerberg <mika.westerberg(a)iki.fi>"); diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index 099614e..274234b 100644 --- a/sound/soc/ep93xx/ep93xx-i2s.c +++ b/sound/soc/ep93xx/ep93xx-i2s.c @@ -464,18 +464,7 @@ static struct platform_driver ep93xx_i2s_driver = { }, }; -static int __init ep93xx_i2s_init(void) -{ - return platform_driver_register(&ep93xx_i2s_driver); -} - -static void __exit ep93xx_i2s_exit(void) -{ - platform_driver_unregister(&ep93xx_i2s_driver); -} - -module_init(ep93xx_i2s_init); -module_exit(ep93xx_i2s_exit); +module_platform_driver(ep93xx_i2s_driver); MODULE_ALIAS("platform:ep93xx-i2s"); MODULE_AUTHOR("Ryan Mallon"); diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c index 23de792..93ec013 100644 --- a/sound/soc/ep93xx/ep93xx-pcm.c +++ b/sound/soc/ep93xx/ep93xx-pcm.c @@ -339,18 +339,7 @@ static struct platform_driver ep93xx_pcm_driver = { .remove = __devexit_p(ep93xx_soc_platform_remove), }; -static int __init ep93xx_soc_platform_init(void) -{ - return platform_driver_register(&ep93xx_pcm_driver); -} - -static void __exit ep93xx_soc_platform_exit(void) -{ - platform_driver_unregister(&ep93xx_pcm_driver); -} - -module_init(ep93xx_soc_platform_init); -module_exit(ep93xx_soc_platform_exit); +module_platform_driver(ep93xx_pcm_driver); MODULE_AUTHOR("Ryan Mallon"); MODULE_DESCRIPTION("EP93xx ALSA PCM interface"); diff --git a/sound/soc/ep93xx/simone.c b/sound/soc/ep93xx/simone.c index 968cb31..1e00b33 100644 --- a/sound/soc/ep93xx/simone.c +++ b/sound/soc/ep93xx/simone.c @@ -81,17 +81,7 @@ static struct platform_driver simone_driver = { .remove = __devexit_p(simone_remove), }; -static int __init simone_init(void) -{ - return platform_driver_register(&simone_driver); -} -module_init(simone_init); - -static void __exit simone_exit(void) -{ - platform_driver_unregister(&simone_driver); -} -module_exit(simone_exit); +module_platform_driver(simone_driver); MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One"); MODULE_AUTHOR("Mika Westerberg <mika.westerberg(a)iki.fi>"); diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index 2cde433..33901d6 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c @@ -147,18 +147,7 @@ static struct platform_driver snappercl15_driver = { .remove = __devexit_p(snappercl15_remove), }; -static int __init snappercl15_init(void) -{ - return platform_driver_register(&snappercl15_driver); -} - -static void __exit snappercl15_exit(void) -{ - platform_driver_unregister(&snappercl15_driver); -} - -module_init(snappercl15_init); -module_exit(snappercl15_exit); +module_platform_driver(snappercl15_driver); MODULE_AUTHOR("Ryan Mallon"); MODULE_DESCRIPTION("ALSA SoC Snapper CL15"); -- 1.7.5.4

3 2