* [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() @ 2013-03-18 6:18 Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 01/53] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto, Kuninori Morimoto ` (54 more replies) 0 siblings, 55 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:18 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Hi Mark, Liam, Lars, Stephen These patches switch over to use snd_soc_register_component() instead of snd_soc_register_dai[s]() on all drivers Last patch moves snd_soc_[un]register_dai[s]() to non global function. I could compile test on some of them, but couldn't for all drivers These patches are based on asoc/topic/component branch Kuninori Morimoto (53): ASoC: switch over to use snd_soc_register_component() on atmel ssc ASoC: switch over to use snd_soc_register_component() on au1x i2sc ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s ASoC: switch over to use snd_soc_register_component() on au1x ac97c ASoC: switch over to use snd_soc_register_component() on bf6xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 ASoC: switch over to use snd_soc_register_component() on bf5xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx tdm ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 ASoC: switch over to use snd_soc_register_component() on ep93xx i2s ASoC: switch over to use snd_soc_register_component() on davinci i2s ASoC: switch over to use snd_soc_register_component() on davinci vcif ASoC: switch over to use snd_soc_register_component() on davinci mcasp ASoC: switch over to use snd_soc_register_component() on dw i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s ASoC: switch over to use snd_soc_register_component() on fsl ssi ASoC: switch over to use snd_soc_register_component() on imx ssi ASoC: switch over to use snd_soc_register_component() on jz4740 i2s ASoC: switch over to use snd_soc_register_component() on kirkwood i2s ASoC: switch over to use snd_soc_register_component() on sst ASoC: switch over to use snd_soc_register_component() on mxs saif ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 ASoC: switch over to use snd_soc_register_component() on omap mcbsp ASoC: switch over to use snd_soc_register_component() on omap mcpdm ASoC: switch over to use snd_soc_register_component() on omap dmic ASoC: switch over to use snd_soc_register_component() on omap hdmi ASoC: switch over to use snd_soc_register_component() on pxa ssp ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s ASoC: switch over to use snd_soc_register_component() on mmp sspa ASoC: switch over to use snd_soc_register_component() on s6000 i2s ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s ASoC: switch over to use snd_soc_register_component() on s3c i2s ASoC: switch over to use snd_soc_register_component() on s3c ac97 ASoC: switch over to use snd_soc_register_component() on samsung spdif ASoC: switch over to use snd_soc_register_component() on samsung i2s ASoC: switch over to use snd_soc_register_component() on samsung pcm ASoC: switch over to use snd_soc_register_component() on goni_wm8994 ASoC: switch over to use snd_soc_register_component() on sh4 ssi ASoC: switch over to use snd_soc_register_component() on sh4 siu ASoC: switch over to use snd_soc_register_component() on sh4 hac ASoC: switch over to use snd_soc_register_component() on spear spdif out ASoC: switch over to use snd_soc_register_component() on spear spdif in ASoC: switch over to use snd_soc_register_component() on tegra30 i2s ASoC: switch over to use snd_soc_register_component() on tegra20 spdif ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 ASoC: switch over to use snd_soc_register_component() on tegra20 i2s ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 ASoC: switch over to use snd_soc_register_component() on ux500 msp ASoC: snd_soc_[un]register_dai[s]() become non global function include/sound/soc-dai.h | 8 -------- sound/soc/atmel/atmel_ssc_dai.c | 11 ++++++++--- sound/soc/au1x/ac97c.c | 9 +++++++-- sound/soc/au1x/i2sc.c | 9 +++++++-- sound/soc/au1x/psc-ac97.c | 9 +++++++-- sound/soc/au1x/psc-i2s.c | 9 +++++++-- sound/soc/blackfin/bf5xx-ac97.c | 9 +++++++-- sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- sound/soc/blackfin/bf5xx-tdm.c | 9 +++++++-- sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- sound/soc/cirrus/ep93xx-i2s.c | 9 +++++++-- sound/soc/davinci/davinci-i2s.c | 15 ++++++++++----- sound/soc/davinci/davinci-mcasp.c | 15 ++++++++++----- sound/soc/davinci/davinci-vcif.c | 11 ++++++++--- sound/soc/dwc/designware_i2s.c | 9 +++++++-- sound/soc/fsl/fsl_ssi.c | 11 ++++++++--- sound/soc/fsl/imx-ssi.c | 11 ++++++++--- sound/soc/fsl/mpc5200_psc_ac97.c | 8 ++++++-- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +++++++-- sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++++--- sound/soc/mid-x86/sst_platform.c | 8 ++++++-- sound/soc/mxs/mxs-saif.c | 11 ++++++++--- sound/soc/nuc900/nuc900-ac97.c | 9 +++++++-- sound/soc/omap/omap-dmic.c | 9 +++++++-- sound/soc/omap/omap-hdmi.c | 9 +++++++-- sound/soc/omap/omap-mcbsp.c | 9 +++++++-- sound/soc/omap/omap-mcpdm.c | 9 +++++++-- sound/soc/pxa/mmp-sspa.c | 9 +++++++-- sound/soc/pxa/pxa-ssp.c | 9 +++++++-- sound/soc/pxa/pxa2xx-ac97.c | 11 +++++++---- sound/soc/pxa/pxa2xx-i2s.c | 9 +++++++-- sound/soc/s6000/s6000-i2s.c | 9 +++++++-- sound/soc/samsung/ac97.c | 12 ++++++++---- sound/soc/samsung/goni_wm8994.c | 11 ++++++++--- sound/soc/samsung/i2s.c | 14 ++++++++++---- sound/soc/samsung/pcm.c | 11 ++++++++--- sound/soc/samsung/s3c-i2s-v2.c | 9 +++++---- sound/soc/samsung/s3c-i2s-v2.h | 7 ++++--- sound/soc/samsung/s3c2412-i2s.c | 12 +++++++++--- sound/soc/samsung/s3c24xx-i2s.c | 11 ++++++++--- sound/soc/samsung/spdif.c | 11 ++++++++--- sound/soc/sh/hac.c | 10 +++++++--- sound/soc/sh/siu_dai.c | 11 ++++++++--- sound/soc/sh/ssi.c | 10 +++++++--- sound/soc/soc-core.c | 12 ++++-------- sound/soc/spear/spdif_in.c | 9 +++++++-- sound/soc/spear/spdif_out.c | 9 +++++++-- sound/soc/tegra/tegra20_ac97.c | 15 ++++++++++----- sound/soc/tegra/tegra20_i2s.c | 15 ++++++++++----- sound/soc/tegra/tegra20_spdif.c | 15 ++++++++++----- sound/soc/tegra/tegra30_i2s.c | 15 ++++++++++----- sound/soc/txx9/txx9aclc-ac97.c | 9 +++++++-- sound/soc/ux500/ux500_msp_dai.c | 13 +++++++++---- 55 files changed, 405 insertions(+), 165 deletions(-) ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 01/53] ASoC: switch over to use snd_soc_register_component() on atmel ssc 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto @ 2013-03-18 6:19 ` Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 02/53] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto, Kuninori Morimoto ` (53 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:19 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/atmel/atmel_ssc_dai.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index e13580d..1435f30 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -707,13 +707,18 @@ static struct snd_soc_dai_driver atmel_ssc_dai = { .ops = &atmel_ssc_dai_ops, }; +static const struct snd_soc_component_driver atmel_ssc_component = { + .name = "atmel-ssc", +}; + static int asoc_ssc_init(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct ssc_device *ssc = platform_get_drvdata(pdev); int ret; - ret = snd_soc_register_dai(dev, &atmel_ssc_dai); + ret = snd_soc_register_component(dev, &atmel_ssc_component, + &atmel_ssc_dai, 1); if (ret) { dev_err(dev, "Could not register DAI: %d\n", ret); goto err; @@ -732,7 +737,7 @@ static int asoc_ssc_init(struct device *dev) return 0; err_unregister_dai: - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); err: return ret; } @@ -747,7 +752,7 @@ static void asoc_ssc_exit(struct device *dev) else atmel_pcm_pdc_platform_unregister(dev); - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); } /** -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 02/53] ASoC: switch over to use snd_soc_register_component() on au1x i2sc 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 01/53] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:19 ` Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 03/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto, Kuninori Morimoto ` (52 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:19 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/i2sc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c index 072448a..b3f37f6 100644 --- a/sound/soc/au1x/i2sc.c +++ b/sound/soc/au1x/i2sc.c @@ -225,6 +225,10 @@ static struct snd_soc_dai_driver au1xi2s_dai_driver = { .ops = &au1xi2s_dai_ops, }; +static const struct snd_soc_component_driver au1xi2s_component = { + .name = "au1xi2s", +}; + static int au1xi2s_drvprobe(struct platform_device *pdev) { struct resource *iores, *dmares; @@ -260,14 +264,15 @@ static int au1xi2s_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); - return snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver); + return snd_soc_register_component(&pdev->dev, &au1xi2s_component, + &au1xi2s_dai_driver, 1); } static int au1xi2s_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); WR(ctx, I2S_ENABLE, EN_D); /* clock off, disable */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 03/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 01/53] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 02/53] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:20 ` Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 04/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto, Kuninori Morimoto ` (51 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:20 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/psc-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 6ba07e3..8f1862a 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = { .ops = &au1xpsc_ac97_dai_ops, }; +static const struct snd_soc_component_driver au1xpsc_ac97_component = { + .name = "au1xpsc-ac97", +}; + static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) { int ret; @@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, wd); - ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv); + ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component, + &wd->dai_drv, 1); if (ret) return ret; @@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); /* disable PSC completely */ au_writel(0, AC97_CFG(wd)); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 04/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (2 preceding siblings ...) 2013-03-18 6:20 ` [PATCH 03/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:20 ` Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 05/53] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto ` (50 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:20 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/psc-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 360b4e5..fe923a7 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -288,6 +288,10 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = { .ops = &au1xpsc_i2s_dai_ops, }; +static const struct snd_soc_component_driver au1xpsc_i2s_component = { + .name = "au1xpsc-i2s", +}; + static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) { struct resource *iores, *dmares; @@ -350,14 +354,15 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, wd); - return snd_soc_register_dai(&pdev->dev, &wd->dai_drv); + return snd_soc_register_component(&pdev->dev, &au1xpsc_i2s_component, + &wd->dai_drv, 1); } static int au1xpsc_i2s_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); au_writel(0, I2S_CFG(wd)); au_sync(); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 05/53] ASoC: switch over to use snd_soc_register_component() on au1x ac97c 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (3 preceding siblings ...) 2013-03-18 6:20 ` [PATCH 04/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto, Kuninori Morimoto @ 2013-03-18 6:20 ` Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 06/53] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto ` (49 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:20 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/ac97c.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index ea7d9d1..44b8dce 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -223,6 +223,10 @@ static struct snd_soc_dai_driver au1xac97c_dai_driver = { .ops = &alchemy_ac97c_ops, }; +static const struct snd_soc_component_driver au1xac97c_component = { + .name = "au1xac97c", +}; + static int au1xac97c_drvprobe(struct platform_device *pdev) { int ret; @@ -268,7 +272,8 @@ static int au1xac97c_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); - ret = snd_soc_register_dai(&pdev->dev, &au1xac97c_dai_driver); + ret = snd_soc_register_component(&pdev->dev, &au1xac97c_component, + &au1xac97c_dai_driver, 1); if (ret) return ret; @@ -280,7 +285,7 @@ static int au1xac97c_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); WR(ctx, AC97_ENABLE, EN_D); /* clock off, disable */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 06/53] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (4 preceding siblings ...) 2013-03-18 6:20 ` [PATCH 05/53] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto @ 2013-03-18 6:20 ` Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 07/53] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto ` (48 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:20 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c index 8f33797..c02405c 100644 --- a/sound/soc/blackfin/bf6xx-i2s.c +++ b/sound/soc/blackfin/bf6xx-i2s.c @@ -186,6 +186,10 @@ static struct snd_soc_dai_driver bfin_i2s_dai = { .ops = &bfin_i2s_dai_ops, }; +static const struct snd_soc_component_driver bfin_i2s_component = { + .name = "bfin-i2s", +}; + static int bfin_i2s_probe(struct platform_device *pdev) { struct sport_device *sport; @@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(dev, &bfin_i2s_dai); + ret = snd_soc_register_component(dev, &bfin_i2s_component, + &bfin_i2s_dai, 1); if (ret) { dev_err(dev, "Failed to register DAI: %d\n", ret); sport_delete(sport); @@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev) { struct sport_device *sport = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_delete(sport); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 07/53] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (5 preceding siblings ...) 2013-03-18 6:20 ` [PATCH 06/53] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto @ 2013-03-18 6:20 ` Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 08/53] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto ` (47 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:20 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 8e41bcb..4902173 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -282,6 +282,10 @@ static struct snd_soc_dai_driver bfin_ac97_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE, }, }; +static const struct snd_soc_component_driver bfin_ac97_component = { + .name = "bfin-ac97", +}; + static int asoc_bfin_ac97_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -331,7 +335,8 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) goto sport_config_err; } - ret = snd_soc_register_dai(&pdev->dev, &bfin_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component, + &bfin_ac97_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); goto sport_config_err; @@ -356,7 +361,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) { struct sport_device *sport_handle = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 08/53] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (6 preceding siblings ...) 2013-03-18 6:20 ` [PATCH 07/53] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto @ 2013-03-18 6:21 ` Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 09/53] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto ` (46 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:21 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 168d88b..dd0c2a4 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c @@ -245,6 +245,10 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = { .ops = &bf5xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver bf5xx_i2s_component = { + .name = "bf5xx-i2s", +}; + static int bf5xx_i2s_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -257,7 +261,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(&pdev->dev, &bf5xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &bf5xx_i2s_component, + &bf5xx_i2s_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); sport_done(sport_handle); @@ -273,7 +278,7 @@ static int bf5xx_i2s_remove(struct platform_device *pdev) pr_debug("%s enter\n", __func__); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 09/53] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (7 preceding siblings ...) 2013-03-18 6:21 ` [PATCH 08/53] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto @ 2013-03-18 6:21 ` Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 10/53] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto ` (45 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:21 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-tdm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index c1e516e..69e9a3e 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c @@ -249,6 +249,10 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = { .ops = &bf5xx_tdm_dai_ops, }; +static const struct snd_soc_component_driver bf5xx_tdm_component = { + .name = "bf5xx-tdm", +}; + static int bfin_tdm_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -282,7 +286,8 @@ static int bfin_tdm_probe(struct platform_device *pdev) goto sport_config_err; } - ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai); + ret = snd_soc_register_component(&pdev->dev, &bf5xx_tdm_component, + &bf5xx_tdm_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); goto sport_config_err; @@ -299,7 +304,7 @@ static int bfin_tdm_remove(struct platform_device *pdev) { struct sport_device *sport_handle = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 10/53] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (8 preceding siblings ...) 2013-03-18 6:21 ` [PATCH 09/53] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto @ 2013-03-18 6:21 ` Kuninori Morimoto 2013-03-18 6:22 ` [PATCH 11/53] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto ` (44 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:21 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 1738d28..e593c1e 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -353,6 +353,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = { .ops = &ep93xx_ac97_dai_ops, }; +static const struct snd_soc_component_driver ep93xx_ac97_component = { + .name = "ep93xx-ac97", +}; + static int ep93xx_ac97_probe(struct platform_device *pdev) { struct ep93xx_ac97_info *info; @@ -390,7 +394,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) ep93xx_ac97_info = info; platform_set_drvdata(pdev, info); - ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, + &ep93xx_ac97_dai, 1); if (ret) goto fail; @@ -407,7 +412,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) { struct ep93xx_ac97_info *info = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); /* disable the AC97 controller */ ep93xx_ac97_write_reg(info, AC97GCR, 0); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 11/53] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (9 preceding siblings ...) 2013-03-18 6:21 ` [PATCH 10/53] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto @ 2013-03-18 6:22 ` Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 12/53] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto ` (43 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:22 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/cirrus/ep93xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 323ed69..8d244be 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -366,6 +366,10 @@ static struct snd_soc_dai_driver ep93xx_i2s_dai = { .ops = &ep93xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver ep93xx_i2s_component = { + .name = "ep93xx-i2s", +}; + static int ep93xx_i2s_probe(struct platform_device *pdev) { struct ep93xx_i2s_info *info; @@ -405,7 +409,8 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); info->dma_params = ep93xx_i2s_dma_params; - err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai); + err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component, + &ep93xx_i2s_dai, 1); if (err) goto fail_put_lrclk; @@ -426,7 +431,7 @@ static int ep93xx_i2s_remove(struct platform_device *pdev) { struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(info->lrclk); clk_put(info->sclk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 12/53] ASoC: switch over to use snd_soc_register_component() on davinci i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (10 preceding siblings ...) 2013-03-18 6:22 ` [PATCH 11/53] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto @ 2013-03-18 6:23 ` Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 13/53] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto ` (42 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:23 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 8218312..ebe8294 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -645,6 +645,10 @@ static struct snd_soc_dai_driver davinci_i2s_dai = { }; +static const struct snd_soc_component_driver davinci_i2s_component = { + .name = "davinci-i2s", +}; + static int davinci_i2s_probe(struct platform_device *pdev) { struct snd_platform_data *pdata = pdev->dev.platform_data; @@ -727,20 +731,21 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &davinci_i2s_component, + &davinci_i2s_dai, 1); if (ret != 0) goto err_release_clk; ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_release_clk: clk_disable(dev->clk); clk_put(dev->clk); @@ -751,7 +756,7 @@ static int davinci_i2s_remove(struct platform_device *pdev) { struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); clk_disable(dev->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 13/53] ASoC: switch over to use snd_soc_register_component() on davinci vcif 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (11 preceding siblings ...) 2013-03-18 6:23 ` [PATCH 12/53] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto @ 2013-03-18 6:23 ` Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 14/53] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto ` (41 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:23 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-vcif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 07bde2e..30587c0 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -204,6 +204,10 @@ static struct snd_soc_dai_driver davinci_vcif_dai = { }; +static const struct snd_soc_component_driver davinci_vcif_component = { + .name = "davinci-vcif", +}; + static int davinci_vcif_probe(struct platform_device *pdev) { struct davinci_vc *davinci_vc = pdev->dev.platform_data; @@ -234,7 +238,8 @@ static int davinci_vcif_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, davinci_vcif_dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_vcif_dai); + ret = snd_soc_register_component(&pdev->dev, &davinci_vcif_component, + &davinci_vcif_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "could not register dai\n"); return ret; @@ -243,7 +248,7 @@ static int davinci_vcif_probe(struct platform_device *pdev) ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } @@ -252,7 +257,7 @@ static int davinci_vcif_probe(struct platform_device *pdev) static int davinci_vcif_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 14/53] ASoC: switch over to use snd_soc_register_component() on davinci mcasp 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (12 preceding siblings ...) 2013-03-18 6:23 ` [PATCH 13/53] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto @ 2013-03-18 6:23 ` Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 15/53] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto ` (40 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:23 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-mcasp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 9321e5c..c2e67f1 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -962,6 +962,10 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { }; +static const struct snd_soc_component_driver davinci_mcasp_component = { + .name = "davinci-mcasp", +}; + static const struct of_device_id mcasp_dt_ids[] = { { .compatible = "ti,dm646x-mcasp-audio", @@ -1170,7 +1174,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data->channel = res->start; dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]); + ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, + &davinci_mcasp_dai[pdata->op_mode], 1); if (ret != 0) goto err_release_clk; @@ -1178,13 +1183,13 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_release_clk: pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); @@ -1194,7 +1199,7 @@ err_release_clk: static int davinci_mcasp_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); pm_runtime_put_sync(&pdev->dev); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 15/53] ASoC: switch over to use snd_soc_register_component() on dw i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (13 preceding siblings ...) 2013-03-18 6:23 ` [PATCH 14/53] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto @ 2013-03-18 6:23 ` Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 16/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto ` (39 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:23 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/dwc/designware_i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index deb30d5..593a3ea1 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -297,6 +297,10 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = { .trigger = dw_i2s_trigger, }; +static const struct snd_soc_component_driver dw_i2s_component = { + .name = "dw-i2s", +}; + #ifdef CONFIG_PM static int dw_i2s_suspend(struct snd_soc_dai *dai) @@ -413,7 +417,8 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, dw_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, + dw_i2s_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "not able to register dai\n"); goto err_set_drvdata; @@ -434,7 +439,7 @@ static int dw_i2s_remove(struct platform_device *pdev) { struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(dev->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 16/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (14 preceding siblings ...) 2013-03-18 6:23 ` [PATCH 15/53] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto @ 2013-03-18 6:23 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 17/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto ` (38 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:23 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/mpc5200_psc_ac97.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index a4aec04..8c8ed79 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -270,6 +270,9 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = { .ops = &psc_ac97_digital_ops, } }; +static const struct snd_soc_component_driver psc_ac97_component = { + .name = "mpc5200-ac97", +}; /* --------------------------------------------------------------------- @@ -287,7 +290,8 @@ static int psc_ac97_of_probe(struct platform_device *op) if (rc != 0) return rc; - rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); + rc = snd_soc_register_component(&op->dev, &psc_ac97_component, + psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); if (rc != 0) { dev_err(&op->dev, "Failed to register DAI\n"); return rc; @@ -313,7 +317,7 @@ static int psc_ac97_of_probe(struct platform_device *op) static int psc_ac97_of_remove(struct platform_device *op) { mpc5200_audio_dma_destroy(op); - snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai)); + snd_soc_unregister_component(&op->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 17/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (15 preceding siblings ...) 2013-03-18 6:23 ` [PATCH 16/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 18/53] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto ` (37 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index b95b966..f4efaad 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -148,6 +148,10 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{ .ops = &psc_i2s_dai_ops, } }; +static const struct snd_soc_component_driver psc_i2s_component = { + .name = "mpc5200-i2s", +}; + /* --------------------------------------------------------------------- * OF platform bus binding code: * - Probe/remove operations @@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) if (rc != 0) return rc; - rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); + rc = snd_soc_register_component(&op->dev, &psc_i2s_component, + psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); if (rc != 0) { pr_err("Failed to register DAI\n"); return rc; @@ -208,7 +213,7 @@ static int psc_i2s_of_probe(struct platform_device *op) static int psc_i2s_of_remove(struct platform_device *op) { mpc5200_audio_dma_destroy(op); - snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai)); + snd_soc_unregister_component(&op->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 18/53] ASoC: switch over to use snd_soc_register_component() on fsl ssi 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (16 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 17/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 19/53] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto ` (36 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/fsl_ssi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 7decbd9..fe04c67 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -574,6 +574,10 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = { .ops = &fsl_ssi_dai_ops, }; +static const struct snd_soc_component_driver fsl_ssi_component = { + .name = "fsl-ssi", +}; + /* Show the statistics of a flag only if its interrupt is enabled. The * compiler will optimze this code to a no-op if the interrupt is not * enabled. @@ -782,7 +786,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) /* Register with ASoC */ dev_set_drvdata(&pdev->dev, ssi_private); - ret = snd_soc_register_dai(&pdev->dev, &ssi_private->cpu_dai_drv); + ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component, + &ssi_private->cpu_dai_drv, 1); if (ret) { dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); goto error_dev; @@ -835,7 +840,7 @@ done: error_dai: if (ssi_private->ssi_on_imx) platform_device_unregister(ssi_private->imx_pcm_pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); error_dev: dev_set_drvdata(&pdev->dev, NULL); @@ -873,7 +878,7 @@ static int fsl_ssi_remove(struct platform_device *pdev) clk_disable_unprepare(ssi_private->clk); clk_put(ssi_private->clk); } - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); device_remove_file(&pdev->dev, &ssi_private->dev_attr); free_irq(ssi_private->irq, ssi_private); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 19/53] ASoC: switch over to use snd_soc_register_component() on imx ssi 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (17 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 18/53] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 20/53] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto ` (35 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/imx-ssi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 55464a5..0578b64 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -413,6 +413,10 @@ static struct snd_soc_dai_driver imx_ac97_dai = { .ops = &imx_ssi_pcm_dai_ops, }; +static const struct snd_soc_component_driver imx_component = { + .name = "imx-ssi", +}; + static void setup_channel_to_ac97(struct imx_ssi *imx_ssi) { void __iomem *base = imx_ssi->base; @@ -586,7 +590,8 @@ static int imx_ssi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ssi); - ret = snd_soc_register_dai(&pdev->dev, dai); + ret = snd_soc_register_component(&pdev->dev, &imx_component, + dai, 1); if (ret) { dev_err(&pdev->dev, "register DAI failed\n"); goto failed_register; @@ -627,7 +632,7 @@ failed_pdev_alloc: failed_pdev_fiq_add: platform_device_put(ssi->soc_platform_pdev_fiq); failed_pdev_fiq_alloc: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); failed_register: release_mem_region(res->start, resource_size(res)); failed_get_resource: @@ -645,7 +650,7 @@ static int imx_ssi_remove(struct platform_device *pdev) platform_device_unregister(ssi->soc_platform_pdev); platform_device_unregister(ssi->soc_platform_pdev_fiq); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (ssi->flags & IMX_SSI_USE_AC97) ac97_ssi = NULL; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 20/53] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (18 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 19/53] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 21/53] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto ` (34 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 6cef491..9a12644 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = { .resume = jz4740_i2s_resume, }; +static const struct snd_soc_component_driver jz4740_i2s_component = { + .name = "jz4740-i2s", +}; + static int jz4740_i2s_dev_probe(struct platform_device *pdev) { struct jz4740_i2s *i2s; @@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, i2s); - ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component, + &jz4740_i2s_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register DAI\n"); @@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev) { struct jz4740_i2s *i2s = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); clk_put(i2s->clk_aic); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 21/53] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (19 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 20/53] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 22/53] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto ` (33 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index c74c890..42bfbf4 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = { .ops = &kirkwood_i2s_dai_ops, }; +static const struct snd_soc_component_driver kirkwood_i2s_component = { + .name = "kirkwood-i2s", +}; + static int kirkwood_i2s_dev_probe(struct platform_device *pdev) { struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data; @@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128; } - err = snd_soc_register_dai(&pdev->dev, soc_dai); + err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component, + soc_dai, 1); if (!err) return 0; - dev_err(&pdev->dev, "snd_soc_register_dai failed\n"); + dev_err(&pdev->dev, "snd_soc_register_component failed\n"); if (!IS_ERR(priv->extclk)) { clk_disable_unprepare(priv->extclk); @@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) { struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (!IS_ERR(priv->extclk)) { clk_disable_unprepare(priv->extclk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 22/53] ASoC: switch over to use snd_soc_register_component() on sst 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (20 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 21/53] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 23/53] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto ` (32 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/mid-x86/sst_platform.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index a263cbe..31a829c 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c @@ -165,6 +165,10 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { }, }; +static const struct snd_soc_component_driver sst_component = { + .name = "sst", +}; + /* helper functions */ static inline void sst_set_stream_status(struct sst_runtime_stream *stream, int state) @@ -683,7 +687,7 @@ static int sst_platform_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_register_dais(&pdev->dev, + ret = snd_soc_register_component(&pdev->dev, &sst_component, sst_platform_dai, ARRAY_SIZE(sst_platform_dai)); if (ret) { pr_err("registering cpu dais failed\n"); @@ -695,7 +699,7 @@ static int sst_platform_probe(struct platform_device *pdev) static int sst_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); + snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); pr_debug("sst_platform_remove success\n"); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 23/53] ASoC: switch over to use snd_soc_register_component() on mxs saif 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (21 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 22/53] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto @ 2013-03-18 6:24 ` Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 24/53] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto ` (31 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:24 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/mxs/mxs-saif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 3a2aa1d..3e78ba8 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -627,6 +627,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = { .ops = &mxs_saif_dai_ops, }; +static const struct snd_soc_component_driver mxs_saif_component = { + .name = "mxs-saif", +}; + static irqreturn_t mxs_saif_irq(int irq, void *dev_id) { struct mxs_saif *saif = dev_id; @@ -763,7 +767,8 @@ static int mxs_saif_probe(struct platform_device *pdev) platform_set_drvdata(pdev, saif); - ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai); + ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component, + &mxs_saif_dai, 1); if (ret) { dev_err(&pdev->dev, "register DAI failed\n"); return ret; @@ -778,7 +783,7 @@ static int mxs_saif_probe(struct platform_device *pdev) return 0; failed_pdev_alloc: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } @@ -786,7 +791,7 @@ failed_pdev_alloc: static int mxs_saif_remove(struct platform_device *pdev) { mxs_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 24/53] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (22 preceding siblings ...) 2013-03-18 6:24 ` [PATCH 23/53] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto @ 2013-03-18 6:25 ` Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto ` (30 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:25 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/nuc900/nuc900-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 0418467..fe3285c 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { .ops = &nuc900_ac97_dai_ops, }; +static const struct snd_soc_component_driver nuc900_ac97_component = { + .name = "nuc900-ac97", +}; + static int nuc900_ac97_drvprobe(struct platform_device *pdev) { struct nuc900_audio *nuc900_audio; @@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) nuc900_ac97_data = nuc900_audio; - ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component, + &nuc900_ac97_dai, 1); if (ret) goto out3; @@ -384,7 +389,7 @@ out0: static int nuc900_ac97_drvremove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(nuc900_ac97_data->clk); iounmap(nuc900_ac97_data->mmio); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (23 preceding siblings ...) 2013-03-18 6:25 ` [PATCH 24/53] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto @ 2013-03-18 6:25 ` Kuninori Morimoto 2013-03-19 12:36 ` Peter Ujfalusi 2013-03-18 6:25 ` [PATCH 26/53] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto ` (29 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:25 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-mcbsp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 8d2defd..f51685d 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -586,6 +586,10 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = { .ops = &mcbsp_dai_ops, }; +static const struct snd_soc_component_driver omap_mcbsp_component = { + .name = "omap-mcbsp", +}; + static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -793,7 +797,8 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) ret = omap_mcbsp_init(pdev); if (!ret) - return snd_soc_register_dai(&pdev->dev, &omap_mcbsp_dai); + return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, + &omap_mcbsp_dai, 1); return ret; } @@ -802,7 +807,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) { struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp 2013-03-18 6:25 ` [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto @ 2013-03-19 12:36 ` Peter Ujfalusi 0 siblings, 0 replies; 139+ messages in thread From: Peter Ujfalusi @ 2013-03-19 12:36 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto On 03/18/2013 07:25 AM, Kuninori Morimoto wrote: > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > sound/soc/omap/omap-mcbsp.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c > index 8d2defd..f51685d 100644 > --- a/sound/soc/omap/omap-mcbsp.c > +++ b/sound/soc/omap/omap-mcbsp.c > @@ -586,6 +586,10 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = { > .ops = &mcbsp_dai_ops, > }; > > +static const struct snd_soc_component_driver omap_mcbsp_component = { > + .name = "omap-mcbsp", > +}; > + > static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, > struct snd_ctl_elem_info *uinfo) > { > @@ -793,7 +797,8 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) > > ret = omap_mcbsp_init(pdev); > if (!ret) > - return snd_soc_register_dai(&pdev->dev, &omap_mcbsp_dai); > + return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, > + &omap_mcbsp_dai, 1); This certainly breaks OMAP audio without the 'ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]()' patch sent within the thread. But the comment from Lars stands for the users who registers 1 dai with snd_soc_register_dais() call. On the other hand I'm not sure what is the long time aim with the snd_soc_register_component(). In essence it is just a wrapper for snd_soc_register_dai/s() without any advantage, except that we register the DAIs with a new api which does not give clue what it is doing. Or is the aim is to eventually merge the snd_soc_codec_driver struct into snd_soc_component_driver struct and use the same structure for the CPU/DAI and CODEC/DAI registration and share the same code to do it? I'm sure this had been discussed at some conference but unfortunately I could not attend to them lately. All in all this is not going to break OMAP, but as of now I don't know the reasoning why this is a good thing... > return ret; > } > @@ -802,7 +807,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) > { > struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > > - snd_soc_unregister_dai(&pdev->dev); > + snd_soc_unregister_component(&pdev->dev); > > if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) > mcbsp->pdata->ops->free(mcbsp->id); > -- Péter ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 26/53] ASoC: switch over to use snd_soc_register_component() on omap mcpdm 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (24 preceding siblings ...) 2013-03-18 6:25 ` [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto @ 2013-03-18 6:25 ` Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 27/53] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto ` (28 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:25 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-mcpdm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 5ca11bd..4cc9807 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -420,6 +420,10 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = { .ops = &omap_mcpdm_dai_ops, }; +static const struct snd_soc_component_driver omap_mcpdm_component = { + .name = "omap-mcpdm", +}; + void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd, u8 rx1, u8 rx2) { @@ -480,12 +484,13 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) mcpdm->dev = &pdev->dev; - return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); + return snd_soc_register_component(&pdev->dev, &omap_mcpdm_component, + &omap_mcpdm_dai, 1); } static int asoc_mcpdm_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 27/53] ASoC: switch over to use snd_soc_register_component() on omap dmic 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (25 preceding siblings ...) 2013-03-18 6:25 ` [PATCH 26/53] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto @ 2013-03-18 6:25 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 28/53] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto ` (27 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:25 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-dmic.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index ba49ccd..4c54542 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -448,6 +448,10 @@ static struct snd_soc_dai_driver omap_dmic_dai = { .ops = &omap_dmic_dai_ops, }; +static const struct snd_soc_component_driver omap_dmic_component = { + .name = "omap-dmic", +}; + static int asoc_dmic_probe(struct platform_device *pdev) { struct omap_dmic *dmic; @@ -507,7 +511,8 @@ static int asoc_dmic_probe(struct platform_device *pdev) goto err_put_clk; } - ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); + ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component, + &omap_dmic_dai, 1); if (ret) goto err_put_clk; @@ -522,7 +527,7 @@ static int asoc_dmic_remove(struct platform_device *pdev) { struct omap_dmic *dmic = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(dmic->fclk); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 28/53] ASoC: switch over to use snd_soc_register_component() on omap hdmi 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (26 preceding siblings ...) 2013-03-18 6:25 ` [PATCH 27/53] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 29/53] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto ` (26 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-hdmi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index 32fa840..f45dfd9 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -264,6 +264,10 @@ static struct snd_soc_dai_driver omap_hdmi_dai = { .ops = &omap_hdmi_dai_ops, }; +static const struct snd_soc_component_driver omap_hdmi_component = { + .name = "omap-hdmi", +}; + static int omap_hdmi_probe(struct platform_device *pdev) { int ret; @@ -321,7 +325,8 @@ static int omap_hdmi_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_dai(&pdev->dev, &omap_hdmi_dai); + ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, + &omap_hdmi_dai, 1); return ret; } @@ -330,7 +335,7 @@ static int omap_hdmi_remove(struct platform_device *pdev) { struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (hdmi_data == NULL) { dev_err(&pdev->dev, "cannot obtain HDMi data\n"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 29/53] ASoC: switch over to use snd_soc_register_component() on pxa ssp 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (27 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 28/53] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 30/53] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto ` (25 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa-ssp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index d3eb0c2..6f4dd75 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -794,14 +794,19 @@ static struct snd_soc_dai_driver pxa_ssp_dai = { .ops = &pxa_ssp_dai_ops, }; +static const struct snd_soc_component_driver pxa_ssp_component = { + .name = "pxa-ssp", +}; + static int asoc_ssp_probe(struct platform_device *pdev) { - return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai); + return snd_soc_register_component(&pdev->dev, &pxa_ssp_component, + &pxa_ssp_dai, 1); } static int asoc_ssp_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 30/53] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (28 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 29/53] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 31/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto ` (24 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-ac97.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 4b0a009..88d2cc6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -47,6 +47,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = { .warm_reset = pxa2xx_ac97_warm_reset, .reset = pxa2xx_ac97_cold_reset, }; +EXPORT_SYMBOL_GPL(soc_ac97_ops); static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = { .name = "AC97 PCM Stereo out", @@ -232,8 +233,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { }, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); - static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { if (pdev->id != -1) { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 31/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (29 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 30/53] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 32/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto ` (23 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-ac97.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 88d2cc6..57ea8e6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -233,6 +233,10 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { }, }; +static const struct snd_soc_component_driver pxa_ac97_component = { + .name = "pxa-ac97", +}; + static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { if (pdev->id != -1) { @@ -244,13 +248,13 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) * driver to do interesting things with the clocking to get us up * and running. */ - return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver, - ARRAY_SIZE(pxa_ac97_dai_driver)); + return snd_soc_register_component(&pdev->dev, &pxa_ac97_component, + pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver)); } static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 32/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (30 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 31/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 33/53] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto ` (22 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 6b1a06f..f7ca716 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -360,14 +360,19 @@ static struct snd_soc_dai_driver pxa_i2s_dai = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver pxa_i2s_component = { + .name = "pxa-i2s", +}; + static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) { - return snd_soc_register_dai(&pdev->dev, &pxa_i2s_dai); + return snd_soc_register_component(&pdev->dev, &pxa_i2s_component, + &pxa_i2s_dai, 1); } static int pxa2xx_i2s_drv_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 33/53] ASoC: switch over to use snd_soc_register_component() on mmp sspa 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (31 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 32/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto @ 2013-03-18 6:26 ` Kuninori Morimoto 2013-03-18 6:27 ` [PATCH 34/53] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto ` (21 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:26 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/mmp-sspa.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 9140c4a..a647799 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -405,6 +405,10 @@ struct snd_soc_dai_driver mmp_sspa_dai = { .ops = &mmp_sspa_dai_ops, }; +static const struct snd_soc_component_driver mmp_sspa_component = { + .name = "mmp-sspa", +}; + static int asoc_mmp_sspa_probe(struct platform_device *pdev) { struct sspa_priv *priv; @@ -450,7 +454,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) priv->dai_fmt = (unsigned int) -1; platform_set_drvdata(pdev, priv); - return snd_soc_register_dai(&pdev->dev, &mmp_sspa_dai); + return snd_soc_register_component(&pdev->dev, &mmp_sspa_component, + &mmp_sspa_dai, 1); } static int asoc_mmp_sspa_remove(struct platform_device *pdev) @@ -460,7 +465,7 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev) clk_disable(priv->audio_clk); clk_put(priv->audio_clk); clk_put(priv->sysclk); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 34/53] ASoC: switch over to use snd_soc_register_component() on s6000 i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (32 preceding siblings ...) 2013-03-18 6:26 ` [PATCH 33/53] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto @ 2013-03-18 6:27 ` Kuninori Morimoto 2013-03-18 6:27 ` [PATCH 35/53] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto ` (20 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:27 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/s6000/s6000-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index fee4d47..73bb99f 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { .ops = &s6000_i2s_dai_ops, }; +static const struct snd_soc_component_driver s6000_i2s_component = { + .name = "s6000-i2s", +}; + static int s6000_i2s_probe(struct platform_device *pdev) { struct s6000_i2s_dev *dev; @@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev) S6_I2S_INT_UNDERRUN | S6_I2S_INT_OVERRUN); - ret = snd_soc_register_dai(&pdev->dev, &s6000_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &s6000_i2s_component, + &s6000_i2s_dai, 1); if (ret) goto err_release_dev; @@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev) struct resource *region; void __iomem *mmio = dev->scbbase; - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); s6000_i2s_stop_channel(dev, 0); s6000_i2s_stop_channel(dev, 1); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 35/53] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (33 preceding siblings ...) 2013-03-18 6:27 ` [PATCH 34/53] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto @ 2013-03-18 6:27 ` Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 01/18] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto ` (19 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:27 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/s3c24xx-i2s.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 13f6dd1..5403176 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -465,11 +465,16 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = { .ops = &s3c24xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver s3c24xx_i2s_component = { + .name = "s3c24xx-i2s", +}; + static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, + &s3c24xx_i2s_dai, 1); if (ret) { pr_err("failed to register the dai\n"); return ret; @@ -483,14 +488,14 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return 0; err: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } static int s3c24xx_iis_dev_remove(struct platform_device *pdev) { asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 01/18] ASoC: switch over to use snd_soc_register_component() on s3c i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (34 preceding siblings ...) 2013-03-18 6:27 ` [PATCH 35/53] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto @ 2013-03-18 6:33 ` Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 37/53] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto ` (18 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:33 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/s3c-i2s-v2.c | 9 +++++---- sound/soc/samsung/s3c-i2s-v2.h | 7 ++++--- sound/soc/samsung/s3c2412-i2s.c | 12 +++++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index 7a73380..20e98d1 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -731,8 +731,9 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai) #define s3c2412_i2s_resume NULL #endif -int s3c_i2sv2_register_dai(struct device *dev, int id, - struct snd_soc_dai_driver *drv) +int s3c_i2sv2_register_component(struct device *dev, int id, + struct snd_soc_component_driver *cmp_drv, + struct snd_soc_dai_driver *dai_drv) { struct snd_soc_dai_ops *ops = drv->ops; @@ -750,8 +751,8 @@ int s3c_i2sv2_register_dai(struct device *dev, int id, drv->suspend = s3c2412_i2s_suspend; drv->resume = s3c2412_i2s_resume; - return snd_soc_register_dai(dev, drv); + return snd_soc_register_component(dev, cmp_drv, dai_drv, 1); } -EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); +EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component); MODULE_LICENSE("GPL"); diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h index f8297d9..90abab3 100644 --- a/sound/soc/samsung/s3c-i2s-v2.h +++ b/sound/soc/samsung/s3c-i2s-v2.h @@ -92,7 +92,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, unsigned long base); /** - * s3c_i2sv2_register_dai - register dai with soc core + * s3c_i2sv2_register_component - register component and dai with soc core * @dev: DAI device * @id: DAI ID * @drv: The driver structure to register @@ -100,7 +100,8 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, * Fill in any missing fields and then register the given dai with the * soc core. */ -extern int s3c_i2sv2_register_dai(struct device *dev, int id, - struct snd_soc_dai_driver *drv); +extern int s3c_i2sv2_register_component(struct device *dev, int id, + struct snd_soc_component_driver *cmp_drv, + struct snd_soc_dai_driver *dai_drv); #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */ diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 2213377..47e2386 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -160,11 +160,17 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = { .ops = &s3c2412_i2s_dai_ops, }; +static const struct snd_soc_component_driver s3c2412_i2s_component = { + .name = "s3c2412-i2s", +}; + static int s3c2412_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai); + ret = s3c_i2sv2_register_component(&pdev->dev, -1, + &s3c2412_i2s_component, + &s3c2412_i2s_dai); if (ret) { pr_err("failed to register the dai\n"); return ret; @@ -178,14 +184,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) return 0; err: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } static int s3c2412_iis_dev_remove(struct platform_device *pdev) { asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 37/53] ASoC: switch over to use snd_soc_register_component() on s3c ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (35 preceding siblings ...) 2013-03-18 6:33 ` [PATCH 01/18] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto @ 2013-03-18 6:33 ` Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 38/53] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto ` (17 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:33 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/ac97.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 0df3c56..32ff594 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -370,6 +370,10 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { }, }; +static const struct snd_soc_component_driver s3c_ac97_component = { + .name = "s3c-ac97", +}; + static int s3c_ac97_probe(struct platform_device *pdev) { struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res; @@ -457,8 +461,8 @@ static int s3c_ac97_probe(struct platform_device *pdev) goto err4; } - ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai, - ARRAY_SIZE(s3c_ac97_dai)); + ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component, + s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai)); if (ret) goto err5; @@ -470,7 +474,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) return 0; err6: - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); + snd_soc_unregister_component(&pdev->dev); err5: free_irq(irq_res->start, NULL); err4: @@ -490,7 +494,7 @@ static int s3c_ac97_remove(struct platform_device *pdev) struct resource *mem_res, *irq_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); + snd_soc_unregister_component(&pdev->dev); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (irq_res) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 38/53] ASoC: switch over to use snd_soc_register_component() on samsung spdif 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (36 preceding siblings ...) 2013-03-18 6:33 ` [PATCH 37/53] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto @ 2013-03-18 6:33 ` Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 39/53] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto ` (16 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:33 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/spdif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5008e5b..2e5ebb2 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -357,6 +357,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = { .resume = spdif_resume, }; +static const struct snd_soc_component_driver samsung_spdif_component = { + .name = "samsung-spdif", +}; + static int spdif_probe(struct platform_device *pdev) { struct s3c_audio_pdata *spdif_pdata; @@ -424,7 +428,8 @@ static int spdif_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, spdif); - ret = snd_soc_register_dai(&pdev->dev, &samsung_spdif_dai); + ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component, + &samsung_spdif_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "fail to register dai\n"); goto err4; @@ -445,7 +450,7 @@ static int spdif_probe(struct platform_device *pdev) return 0; err5: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); err4: iounmap(spdif->regs); err3: @@ -466,7 +471,7 @@ static int spdif_remove(struct platform_device *pdev) struct resource *mem_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(spdif->regs); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 39/53] ASoC: switch over to use snd_soc_register_component() on samsung i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (37 preceding siblings ...) 2013-03-18 6:33 ` [PATCH 38/53] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto @ 2013-03-18 6:33 ` Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 40/53] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto ` (15 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:33 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/i2s.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index d7231e3..efa7314 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -963,6 +963,10 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = { .delay = i2s_delay, }; +static const struct snd_soc_component_driver samsung_i2s_component = { + .name = "samsung-i2s", +}; + #define SAMSUNG_I2S_RATES SNDRV_PCM_RATE_8000_96000 #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ @@ -1107,8 +1111,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (samsung_dai_type == TYPE_SEC) { sec_dai = dev_get_drvdata(&pdev->dev); - snd_soc_register_dai(&sec_dai->pdev->dev, - &sec_dai->i2s_dai_drv); + snd_soc_register_component(&sec_dai->pdev->dev, + &samsung_i2s_component, + &sec_dai->i2s_dai_drv, 1); asoc_dma_platform_register(&pdev->dev); return 0; } @@ -1237,7 +1242,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) } } - snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv); + snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component, + &pri_dai->i2s_dai_drv, 1); pm_runtime_enable(&pdev->dev); @@ -1276,7 +1282,7 @@ static int samsung_i2s_remove(struct platform_device *pdev) i2s->sec_dai = NULL; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 40/53] ASoC: switch over to use snd_soc_register_component() on samsung pcm 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (38 preceding siblings ...) 2013-03-18 6:33 ` [PATCH 39/53] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto @ 2013-03-18 6:33 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 41/53] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto ` (14 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:33 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/pcm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 13bab79..1566afe 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -490,6 +490,10 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = { }, }; +static const struct snd_soc_component_driver s3c_pcm_component = { + .name = "s3c-pcm", +}; + static int s3c_pcm_dev_probe(struct platform_device *pdev) { struct s3c_pcm_info *pcm; @@ -583,7 +587,8 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); - ret = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]); + ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component, + &s3c_pcm_dai[pdev->id], 1); if (ret != 0) { dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); goto err5; @@ -598,7 +603,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) return 0; err6: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); err5: clk_disable_unprepare(pcm->pclk); clk_put(pcm->pclk); @@ -619,7 +624,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) struct resource *mem_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 41/53] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (39 preceding siblings ...) 2013-03-18 6:33 ` [PATCH 40/53] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 42/53] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto ` (13 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/goni_wm8994.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index d37ede5..415ad81 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c @@ -218,6 +218,10 @@ static struct snd_soc_dai_driver voice_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE,}, }; +static const struct snd_soc_component_driver voice_component = { + .name = "goni-voice", +}; + static struct snd_soc_ops goni_voice_ops = { .hw_params = goni_voice_hw_params, }; @@ -270,7 +274,8 @@ static int __init goni_init(void) return -ENOMEM; /* register voice DAI here */ - ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai); + ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component, + &voice_dai, 1); if (ret) { platform_device_put(goni_snd_device); return ret; @@ -280,7 +285,7 @@ static int __init goni_init(void) ret = platform_device_add(goni_snd_device); if (ret) { - snd_soc_unregister_dai(&goni_snd_device->dev); + snd_soc_unregister_component(&goni_snd_device->dev); platform_device_put(goni_snd_device); } @@ -289,7 +294,7 @@ static int __init goni_init(void) static void __exit goni_exit(void) { - snd_soc_unregister_dai(&goni_snd_device->dev); + snd_soc_unregister_component(&goni_snd_device->dev); platform_device_unregister(goni_snd_device); } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 42/53] ASoC: switch over to use snd_soc_register_component() on sh4 ssi 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (40 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 41/53] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 43/53] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto ` (12 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/ssi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index c8e73a7..e889405 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c @@ -379,15 +379,19 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = { #endif }; +static const struct snd_soc_component_driver sh4_ssi_component = { + .name = "sh4-ssi", +}; + static int sh4_soc_dai_probe(struct platform_device *pdev) { - return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, - ARRAY_SIZE(sh4_ssi_dai)); + return snd_soc_register_component(&pdev->dev, &sh4_ssi_component, + sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai)); } static int sh4_soc_dai_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 43/53] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (41 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 42/53] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 44/53] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto ` (11 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/siu_dai.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 34facdc..9dc24ff 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = { .ops = &siu_dai_ops, }; +static const struct snd_soc_component_driver siu_i2s_component = { + .name = "siu-i2s", +}; + static int siu_probe(struct platform_device *pdev) { const struct firmware *fw_entry; @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); /* register using ARRAY version so we can keep dai name */ - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, + &siu_i2s_dai, 1); if (ret < 0) goto edaiinit; @@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev) return ret; esocregp: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); edaiinit: iounmap(info->reg); emapreg: @@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(info->reg); iounmap(info->yram); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 44/53] ASoC: switch over to use snd_soc_register_component() on sh4 hac 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (42 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 43/53] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 45/53] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto ` (10 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/hac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 4cc2d64..af19f77 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -310,15 +310,19 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = { #endif }; +static const struct snd_soc_component_driver sh4_hac_component = { + .name = "sh4-hac", +}; + static int hac_soc_platform_probe(struct platform_device *pdev) { - return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, - ARRAY_SIZE(sh4_hac_dai)); + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, + sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); } static int hac_soc_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 45/53] ASoC: switch over to use snd_soc_register_component() on spear spdif out 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (43 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 44/53] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 46/53] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto ` (9 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/spear/spdif_out.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index 5eac4cd..1e3c3dd 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -270,6 +270,10 @@ static struct snd_soc_dai_driver spdif_out_dai = { .ops = &spdif_out_dai_ops, }; +static const struct snd_soc_component_driver spdif_out_component = { + .name = "spdif-out", +}; + static int spdif_out_probe(struct platform_device *pdev) { struct spdif_out_dev *host; @@ -314,7 +318,8 @@ static int spdif_out_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, host); - ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai); + ret = snd_soc_register_component(&pdev->dev, &spdif_out_component, + &spdif_out_dai, 1); if (ret != 0) { clk_put(host->clk); return ret; @@ -327,7 +332,7 @@ static int spdif_out_remove(struct platform_device *pdev) { struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(host->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 46/53] ASoC: switch over to use snd_soc_register_component() on spear spdif in 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (44 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 45/53] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto ` (8 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/spear/spdif_in.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index c7c4b20..14d57e8 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -170,6 +170,10 @@ struct snd_soc_dai_driver spdif_in_dai = { .ops = &spdif_in_dai_ops, }; +static const struct snd_soc_component_driver spdif_in_component = { + .name = "spdif-in", +}; + static irqreturn_t spdif_in_irq(int irq, void *arg) { struct spdif_in_dev *host = (struct spdif_in_dev *)arg; @@ -258,7 +262,8 @@ static int spdif_in_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_register_dai(&pdev->dev, &spdif_in_dai); + ret = snd_soc_register_component(&pdev->dev, &spdif_in_component, + &spdif_in_dai, 1); if (ret != 0) { clk_put(host->clk); return ret; @@ -271,7 +276,7 @@ static int spdif_in_remove(struct platform_device *pdev) { struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(host->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (45 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 46/53] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto @ 2013-03-18 6:34 ` Kuninori Morimoto 2013-03-18 15:39 ` Stephen Warren 2013-03-18 6:35 ` [PATCH 48/53] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto ` (7 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:34 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra30_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index f4e1ce8..2334497 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -336,6 +336,10 @@ static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver tegra30_i2s_component = { + .name = "tegra30-i2s", +}; + static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -464,7 +468,8 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &i2s->dai); + ret = snd_soc_register_component(&pdev->dev, &tegra30_i2s_component, + &i2s->dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -474,13 +479,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra30_i2s_runtime_suspend(&pdev->dev); @@ -501,7 +506,7 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev) tegra30_i2s_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s 2013-03-18 6:34 ` [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto @ 2013-03-18 15:39 ` Stephen Warren 0 siblings, 0 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-18 15:39 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto On 03/18/2013 12:34 AM, Kuninori Morimoto wrote: > diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c > +static const struct snd_soc_component_driver tegra30_i2s_component = { > + .name = "tegra30-i2s", For all the Tegra files, that should really be: .name = DRV_NAME, >From a brief grep, the same comment /might/ apply to omap/omap-hdmi.c and fsl/mpc5200_psc_ac97.c. But aside from that, these patches look fine. ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 48/53] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (46 preceding siblings ...) 2013-03-18 6:34 ` [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 49/53] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto ` (6 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_spdif.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 04771d1..430afb9 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -182,6 +182,10 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = { .ops = &tegra20_spdif_dai_ops, }; +static const struct snd_soc_component_driver tegra20_spdif_component = { + .name = "tegra20-spdif", +}; + static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -329,7 +333,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &tegra20_spdif_dai); + ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component, + &tegra20_spdif_dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -339,13 +344,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_spdif_runtime_suspend(&pdev->dev); @@ -366,7 +371,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev) tegra20_spdif_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(spdif->clk_spdif_out); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 49/53] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (47 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 48/53] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 50/53] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto ` (5 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_ac97.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 336dcdd..78078a7 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -248,6 +248,10 @@ static struct snd_soc_dai_driver tegra20_ac97_dai = { .ops = &tegra20_ac97_dai_ops, }; +static const struct snd_soc_component_driver tegra20_ac97_component = { + .name = "tegra20-ac97", +}; + static bool tegra20_ac97_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -398,7 +402,8 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ac97->playback_dma_data.width = 32; ac97->playback_dma_data.req_sel = of_dma[1]; - ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, + &tegra20_ac97_dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -408,7 +413,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); @@ -434,8 +439,8 @@ err_asoc_utils_fini: tegra_asoc_utils_fini(&ac97->util_data); err_unregister_pcm: tegra_pcm_platform_unregister(&pdev->dev); -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_clk_put: clk_put(ac97->clk_ac97); err: @@ -447,7 +452,7 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev) struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); tegra_asoc_utils_fini(&ac97->util_data); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 50/53] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (48 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 49/53] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 51/53] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto ` (4 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index caa772d..c051cc4 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -276,6 +276,10 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver tegra20_i2s_component = { + .name = "tegra20-i2s", +}; + static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -419,7 +423,8 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &i2s->dai); + ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component, + &i2s->dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -429,13 +434,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_i2s_runtime_suspend(&pdev->dev); @@ -456,7 +461,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev) tegra20_i2s_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 51/53] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (49 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 50/53] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 52/53] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto ` (3 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/txx9/txx9aclc-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 16ab696..8a28403 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -170,6 +170,10 @@ static struct snd_soc_dai_driver txx9aclc_ac97_dai = { }, }; +static const struct snd_soc_component_driver txx9aclc_ac97_component = { + .name = "txx9aclc-ac97", +}; + static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) { struct txx9aclc_plat_drvdata *drvdata; @@ -205,12 +209,13 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (err < 0) return err; - return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai); + return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component, + &txx9aclc_ac97_dai, 1); } static int txx9aclc_ac97_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 52/53] ASoC: switch over to use snd_soc_register_component() on ux500 msp 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (50 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 51/53] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 53/53] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto ` (2 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/ux500/ux500_msp_dai.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 94a3e57..f1e8a5e 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -768,6 +768,11 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = { }, }; +static const struct snd_soc_component_driver ux500_msp_component = { + .name = "ux500-msp", +}; + + static int ux500_msp_drv_probe(struct platform_device *pdev) { struct ux500_msp_i2s_drvdata *drvdata; @@ -825,8 +830,8 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, drvdata); - ret = snd_soc_register_dai(&pdev->dev, - &ux500_msp_dai_drv[drvdata->msp->id]); + ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component, + &ux500_msp_dai_drv[drvdata->msp->id], 1); if (ret < 0) { dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n", __func__, drvdata->msp->id); @@ -844,7 +849,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) return 0; err_reg_plat: - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); + snd_soc_unregister_component(&pdev->dev); err_init_msp: clk_put(drvdata->clk); err_clk: @@ -861,7 +866,7 @@ static int ux500_msp_drv_remove(struct platform_device *pdev) ux500_pcm_unregister_platform(pdev); - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); + snd_soc_unregister_component(&pdev->dev); devm_regulator_put(drvdata->reg_vape); prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 53/53] ASoC: snd_soc_[un]register_dai[s]() become non global function 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (51 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 52/53] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto @ 2013-03-18 6:35 ` Kuninori Morimoto 2013-03-18 15:44 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-18 6:35 UTC (permalink / raw) To: Mark Brown Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Simon, Liam Girdwood, Kuninori Morimoto All drivers are using snd_soc_register_component() instead of snd_soc_register_dai[s]() snd_soc_[un]register_dai[s]() are no longer needed Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- include/sound/soc-dai.h | 8 -------- sound/soc/soc-core.c | 12 ++++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 3d84808..ae9a227 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -95,14 +95,6 @@ struct snd_soc_dai_driver; struct snd_soc_dai; struct snd_ac97_bus_ops; -/* Digital Audio Interface registration */ -int snd_soc_register_dai(struct device *dev, - struct snd_soc_dai_driver *dai_drv); -void snd_soc_unregister_dai(struct device *dev); -int snd_soc_register_dais(struct device *dev, - struct snd_soc_dai_driver *dai_drv, size_t count); -void snd_soc_unregister_dais(struct device *dev, size_t count); - /* Digital Audio Interface clocking API.*/ int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9e61185..27ae7ee 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3739,7 +3739,7 @@ static inline char *fmt_multiple_name(struct device *dev, * * @dai: DAI to register */ -int snd_soc_register_dai(struct device *dev, +static int snd_soc_register_dai(struct device *dev, struct snd_soc_dai_driver *dai_drv) { struct snd_soc_codec *codec; @@ -3786,14 +3786,13 @@ int snd_soc_register_dai(struct device *dev, return 0; } -EXPORT_SYMBOL_GPL(snd_soc_register_dai); /** * snd_soc_unregister_dai - Unregister a DAI from the ASoC core * * @dai: DAI to unregister */ -void snd_soc_unregister_dai(struct device *dev) +static void snd_soc_unregister_dai(struct device *dev) { struct snd_soc_dai *dai; @@ -3812,7 +3811,6 @@ found: kfree(dai->name); kfree(dai); } -EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); /** * snd_soc_register_dais - Register multiple DAIs with the ASoC core @@ -3820,7 +3818,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); * @dai: Array of DAIs to register * @count: Number of DAIs */ -int snd_soc_register_dais(struct device *dev, +static int snd_soc_register_dais(struct device *dev, struct snd_soc_dai_driver *dai_drv, size_t count) { struct snd_soc_codec *codec; @@ -3884,7 +3882,6 @@ err: return ret; } -EXPORT_SYMBOL_GPL(snd_soc_register_dais); /** * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core @@ -3892,14 +3889,13 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dais); * @dai: Array of DAIs to unregister * @count: Number of DAIs */ -void snd_soc_unregister_dais(struct device *dev, size_t count) +static void snd_soc_unregister_dais(struct device *dev, size_t count) { int i; for (i = 0; i < count; i++) snd_soc_unregister_dai(dev); } -EXPORT_SYMBOL_GPL(snd_soc_unregister_dais); /** * snd_soc_register_platform - Register a platform with the ASoC core -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (52 preceding siblings ...) 2013-03-18 6:35 ` [PATCH 53/53] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto @ 2013-03-18 15:44 ` Lars-Peter Clausen 2013-03-19 0:32 ` Kuninori Morimoto 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto 54 siblings, 1 reply; 139+ messages in thread From: Lars-Peter Clausen @ 2013-03-18 15:44 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Stephen Warren, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto On 03/18/2013 07:18 AM, Kuninori Morimoto wrote: > > Hi Mark, Liam, Lars, Stephen > > These patches switch over to use snd_soc_register_component() > instead of snd_soc_register_dai[s]() on all drivers > Last patch moves snd_soc_[un]register_dai[s]() to non global function. > > I could compile test on some of them, but couldn't for all drivers > > These patches are based on asoc/topic/component branch > Hi, quite a few drivers use snd_soc_register_dai(), while snd_soc_register_component() uses snd_soc_register_dais(). snd_soc_register_dai() uses fmt_single_name(), while snd_soc_register_dais() uses fmt_multiple_name() to create the name for the device. So for all drivers using snd_soc_register_dai() the name of the DAI is different now, which will break the name based matching of the dai link. - Lars > Kuninori Morimoto (53): > ASoC: switch over to use snd_soc_register_component() on atmel ssc > ASoC: switch over to use snd_soc_register_component() on au1x i2sc > ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 > ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s > ASoC: switch over to use snd_soc_register_component() on au1x ac97c > ASoC: switch over to use snd_soc_register_component() on bf6xx i2s > ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 > ASoC: switch over to use snd_soc_register_component() on bf5xx i2s > ASoC: switch over to use snd_soc_register_component() on bf5xx tdm > ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 > ASoC: switch over to use snd_soc_register_component() on ep93xx i2s > ASoC: switch over to use snd_soc_register_component() on davinci i2s > ASoC: switch over to use snd_soc_register_component() on davinci vcif > ASoC: switch over to use snd_soc_register_component() on davinci mcasp > ASoC: switch over to use snd_soc_register_component() on dw i2s > ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 > ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s > ASoC: switch over to use snd_soc_register_component() on fsl ssi > ASoC: switch over to use snd_soc_register_component() on imx ssi > ASoC: switch over to use snd_soc_register_component() on jz4740 i2s > ASoC: switch over to use snd_soc_register_component() on kirkwood i2s > ASoC: switch over to use snd_soc_register_component() on sst > ASoC: switch over to use snd_soc_register_component() on mxs saif > ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 > ASoC: switch over to use snd_soc_register_component() on omap mcbsp > ASoC: switch over to use snd_soc_register_component() on omap mcpdm > ASoC: switch over to use snd_soc_register_component() on omap dmic > ASoC: switch over to use snd_soc_register_component() on omap hdmi > ASoC: switch over to use snd_soc_register_component() on pxa ssp > ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition > ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 > ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s > ASoC: switch over to use snd_soc_register_component() on mmp sspa > ASoC: switch over to use snd_soc_register_component() on s6000 i2s > ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s > ASoC: switch over to use snd_soc_register_component() on s3c i2s > ASoC: switch over to use snd_soc_register_component() on s3c ac97 > ASoC: switch over to use snd_soc_register_component() on samsung spdif > ASoC: switch over to use snd_soc_register_component() on samsung i2s > ASoC: switch over to use snd_soc_register_component() on samsung pcm > ASoC: switch over to use snd_soc_register_component() on goni_wm8994 > ASoC: switch over to use snd_soc_register_component() on sh4 ssi > ASoC: switch over to use snd_soc_register_component() on sh4 siu > ASoC: switch over to use snd_soc_register_component() on sh4 hac > ASoC: switch over to use snd_soc_register_component() on spear spdif out > ASoC: switch over to use snd_soc_register_component() on spear spdif in > ASoC: switch over to use snd_soc_register_component() on tegra30 i2s > ASoC: switch over to use snd_soc_register_component() on tegra20 spdif > ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 > ASoC: switch over to use snd_soc_register_component() on tegra20 i2s > ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 > ASoC: switch over to use snd_soc_register_component() on ux500 msp > ASoC: snd_soc_[un]register_dai[s]() become non global function > > include/sound/soc-dai.h | 8 -------- > sound/soc/atmel/atmel_ssc_dai.c | 11 ++++++++--- > sound/soc/au1x/ac97c.c | 9 +++++++-- > sound/soc/au1x/i2sc.c | 9 +++++++-- > sound/soc/au1x/psc-ac97.c | 9 +++++++-- > sound/soc/au1x/psc-i2s.c | 9 +++++++-- > sound/soc/blackfin/bf5xx-ac97.c | 9 +++++++-- > sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- > sound/soc/blackfin/bf5xx-tdm.c | 9 +++++++-- > sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- > sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- > sound/soc/cirrus/ep93xx-i2s.c | 9 +++++++-- > sound/soc/davinci/davinci-i2s.c | 15 ++++++++++----- > sound/soc/davinci/davinci-mcasp.c | 15 ++++++++++----- > sound/soc/davinci/davinci-vcif.c | 11 ++++++++--- > sound/soc/dwc/designware_i2s.c | 9 +++++++-- > sound/soc/fsl/fsl_ssi.c | 11 ++++++++--- > sound/soc/fsl/imx-ssi.c | 11 ++++++++--- > sound/soc/fsl/mpc5200_psc_ac97.c | 8 ++++++-- > sound/soc/fsl/mpc5200_psc_i2s.c | 9 +++++++-- > sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- > sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++++--- > sound/soc/mid-x86/sst_platform.c | 8 ++++++-- > sound/soc/mxs/mxs-saif.c | 11 ++++++++--- > sound/soc/nuc900/nuc900-ac97.c | 9 +++++++-- > sound/soc/omap/omap-dmic.c | 9 +++++++-- > sound/soc/omap/omap-hdmi.c | 9 +++++++-- > sound/soc/omap/omap-mcbsp.c | 9 +++++++-- > sound/soc/omap/omap-mcpdm.c | 9 +++++++-- > sound/soc/pxa/mmp-sspa.c | 9 +++++++-- > sound/soc/pxa/pxa-ssp.c | 9 +++++++-- > sound/soc/pxa/pxa2xx-ac97.c | 11 +++++++---- > sound/soc/pxa/pxa2xx-i2s.c | 9 +++++++-- > sound/soc/s6000/s6000-i2s.c | 9 +++++++-- > sound/soc/samsung/ac97.c | 12 ++++++++---- > sound/soc/samsung/goni_wm8994.c | 11 ++++++++--- > sound/soc/samsung/i2s.c | 14 ++++++++++---- > sound/soc/samsung/pcm.c | 11 ++++++++--- > sound/soc/samsung/s3c-i2s-v2.c | 9 +++++---- > sound/soc/samsung/s3c-i2s-v2.h | 7 ++++--- > sound/soc/samsung/s3c2412-i2s.c | 12 +++++++++--- > sound/soc/samsung/s3c24xx-i2s.c | 11 ++++++++--- > sound/soc/samsung/spdif.c | 11 ++++++++--- > sound/soc/sh/hac.c | 10 +++++++--- > sound/soc/sh/siu_dai.c | 11 ++++++++--- > sound/soc/sh/ssi.c | 10 +++++++--- > sound/soc/soc-core.c | 12 ++++-------- > sound/soc/spear/spdif_in.c | 9 +++++++-- > sound/soc/spear/spdif_out.c | 9 +++++++-- > sound/soc/tegra/tegra20_ac97.c | 15 ++++++++++----- > sound/soc/tegra/tegra20_i2s.c | 15 ++++++++++----- > sound/soc/tegra/tegra20_spdif.c | 15 ++++++++++----- > sound/soc/tegra/tegra30_i2s.c | 15 ++++++++++----- > sound/soc/txx9/txx9aclc-ac97.c | 9 +++++++-- > sound/soc/ux500/ux500_msp_dai.c | 13 +++++++++---- > 55 files changed, 405 insertions(+), 165 deletions(-) > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() 2013-03-18 15:44 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen @ 2013-03-19 0:32 ` Kuninori Morimoto 2013-03-19 0:36 ` [PATCH] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto 2013-03-19 8:35 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen 0 siblings, 2 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-19 0:32 UTC (permalink / raw) To: Lars-Peter Clausen Cc: Linux-ALSA, Stephen Warren, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto Hi Lars > > These patches switch over to use snd_soc_register_component() > > instead of snd_soc_register_dai[s]() on all drivers > > Last patch moves snd_soc_[un]register_dai[s]() to non global function. > > > > I could compile test on some of them, but couldn't for all drivers > > > > These patches are based on asoc/topic/component branch > > > > Hi, > > quite a few drivers use snd_soc_register_dai(), while > snd_soc_register_component() uses snd_soc_register_dais(). > snd_soc_register_dai() uses fmt_single_name(), while snd_soc_register_dais() > uses fmt_multiple_name() to create the name for the device. So for all > drivers using snd_soc_register_dai() the name of the DAI is different now, > which will break the name based matching of the dai link. Thank you for pointing it. I understand about this. I think if snd_soc_register_component() can use propely snd_soc_register_dai() and snd_soc_register_dais(), this issue is solved ? So, I send above patch as 1st. Next, I re-send these "switch over" patch set if it was accepted. Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() 2013-03-19 0:32 ` Kuninori Morimoto @ 2013-03-19 0:36 ` Kuninori Morimoto 2013-03-19 8:35 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen 1 sibling, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-19 0:36 UTC (permalink / raw) To: Lars-Peter Clausen, Mark Brown, Stephen Warren, Liam Girdwood Cc: Linux-ALSA, Simon, Kuninori Morimoto snd_soc_register_dai() uses fmt_single_name(), and snd_soc_register_dais() uses fmt_multiple_name() for dai->name which is used for name based matching. This patch uses properly snd_soc_register_dai() it it was single driver, and uses snd_register_dais() if it were multiple drivers. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- If this patch was OK, I will re-send "switch over" patch set sound/soc/soc-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 27ae7ee..f6cda7b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4165,7 +4165,15 @@ int snd_soc_register_component(struct device *dev, cmpnt->driver = cmpnt_drv; cmpnt->num_dai = num_dai; - ret = snd_soc_register_dais(dev, dai_drv, num_dai); + /* + * snd_soc_register_dai() uses fmt_single_name(), and + * snd_soc_register_dais() uses fmt_multiple_name() + * for dai->name which is used for name based matching + */ + if (1 == num_dai) + ret = snd_soc_register_dai(dev, dai_drv); + else + ret = snd_soc_register_dais(dev, dai_drv, num_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); goto error_component_name; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() 2013-03-19 0:32 ` Kuninori Morimoto 2013-03-19 0:36 ` [PATCH] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto @ 2013-03-19 8:35 ` Lars-Peter Clausen 2013-03-19 15:38 ` Stephen Warren 1 sibling, 1 reply; 139+ messages in thread From: Lars-Peter Clausen @ 2013-03-19 8:35 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Stephen Warren, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto On 03/19/2013 01:32 AM, Kuninori Morimoto wrote: > > Hi Lars > >>> These patches switch over to use snd_soc_register_component() >>> instead of snd_soc_register_dai[s]() on all drivers >>> Last patch moves snd_soc_[un]register_dai[s]() to non global function. >>> >>> I could compile test on some of them, but couldn't for all drivers >>> >>> These patches are based on asoc/topic/component branch >>> >> >> Hi, >> >> quite a few drivers use snd_soc_register_dai(), while >> snd_soc_register_component() uses snd_soc_register_dais(). >> snd_soc_register_dai() uses fmt_single_name(), while snd_soc_register_dais() >> uses fmt_multiple_name() to create the name for the device. So for all >> drivers using snd_soc_register_dai() the name of the DAI is different now, >> which will break the name based matching of the dai link. > > Thank you for pointing it. > I understand about this. > > I think if snd_soc_register_component() can use propely > snd_soc_register_dai() and snd_soc_register_dais(), > this issue is solved ? This will fix it for most drivers, but there are a couple of drivers which use snd_soc_register_dais with 1 dai. E.g. tegra/tegra20_ac97.c, sh/siu_dai.c, sh/hac.c, sh.ssi.c - Lars ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() 2013-03-19 8:35 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen @ 2013-03-19 15:38 ` Stephen Warren 2013-03-21 0:14 ` Kuninori Morimoto 0 siblings, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-19 15:38 UTC (permalink / raw) To: Lars-Peter Clausen, Lucas Stach Cc: Linux-ALSA, Kuninori Morimoto, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto On 03/19/2013 02:35 AM, Lars-Peter Clausen wrote: > On 03/19/2013 01:32 AM, Kuninori Morimoto wrote: >> >> Hi Lars >> >>>> These patches switch over to use snd_soc_register_component() >>>> instead of snd_soc_register_dai[s]() on all drivers >>>> Last patch moves snd_soc_[un]register_dai[s]() to non global function. >>>> >>>> I could compile test on some of them, but couldn't for all drivers >>>> >>>> These patches are based on asoc/topic/component branch >>>> >>> >>> Hi, >>> >>> quite a few drivers use snd_soc_register_dai(), while >>> snd_soc_register_component() uses snd_soc_register_dais(). >>> snd_soc_register_dai() uses fmt_single_name(), while snd_soc_register_dais() >>> uses fmt_multiple_name() to create the name for the device. So for all >>> drivers using snd_soc_register_dai() the name of the DAI is different now, >>> which will break the name based matching of the dai link. >> >> Thank you for pointing it. >> I understand about this. >> >> I think if snd_soc_register_component() can use propely >> snd_soc_register_dai() and snd_soc_register_dais(), >> this issue is solved ? > > This will fix it for most drivers, but there are a couple of drivers which use > snd_soc_register_dais with 1 dai. > > E.g. tegra/tegra20_ac97.c, sh/siu_dai.c, sh/hac.c, sh.ssi.c I believe this can be fixed simply by adjusting the relevant machine driver(s) to match whatever the new name is. Any change to tegra20_ac97.c would only affect sound/soc/tegra/tegra_wm9712.c's struct tegra_wm9712_dai .cpu_dai_name field. I suspect the correct fix might be to just remove the assignment to .cpu_dai_name in tegra_wm9712.c; I think that because the .cpu_of_node field is always set by that driver, the value of .cpu_dai_name is never used? Anyway, if you fix tegra_wm9712.c in your patch, I hope that Lucas Stach can test it. ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() 2013-03-19 15:38 ` Stephen Warren @ 2013-03-21 0:14 ` Kuninori Morimoto 0 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 0:14 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Lucas Stach, Mark Brown, Simon, Liam Girdwood, Kuninori Morimoto Hi Stephen, Lars Thank you for your advice > > This will fix it for most drivers, but there are a couple of drivers which use > > snd_soc_register_dais with 1 dai. > > > > E.g. tegra/tegra20_ac97.c, sh/siu_dai.c, sh/hac.c, sh.ssi.c I can check sh/* drivers. (I guess some of these are not used on sh, I'm not sure why...) > I believe this can be fixed simply by adjusting the relevant machine > driver(s) to match whatever the new name is. > > Any change to tegra20_ac97.c would only affect > sound/soc/tegra/tegra_wm9712.c's struct tegra_wm9712_dai .cpu_dai_name > field. I suspect the correct fix might be to just remove the assignment > to .cpu_dai_name in tegra_wm9712.c; I think that because the > .cpu_of_node field is always set by that driver, the value of > .cpu_dai_name is never used? Anyway, if you fix tegra_wm9712.c in your > patch, I hope that Lucas Stach can test it. OK, I will try to fix it in v2 patch set Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 0/54 v2] ASoC: switch over to use snd_soc_register_component() 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto ` (53 preceding siblings ...) 2013-03-18 15:44 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen @ 2013-03-21 10:26 ` Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 01/54 v2] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto ` (54 more replies) 54 siblings, 55 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:26 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Hi Mark, Liam, Lars, Stephen, Peter These are v2 patch set of switch over to use snd_soc_register_component() instead of snd_soc_register_dai[s]() on all drivers 1st patch adds dai()/dais() control on register_component() function. And Last patch moves snd_soc_[un]register_dai[s]() to non global function. v1 -> v2 change are - some drivers used DRV_NAME if it was defined - some drivers changed cpu dai name if it used snd_soc_register_dais(xxx, 1) I can't check all driver/board in my environment, so, these patches need your help/Acked-by if possible I guess these driver need test/check - samsung/s3c-i2s-v2 : about function style - tegtegra/tegra20_ac97 : about cpu dai name These patches are based on asoc/topic/component branch Kuninori Morimoto (54): ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition ASoC: switch over to use snd_soc_register_component() on atmel ssc ASoC: switch over to use snd_soc_register_component() on au1x i2sc ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s ASoC: switch over to use snd_soc_register_component() on au1x ac97c ASoC: switch over to use snd_soc_register_component() on bf6xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 ASoC: switch over to use snd_soc_register_component() on bf5xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx tdm ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 ASoC: switch over to use snd_soc_register_component() on ep93xx i2s ASoC: switch over to use snd_soc_register_component() on davinci i2s ASoC: switch over to use snd_soc_register_component() on davinci vcif ASoC: switch over to use snd_soc_register_component() on davinci mcasp ASoC: switch over to use snd_soc_register_component() on dw i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s ASoC: switch over to use snd_soc_register_component() on fsl ssi ASoC: switch over to use snd_soc_register_component() on imx ssi ASoC: switch over to use snd_soc_register_component() on jz4740 i2s ASoC: switch over to use snd_soc_register_component() on kirkwood i2s ASoC: switch over to use snd_soc_register_component() on sst ASoC: switch over to use snd_soc_register_component() on mxs saif ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 ASoC: switch over to use snd_soc_register_component() on omap mcbsp ASoC: switch over to use snd_soc_register_component() on omap mcpdm ASoC: switch over to use snd_soc_register_component() on omap dmic ASoC: switch over to use snd_soc_register_component() on omap hdmi ASoC: switch over to use snd_soc_register_component() on pxa ssp ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s ASoC: switch over to use snd_soc_register_component() on mmp sspa ASoC: switch over to use snd_soc_register_component() on s6000 i2s ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s ASoC: switch over to use snd_soc_register_component() on s3c i2s ASoC: switch over to use snd_soc_register_component() on s3c ac97 ASoC: switch over to use snd_soc_register_component() on samsung spdif ASoC: switch over to use snd_soc_register_component() on samsung i2s ASoC: switch over to use snd_soc_register_component() on samsung pcm ASoC: switch over to use snd_soc_register_component() on goni_wm8994 ASoC: switch over to use snd_soc_register_component() on sh4 ssi ASoC: switch over to use snd_soc_register_component() on sh4 siu ASoC: switch over to use snd_soc_register_component() on sh4 hac ASoC: switch over to use snd_soc_register_component() on spear spdif out ASoC: switch over to use snd_soc_register_component() on spear spdif in ASoC: switch over to use snd_soc_register_component() on tegra30 i2s ASoC: switch over to use snd_soc_register_component() on tegra20 spdif ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 ASoC: switch over to use snd_soc_register_component() on tegra20 i2s ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 ASoC: switch over to use snd_soc_register_component() on ux500 msp ASoC: snd_soc_[un]register_dai[s]() become non global function include/sound/soc-dai.h | 8 -------- sound/soc/atmel/atmel_ssc_dai.c | 11 ++++++++--- sound/soc/au1x/ac97c.c | 9 +++++++-- sound/soc/au1x/i2sc.c | 9 +++++++-- sound/soc/au1x/psc-ac97.c | 9 +++++++-- sound/soc/au1x/psc-i2s.c | 9 +++++++-- sound/soc/blackfin/bf5xx-ac97.c | 9 +++++++-- sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- sound/soc/blackfin/bf5xx-tdm.c | 9 +++++++-- sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- sound/soc/cirrus/ep93xx-i2s.c | 9 +++++++-- sound/soc/davinci/davinci-i2s.c | 15 ++++++++++----- sound/soc/davinci/davinci-mcasp.c | 15 ++++++++++----- sound/soc/davinci/davinci-vcif.c | 11 ++++++++--- sound/soc/dwc/designware_i2s.c | 9 +++++++-- sound/soc/fsl/fsl_ssi.c | 11 ++++++++--- sound/soc/fsl/imx-ssi.c | 11 ++++++++--- sound/soc/fsl/mpc5200_psc_ac97.c | 8 ++++++-- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +++++++-- sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++++--- sound/soc/mid-x86/sst_platform.c | 8 ++++++-- sound/soc/mxs/mxs-saif.c | 11 ++++++++--- sound/soc/nuc900/nuc900-ac97.c | 9 +++++++-- sound/soc/omap/omap-dmic.c | 9 +++++++-- sound/soc/omap/omap-hdmi.c | 9 +++++++-- sound/soc/omap/omap-mcbsp.c | 9 +++++++-- sound/soc/omap/omap-mcpdm.c | 9 +++++++-- sound/soc/pxa/mmp-sspa.c | 9 +++++++-- sound/soc/pxa/pxa-ssp.c | 9 +++++++-- sound/soc/pxa/pxa2xx-ac97.c | 11 +++++++---- sound/soc/pxa/pxa2xx-i2s.c | 9 +++++++-- sound/soc/s6000/s6000-i2s.c | 9 +++++++-- sound/soc/samsung/ac97.c | 12 ++++++++---- sound/soc/samsung/goni_wm8994.c | 11 ++++++++--- sound/soc/samsung/i2s.c | 14 ++++++++++---- sound/soc/samsung/pcm.c | 11 ++++++++--- sound/soc/samsung/s3c-i2s-v2.c | 9 +++++---- sound/soc/samsung/s3c-i2s-v2.h | 7 ++++--- sound/soc/samsung/s3c2412-i2s.c | 12 +++++++++--- sound/soc/samsung/s3c24xx-i2s.c | 11 ++++++++--- sound/soc/samsung/spdif.c | 11 ++++++++--- sound/soc/sh/hac.c | 10 +++++++--- sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 ++++++++--- sound/soc/sh/ssi.c | 10 +++++++--- sound/soc/soc-core.c | 22 +++++++++++++--------- sound/soc/spear/spdif_in.c | 9 +++++++-- sound/soc/spear/spdif_out.c | 9 +++++++-- sound/soc/tegra/tegra20_ac97.c | 15 ++++++++++----- sound/soc/tegra/tegra20_i2s.c | 15 ++++++++++----- sound/soc/tegra/tegra20_spdif.c | 15 ++++++++++----- sound/soc/tegra/tegra30_i2s.c | 15 ++++++++++----- sound/soc/tegra/tegra_wm9712.c | 2 +- sound/soc/txx9/txx9aclc-ac97.c | 9 +++++++-- sound/soc/ux500/ux500_msp_dai.c | 13 +++++++++---- 57 files changed, 416 insertions(+), 168 deletions(-) ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 01/54 v2] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto @ 2013-03-21 10:27 ` Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto ` (53 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:27 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto snd_soc_register_dai() uses fmt_single_name(), and snd_soc_register_dais() uses fmt_multiple_name() for dai->name which is used for name based matching. This patch uses properly snd_soc_register_dai() it it was single driver, and uses snd_register_dais() if it were multiple drivers. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/soc-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9e61185..2ecaaf1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4169,7 +4169,15 @@ int snd_soc_register_component(struct device *dev, cmpnt->driver = cmpnt_drv; cmpnt->num_dai = num_dai; - ret = snd_soc_register_dais(dev, dai_drv, num_dai); + /* + * snd_soc_register_dai() uses fmt_single_name(), and + * snd_soc_register_dais() uses fmt_multiple_name() + * for dai->name which is used for name based matching + */ + if (1 == num_dai) + ret = snd_soc_register_dai(dev, dai_drv); + else + ret = snd_soc_register_dais(dev, dai_drv, num_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); goto error_component_name; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 01/54 v2] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto @ 2013-03-21 10:27 ` Kuninori Morimoto 2013-03-22 11:13 ` Mark Brown 2013-03-21 10:28 ` [PATCH 03/54 v2] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto ` (52 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:27 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-ac97.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 4b0a009..88d2cc6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -47,6 +47,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = { .warm_reset = pxa2xx_ac97_warm_reset, .reset = pxa2xx_ac97_cold_reset, }; +EXPORT_SYMBOL_GPL(soc_ac97_ops); static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = { .name = "AC97 PCM Stereo out", @@ -232,8 +233,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { }, }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); - static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { if (pdev->id != -1) { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition 2013-03-21 10:27 ` [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto @ 2013-03-22 11:13 ` Mark Brown 0 siblings, 0 replies; 139+ messages in thread From: Mark Brown @ 2013-03-22 11:13 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 256 bytes --] On Thu, Mar 21, 2013 at 03:27:59AM -0700, Kuninori Morimoto wrote: > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Applied, thanks. This should really have been sent separately to the series - it's not related to the overall topic. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 03/54 v2] ASoC: switch over to use snd_soc_register_component() on atmel ssc 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 01/54 v2] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto @ 2013-03-21 10:28 ` Kuninori Morimoto 2013-03-21 10:28 ` [PATCH 04/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto ` (51 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:28 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/atmel/atmel_ssc_dai.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index e13580d..1435f30 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -707,13 +707,18 @@ static struct snd_soc_dai_driver atmel_ssc_dai = { .ops = &atmel_ssc_dai_ops, }; +static const struct snd_soc_component_driver atmel_ssc_component = { + .name = "atmel-ssc", +}; + static int asoc_ssc_init(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct ssc_device *ssc = platform_get_drvdata(pdev); int ret; - ret = snd_soc_register_dai(dev, &atmel_ssc_dai); + ret = snd_soc_register_component(dev, &atmel_ssc_component, + &atmel_ssc_dai, 1); if (ret) { dev_err(dev, "Could not register DAI: %d\n", ret); goto err; @@ -732,7 +737,7 @@ static int asoc_ssc_init(struct device *dev) return 0; err_unregister_dai: - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); err: return ret; } @@ -747,7 +752,7 @@ static void asoc_ssc_exit(struct device *dev) else atmel_pcm_pdc_platform_unregister(dev); - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); } /** -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 04/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x i2sc 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (2 preceding siblings ...) 2013-03-21 10:28 ` [PATCH 03/54 v2] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto @ 2013-03-21 10:28 ` Kuninori Morimoto 2013-03-21 10:28 ` [PATCH 05/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto ` (50 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:28 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/i2sc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c index 072448a..b3f37f6 100644 --- a/sound/soc/au1x/i2sc.c +++ b/sound/soc/au1x/i2sc.c @@ -225,6 +225,10 @@ static struct snd_soc_dai_driver au1xi2s_dai_driver = { .ops = &au1xi2s_dai_ops, }; +static const struct snd_soc_component_driver au1xi2s_component = { + .name = "au1xi2s", +}; + static int au1xi2s_drvprobe(struct platform_device *pdev) { struct resource *iores, *dmares; @@ -260,14 +264,15 @@ static int au1xi2s_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); - return snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver); + return snd_soc_register_component(&pdev->dev, &au1xi2s_component, + &au1xi2s_dai_driver, 1); } static int au1xi2s_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); WR(ctx, I2S_ENABLE, EN_D); /* clock off, disable */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 05/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (3 preceding siblings ...) 2013-03-21 10:28 ` [PATCH 04/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto @ 2013-03-21 10:28 ` Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 06/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto ` (49 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:28 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/psc-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 6ba07e3..8f1862a 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = { .ops = &au1xpsc_ac97_dai_ops, }; +static const struct snd_soc_component_driver au1xpsc_ac97_component = { + .name = "au1xpsc-ac97", +}; + static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) { int ret; @@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, wd); - ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv); + ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component, + &wd->dai_drv, 1); if (ret) return ret; @@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); /* disable PSC completely */ au_writel(0, AC97_CFG(wd)); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 06/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (4 preceding siblings ...) 2013-03-21 10:28 ` [PATCH 05/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto @ 2013-03-21 10:29 ` Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 07/54] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto ` (48 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:29 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/psc-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 360b4e5..fe923a7 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -288,6 +288,10 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = { .ops = &au1xpsc_i2s_dai_ops, }; +static const struct snd_soc_component_driver au1xpsc_i2s_component = { + .name = "au1xpsc-i2s", +}; + static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) { struct resource *iores, *dmares; @@ -350,14 +354,15 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, wd); - return snd_soc_register_dai(&pdev->dev, &wd->dai_drv); + return snd_soc_register_component(&pdev->dev, &au1xpsc_i2s_component, + &wd->dai_drv, 1); } static int au1xpsc_i2s_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); au_writel(0, I2S_CFG(wd)); au_sync(); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 07/54] ASoC: switch over to use snd_soc_register_component() on au1x ac97c 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (5 preceding siblings ...) 2013-03-21 10:29 ` [PATCH 06/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto @ 2013-03-21 10:29 ` Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 08/54 v2] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto ` (47 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:29 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/au1x/ac97c.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index ea7d9d1..44b8dce 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -223,6 +223,10 @@ static struct snd_soc_dai_driver au1xac97c_dai_driver = { .ops = &alchemy_ac97c_ops, }; +static const struct snd_soc_component_driver au1xac97c_component = { + .name = "au1xac97c", +}; + static int au1xac97c_drvprobe(struct platform_device *pdev) { int ret; @@ -268,7 +272,8 @@ static int au1xac97c_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); - ret = snd_soc_register_dai(&pdev->dev, &au1xac97c_dai_driver); + ret = snd_soc_register_component(&pdev->dev, &au1xac97c_component, + &au1xac97c_dai_driver, 1); if (ret) return ret; @@ -280,7 +285,7 @@ static int au1xac97c_drvremove(struct platform_device *pdev) { struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); WR(ctx, AC97_ENABLE, EN_D); /* clock off, disable */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 08/54 v2] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (6 preceding siblings ...) 2013-03-21 10:29 ` [PATCH 07/54] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto @ 2013-03-21 10:29 ` Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 09/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto ` (46 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:29 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c index 8f33797..c02405c 100644 --- a/sound/soc/blackfin/bf6xx-i2s.c +++ b/sound/soc/blackfin/bf6xx-i2s.c @@ -186,6 +186,10 @@ static struct snd_soc_dai_driver bfin_i2s_dai = { .ops = &bfin_i2s_dai_ops, }; +static const struct snd_soc_component_driver bfin_i2s_component = { + .name = "bfin-i2s", +}; + static int bfin_i2s_probe(struct platform_device *pdev) { struct sport_device *sport; @@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(dev, &bfin_i2s_dai); + ret = snd_soc_register_component(dev, &bfin_i2s_component, + &bfin_i2s_dai, 1); if (ret) { dev_err(dev, "Failed to register DAI: %d\n", ret); sport_delete(sport); @@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev) { struct sport_device *sport = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_delete(sport); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 09/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (7 preceding siblings ...) 2013-03-21 10:29 ` [PATCH 08/54 v2] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto @ 2013-03-21 10:29 ` Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 10/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto ` (45 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:29 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 8e41bcb..4902173 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -282,6 +282,10 @@ static struct snd_soc_dai_driver bfin_ac97_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE, }, }; +static const struct snd_soc_component_driver bfin_ac97_component = { + .name = "bfin-ac97", +}; + static int asoc_bfin_ac97_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -331,7 +335,8 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) goto sport_config_err; } - ret = snd_soc_register_dai(&pdev->dev, &bfin_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component, + &bfin_ac97_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); goto sport_config_err; @@ -356,7 +361,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) { struct sport_device *sport_handle = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 10/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (8 preceding siblings ...) 2013-03-21 10:29 ` [PATCH 09/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto @ 2013-03-21 10:30 ` Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 11/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto ` (44 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:30 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 168d88b..dd0c2a4 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c @@ -245,6 +245,10 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = { .ops = &bf5xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver bf5xx_i2s_component = { + .name = "bf5xx-i2s", +}; + static int bf5xx_i2s_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -257,7 +261,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(&pdev->dev, &bf5xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &bf5xx_i2s_component, + &bf5xx_i2s_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); sport_done(sport_handle); @@ -273,7 +278,7 @@ static int bf5xx_i2s_remove(struct platform_device *pdev) pr_debug("%s enter\n", __func__); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 11/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (9 preceding siblings ...) 2013-03-21 10:30 ` [PATCH 10/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto @ 2013-03-21 10:30 ` Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 12/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto ` (43 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:30 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/blackfin/bf5xx-tdm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index c1e516e..69e9a3e 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c @@ -249,6 +249,10 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = { .ops = &bf5xx_tdm_dai_ops, }; +static const struct snd_soc_component_driver bf5xx_tdm_component = { + .name = "bf5xx-tdm", +}; + static int bfin_tdm_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -282,7 +286,8 @@ static int bfin_tdm_probe(struct platform_device *pdev) goto sport_config_err; } - ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai); + ret = snd_soc_register_component(&pdev->dev, &bf5xx_tdm_component, + &bf5xx_tdm_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); goto sport_config_err; @@ -299,7 +304,7 @@ static int bfin_tdm_remove(struct platform_device *pdev) { struct sport_device *sport_handle = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 12/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (10 preceding siblings ...) 2013-03-21 10:30 ` [PATCH 11/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto @ 2013-03-21 10:30 ` Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 13/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto ` (42 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:30 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 1738d28..e593c1e 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -353,6 +353,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = { .ops = &ep93xx_ac97_dai_ops, }; +static const struct snd_soc_component_driver ep93xx_ac97_component = { + .name = "ep93xx-ac97", +}; + static int ep93xx_ac97_probe(struct platform_device *pdev) { struct ep93xx_ac97_info *info; @@ -390,7 +394,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) ep93xx_ac97_info = info; platform_set_drvdata(pdev, info); - ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, + &ep93xx_ac97_dai, 1); if (ret) goto fail; @@ -407,7 +412,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) { struct ep93xx_ac97_info *info = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); /* disable the AC97 controller */ ep93xx_ac97_write_reg(info, AC97GCR, 0); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 13/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (11 preceding siblings ...) 2013-03-21 10:30 ` [PATCH 12/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto @ 2013-03-21 10:30 ` Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 14/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto ` (41 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:30 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/cirrus/ep93xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 323ed69..8d244be 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -366,6 +366,10 @@ static struct snd_soc_dai_driver ep93xx_i2s_dai = { .ops = &ep93xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver ep93xx_i2s_component = { + .name = "ep93xx-i2s", +}; + static int ep93xx_i2s_probe(struct platform_device *pdev) { struct ep93xx_i2s_info *info; @@ -405,7 +409,8 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); info->dma_params = ep93xx_i2s_dma_params; - err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai); + err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component, + &ep93xx_i2s_dai, 1); if (err) goto fail_put_lrclk; @@ -426,7 +431,7 @@ static int ep93xx_i2s_remove(struct platform_device *pdev) { struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(info->lrclk); clk_put(info->sclk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 14/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (12 preceding siblings ...) 2013-03-21 10:30 ` [PATCH 13/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto @ 2013-03-21 10:30 ` Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 15/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto ` (40 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:30 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 8218312..ebe8294 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -645,6 +645,10 @@ static struct snd_soc_dai_driver davinci_i2s_dai = { }; +static const struct snd_soc_component_driver davinci_i2s_component = { + .name = "davinci-i2s", +}; + static int davinci_i2s_probe(struct platform_device *pdev) { struct snd_platform_data *pdata = pdev->dev.platform_data; @@ -727,20 +731,21 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &davinci_i2s_component, + &davinci_i2s_dai, 1); if (ret != 0) goto err_release_clk; ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_release_clk: clk_disable(dev->clk); clk_put(dev->clk); @@ -751,7 +756,7 @@ static int davinci_i2s_remove(struct platform_device *pdev) { struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); clk_disable(dev->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 15/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci vcif 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (13 preceding siblings ...) 2013-03-21 10:30 ` [PATCH 14/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto @ 2013-03-21 10:31 ` Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 16/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto ` (39 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:31 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-vcif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 07bde2e..30587c0 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -204,6 +204,10 @@ static struct snd_soc_dai_driver davinci_vcif_dai = { }; +static const struct snd_soc_component_driver davinci_vcif_component = { + .name = "davinci-vcif", +}; + static int davinci_vcif_probe(struct platform_device *pdev) { struct davinci_vc *davinci_vc = pdev->dev.platform_data; @@ -234,7 +238,8 @@ static int davinci_vcif_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, davinci_vcif_dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_vcif_dai); + ret = snd_soc_register_component(&pdev->dev, &davinci_vcif_component, + &davinci_vcif_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "could not register dai\n"); return ret; @@ -243,7 +248,7 @@ static int davinci_vcif_probe(struct platform_device *pdev) ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } @@ -252,7 +257,7 @@ static int davinci_vcif_probe(struct platform_device *pdev) static int davinci_vcif_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 16/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci mcasp 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (14 preceding siblings ...) 2013-03-21 10:31 ` [PATCH 15/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto @ 2013-03-21 10:31 ` Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 17/54 v2] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto ` (38 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:31 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/davinci/davinci-mcasp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 9321e5c..c2e67f1 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -962,6 +962,10 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { }; +static const struct snd_soc_component_driver davinci_mcasp_component = { + .name = "davinci-mcasp", +}; + static const struct of_device_id mcasp_dt_ids[] = { { .compatible = "ti,dm646x-mcasp-audio", @@ -1170,7 +1174,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data->channel = res->start; dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]); + ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, + &davinci_mcasp_dai[pdata->op_mode], 1); if (ret != 0) goto err_release_clk; @@ -1178,13 +1183,13 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ret = davinci_soc_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "register PCM failed: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_release_clk: pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); @@ -1194,7 +1199,7 @@ err_release_clk: static int davinci_mcasp_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); davinci_soc_platform_unregister(&pdev->dev); pm_runtime_put_sync(&pdev->dev); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 17/54 v2] ASoC: switch over to use snd_soc_register_component() on dw i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (15 preceding siblings ...) 2013-03-21 10:31 ` [PATCH 16/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto @ 2013-03-21 10:31 ` Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 18/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto ` (37 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:31 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/dwc/designware_i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index deb30d5..593a3ea1 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -297,6 +297,10 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = { .trigger = dw_i2s_trigger, }; +static const struct snd_soc_component_driver dw_i2s_component = { + .name = "dw-i2s", +}; + #ifdef CONFIG_PM static int dw_i2s_suspend(struct snd_soc_dai *dai) @@ -413,7 +417,8 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, dev); - ret = snd_soc_register_dai(&pdev->dev, dw_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, + dw_i2s_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "not able to register dai\n"); goto err_set_drvdata; @@ -434,7 +439,7 @@ static int dw_i2s_remove(struct platform_device *pdev) { struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(dev->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 18/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (16 preceding siblings ...) 2013-03-21 10:31 ` [PATCH 17/54 v2] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto @ 2013-03-21 10:31 ` Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto ` (36 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:31 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/mpc5200_psc_ac97.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index a4aec04..4141b35 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -270,6 +270,9 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = { .ops = &psc_ac97_digital_ops, } }; +static const struct snd_soc_component_driver psc_ac97_component = { + .name = DRV_NAME, +}; /* --------------------------------------------------------------------- @@ -287,7 +290,8 @@ static int psc_ac97_of_probe(struct platform_device *op) if (rc != 0) return rc; - rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); + rc = snd_soc_register_component(&op->dev, &psc_ac97_component, + psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai)); if (rc != 0) { dev_err(&op->dev, "Failed to register DAI\n"); return rc; @@ -313,7 +317,7 @@ static int psc_ac97_of_probe(struct platform_device *op) static int psc_ac97_of_remove(struct platform_device *op) { mpc5200_audio_dma_destroy(op); - snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai)); + snd_soc_unregister_component(&op->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (17 preceding siblings ...) 2013-03-21 10:31 ` [PATCH 18/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto @ 2013-03-21 10:31 ` Kuninori Morimoto 2013-03-21 16:53 ` Stephen Warren 2013-03-21 10:32 ` [PATCH 20/54 v2] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto ` (35 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:31 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index b95b966..f4efaad 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -148,6 +148,10 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{ .ops = &psc_i2s_dai_ops, } }; +static const struct snd_soc_component_driver psc_i2s_component = { + .name = "mpc5200-i2s", +}; + /* --------------------------------------------------------------------- * OF platform bus binding code: * - Probe/remove operations @@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) if (rc != 0) return rc; - rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); + rc = snd_soc_register_component(&op->dev, &psc_i2s_component, + psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); if (rc != 0) { pr_err("Failed to register DAI\n"); return rc; @@ -208,7 +213,7 @@ static int psc_i2s_of_probe(struct platform_device *op) static int psc_i2s_of_remove(struct platform_device *op) { mpc5200_audio_dma_destroy(op); - snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai)); + snd_soc_unregister_component(&op->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-21 10:31 ` [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto @ 2013-03-21 16:53 ` Stephen Warren 2013-03-22 1:19 ` Kuninori Morimoto 0 siblings, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-21 16:53 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 04:31 AM, Kuninori Morimoto wrote: > diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c > @@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) > if (rc != 0) > return rc; > > - rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); > + rc = snd_soc_register_component(&op->dev, &psc_i2s_component, > + psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); ARRAY_SIZE(psc_i2s_dai)==1, so this switches from snd_soc_register_dais() to snd_soc_register_dai(). Will that be a problem? ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-21 16:53 ` Stephen Warren @ 2013-03-22 1:19 ` Kuninori Morimoto 2013-03-22 5:04 ` Stephen Warren 2013-03-22 10:22 ` Mark Brown 0 siblings, 2 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-22 1:19 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto Hi Stephen Thank you for pointing it > > diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c > > > @@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) > > if (rc != 0) > > return rc; > > > > - rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); > > + rc = snd_soc_register_component(&op->dev, &psc_i2s_component, > > + psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); > > ARRAY_SIZE(psc_i2s_dai)==1, so this switches from > snd_soc_register_dais() to snd_soc_register_dai(). Will that be a problem? I didn't notice about it. arch/powerpc/boot/dts/lite5200.dts seems the user of this driver, but, it was comment-outed. And it is using DT, not name matching ? Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-22 1:19 ` Kuninori Morimoto @ 2013-03-22 5:04 ` Stephen Warren 2013-03-22 10:26 ` Mark Brown ` (2 more replies) 2013-03-22 10:22 ` Mark Brown 1 sibling, 3 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-22 5:04 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Shawn Guo, Kuninori Morimoto On 03/21/2013 07:19 PM, Kuninori Morimoto wrote: > > Hi Stephen > > Thank you for pointing it > >>> diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c >> >>> @@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op) >>> if (rc != 0) >>> return rc; >>> >>> - rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); >>> + rc = snd_soc_register_component(&op->dev, &psc_i2s_component, >>> + psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai)); >> >> ARRAY_SIZE(psc_i2s_dai)==1, so this switches from >> snd_soc_register_dais() to snd_soc_register_dai(). Will that be a problem? > > I didn't notice about it. > > arch/powerpc/boot/dts/lite5200.dts seems the user of this driver, > but, it was comment-outed. > And it is using DT, not name matching ? This one required some more in-depth investigation. Certainly, there don't appear to be any instance of the device-name or DAI name string mpc5200-psc-i2s anywhere in the kernel. However, I do see: > ./mpc8610_hpcd.c:213: machine_data->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > ./p1022_ds.c:223: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > ./p1022_rdk.c:226: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > ./imx-sgtl5000.c:151: data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev); That's a bit icky; DT-based systems should use .cpu_of_node, not .cpu_dai_name... Anyway, as far as I can tell from any of the in-kernel device trees, this particular mpc5200-psc-i2s device isn't actually instantiated anywhere. I guess the only users are removed or out-of-tree. Equally, of those 4 files, the compatible value they're instantiated from doesn't exist in any in-kernel DT files, except for imx-sgtl5000.c, and in that case the CPU phandle points at something the definitely isn't the MPC5200 PSC device. So, I guess this if probably fine... ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-22 5:04 ` Stephen Warren @ 2013-03-22 10:26 ` Mark Brown 2013-03-25 0:24 ` Kuninori Morimoto 2013-03-25 3:11 ` Shawn Guo 2 siblings, 0 replies; 139+ messages in thread From: Mark Brown @ 2013-03-22 10:26 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Kuninori Morimoto, Peter Ujfalusi, Simon, Liam Girdwood, Shawn Guo, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 703 bytes --] On Thu, Mar 21, 2013 at 11:04:05PM -0600, Stephen Warren wrote: > On 03/21/2013 07:19 PM, Kuninori Morimoto wrote: > However, I do see: > > ./mpc8610_hpcd.c:213: machine_data->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./p1022_ds.c:223: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./p1022_rdk.c:226: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./imx-sgtl5000.c:151: data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev); > That's a bit icky; DT-based systems should use .cpu_of_node, not > .cpu_dai_name... With the exception of the SGTL5000 one those are all very old school ASoC DT drivers that predate any framework involvement or review outside of the driver. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-22 5:04 ` Stephen Warren 2013-03-22 10:26 ` Mark Brown @ 2013-03-25 0:24 ` Kuninori Morimoto 2013-03-25 15:58 ` Stephen Warren 2013-03-25 3:11 ` Shawn Guo 2 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-25 0:24 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Shawn Guo, Kuninori Morimoto Hi Stephen Thank you for your checking > > arch/powerpc/boot/dts/lite5200.dts seems the user of this driver, > > but, it was comment-outed. > > And it is using DT, not name matching ? (snip) > Anyway, as far as I can tell from any of the in-kernel device trees, > this particular mpc5200-psc-i2s device isn't actually instantiated > anywhere. I guess the only users are removed or out-of-tree. > > Equally, of those 4 files, the compatible value they're instantiated > from doesn't exist in any in-kernel DT files, except for imx-sgtl5000.c, > and in that case the CPU phandle points at something the definitely > isn't the MPC5200 PSC device. > > So, I guess this if probably fine... In my understanding, there are some concerns, but basically it is OK in general? I can send v4 of migor patch which description has been updated (the difference of cpu_dai_name between dai() and dais()) Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-25 0:24 ` Kuninori Morimoto @ 2013-03-25 15:58 ` Stephen Warren 0 siblings, 0 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-25 15:58 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Shawn Guo, Kuninori Morimoto On 03/24/2013 06:24 PM, Kuninori Morimoto wrote: > > Hi Stephen > > Thank you for your checking > >>> arch/powerpc/boot/dts/lite5200.dts seems the user of this driver, >>> but, it was comment-outed. >>> And it is using DT, not name matching ? > (snip) >> Anyway, as far as I can tell from any of the in-kernel device trees, >> this particular mpc5200-psc-i2s device isn't actually instantiated >> anywhere. I guess the only users are removed or out-of-tree. >> >> Equally, of those 4 files, the compatible value they're instantiated >> from doesn't exist in any in-kernel DT files, except for imx-sgtl5000.c, >> and in that case the CPU phandle points at something the definitely >> isn't the MPC5200 PSC device. >> >> So, I guess this if probably fine... > > In my understanding, > there are some concerns, but basically it is OK in general? Yes, I think so. ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-22 5:04 ` Stephen Warren 2013-03-22 10:26 ` Mark Brown 2013-03-25 0:24 ` Kuninori Morimoto @ 2013-03-25 3:11 ` Shawn Guo 2 siblings, 0 replies; 139+ messages in thread From: Shawn Guo @ 2013-03-25 3:11 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Kuninori Morimoto, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On Thu, Mar 21, 2013 at 11:04:05PM -0600, Stephen Warren wrote: > However, I do see: > > > ./mpc8610_hpcd.c:213: machine_data->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./p1022_ds.c:223: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./p1022_rdk.c:226: mdata->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev); > > ./imx-sgtl5000.c:151: data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev); > > That's a bit icky; DT-based systems should use .cpu_of_node, not > .cpu_dai_name... Yea, I'm sending a patch to change imx-sgtl5000 driver. Thanks, Stephen. Shawn ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s 2013-03-22 1:19 ` Kuninori Morimoto 2013-03-22 5:04 ` Stephen Warren @ 2013-03-22 10:22 ` Mark Brown 1 sibling, 0 replies; 139+ messages in thread From: Mark Brown @ 2013-03-22 10:22 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 258 bytes --] On Thu, Mar 21, 2013 at 06:19:51PM -0700, Kuninori Morimoto wrote: > arch/powerpc/boot/dts/lite5200.dts seems the user of this driver, > but, it was comment-outed. > And it is using DT, not name matching ? Yes, this driver has only ever been used with DT. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 20/54 v2] ASoC: switch over to use snd_soc_register_component() on fsl ssi 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (18 preceding siblings ...) 2013-03-21 10:31 ` [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto @ 2013-03-21 10:32 ` Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 21/54 v2] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto ` (34 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:32 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/fsl_ssi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 7decbd9..fe04c67 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -574,6 +574,10 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = { .ops = &fsl_ssi_dai_ops, }; +static const struct snd_soc_component_driver fsl_ssi_component = { + .name = "fsl-ssi", +}; + /* Show the statistics of a flag only if its interrupt is enabled. The * compiler will optimze this code to a no-op if the interrupt is not * enabled. @@ -782,7 +786,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) /* Register with ASoC */ dev_set_drvdata(&pdev->dev, ssi_private); - ret = snd_soc_register_dai(&pdev->dev, &ssi_private->cpu_dai_drv); + ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component, + &ssi_private->cpu_dai_drv, 1); if (ret) { dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); goto error_dev; @@ -835,7 +840,7 @@ done: error_dai: if (ssi_private->ssi_on_imx) platform_device_unregister(ssi_private->imx_pcm_pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); error_dev: dev_set_drvdata(&pdev->dev, NULL); @@ -873,7 +878,7 @@ static int fsl_ssi_remove(struct platform_device *pdev) clk_disable_unprepare(ssi_private->clk); clk_put(ssi_private->clk); } - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); device_remove_file(&pdev->dev, &ssi_private->dev_attr); free_irq(ssi_private->irq, ssi_private); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 21/54 v2] ASoC: switch over to use snd_soc_register_component() on imx ssi 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (19 preceding siblings ...) 2013-03-21 10:32 ` [PATCH 20/54 v2] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto @ 2013-03-21 10:32 ` Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto ` (33 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:32 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/fsl/imx-ssi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 55464a5..90110ad 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -413,6 +413,10 @@ static struct snd_soc_dai_driver imx_ac97_dai = { .ops = &imx_ssi_pcm_dai_ops, }; +static const struct snd_soc_component_driver imx_component = { + .name = DRV_NAME, +}; + static void setup_channel_to_ac97(struct imx_ssi *imx_ssi) { void __iomem *base = imx_ssi->base; @@ -586,7 +590,8 @@ static int imx_ssi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ssi); - ret = snd_soc_register_dai(&pdev->dev, dai); + ret = snd_soc_register_component(&pdev->dev, &imx_component, + dai, 1); if (ret) { dev_err(&pdev->dev, "register DAI failed\n"); goto failed_register; @@ -627,7 +632,7 @@ failed_pdev_alloc: failed_pdev_fiq_add: platform_device_put(ssi->soc_platform_pdev_fiq); failed_pdev_fiq_alloc: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); failed_register: release_mem_region(res->start, resource_size(res)); failed_get_resource: @@ -645,7 +650,7 @@ static int imx_ssi_remove(struct platform_device *pdev) platform_device_unregister(ssi->soc_platform_pdev); platform_device_unregister(ssi->soc_platform_pdev_fiq); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (ssi->flags & IMX_SSI_USE_AC97) ac97_ssi = NULL; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (20 preceding siblings ...) 2013-03-21 10:32 ` [PATCH 21/54 v2] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto @ 2013-03-21 10:32 ` Kuninori Morimoto 2013-03-25 10:48 ` Lars-Peter Clausen 2013-03-21 10:32 ` [PATCH 23/54 v2] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto ` (32 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:32 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 6cef491..9a12644 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = { .resume = jz4740_i2s_resume, }; +static const struct snd_soc_component_driver jz4740_i2s_component = { + .name = "jz4740-i2s", +}; + static int jz4740_i2s_dev_probe(struct platform_device *pdev) { struct jz4740_i2s *i2s; @@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, i2s); - ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component, + &jz4740_i2s_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register DAI\n"); @@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev) { struct jz4740_i2s *i2s = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); clk_put(i2s->clk_aic); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s 2013-03-21 10:32 ` [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto @ 2013-03-25 10:48 ` Lars-Peter Clausen 0 siblings, 0 replies; 139+ messages in thread From: Lars-Peter Clausen @ 2013-03-25 10:48 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Stephen Warren, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 11:32 AM, Kuninori Morimoto wrote: > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> > --- > sound/soc/jz4740/jz4740-i2s.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c > index 6cef491..9a12644 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = { > .resume = jz4740_i2s_resume, > }; > > +static const struct snd_soc_component_driver jz4740_i2s_component = { > + .name = "jz4740-i2s", > +}; > + > static int jz4740_i2s_dev_probe(struct platform_device *pdev) > { > struct jz4740_i2s *i2s; > @@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) > } > > platform_set_drvdata(pdev, i2s); > - ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai); > + ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component, > + &jz4740_i2s_dai, 1); > > if (ret) { > dev_err(&pdev->dev, "Failed to register DAI\n"); > @@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev) > { > struct jz4740_i2s *i2s = platform_get_drvdata(pdev); > > - snd_soc_unregister_dai(&pdev->dev); > + snd_soc_unregister_component(&pdev->dev); > > clk_put(i2s->clk_i2s); > clk_put(i2s->clk_aic); ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 23/54 v2] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (21 preceding siblings ...) 2013-03-21 10:32 ` [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto @ 2013-03-21 10:32 ` Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 24/54 v2] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto ` (31 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:32 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index c74c890..befe68f 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = { .ops = &kirkwood_i2s_dai_ops, }; +static const struct snd_soc_component_driver kirkwood_i2s_component = { + .name = DRV_NAME, +}; + static int kirkwood_i2s_dev_probe(struct platform_device *pdev) { struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data; @@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128; } - err = snd_soc_register_dai(&pdev->dev, soc_dai); + err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component, + soc_dai, 1); if (!err) return 0; - dev_err(&pdev->dev, "snd_soc_register_dai failed\n"); + dev_err(&pdev->dev, "snd_soc_register_component failed\n"); if (!IS_ERR(priv->extclk)) { clk_disable_unprepare(priv->extclk); @@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) { struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (!IS_ERR(priv->extclk)) { clk_disable_unprepare(priv->extclk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 24/54 v2] ASoC: switch over to use snd_soc_register_component() on sst 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (22 preceding siblings ...) 2013-03-21 10:32 ` [PATCH 23/54 v2] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto @ 2013-03-21 10:32 ` Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 25/54 v2] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto ` (30 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:32 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/mid-x86/sst_platform.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index a263cbe..31a829c 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c @@ -165,6 +165,10 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { }, }; +static const struct snd_soc_component_driver sst_component = { + .name = "sst", +}; + /* helper functions */ static inline void sst_set_stream_status(struct sst_runtime_stream *stream, int state) @@ -683,7 +687,7 @@ static int sst_platform_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_register_dais(&pdev->dev, + ret = snd_soc_register_component(&pdev->dev, &sst_component, sst_platform_dai, ARRAY_SIZE(sst_platform_dai)); if (ret) { pr_err("registering cpu dais failed\n"); @@ -695,7 +699,7 @@ static int sst_platform_probe(struct platform_device *pdev) static int sst_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); + snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); pr_debug("sst_platform_remove success\n"); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 25/54 v2] ASoC: switch over to use snd_soc_register_component() on mxs saif 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (23 preceding siblings ...) 2013-03-21 10:32 ` [PATCH 24/54 v2] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto @ 2013-03-21 10:33 ` Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 26/54 v2] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto ` (29 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:33 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/mxs/mxs-saif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 3a2aa1d..3e78ba8 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -627,6 +627,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = { .ops = &mxs_saif_dai_ops, }; +static const struct snd_soc_component_driver mxs_saif_component = { + .name = "mxs-saif", +}; + static irqreturn_t mxs_saif_irq(int irq, void *dev_id) { struct mxs_saif *saif = dev_id; @@ -763,7 +767,8 @@ static int mxs_saif_probe(struct platform_device *pdev) platform_set_drvdata(pdev, saif); - ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai); + ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component, + &mxs_saif_dai, 1); if (ret) { dev_err(&pdev->dev, "register DAI failed\n"); return ret; @@ -778,7 +783,7 @@ static int mxs_saif_probe(struct platform_device *pdev) return 0; failed_pdev_alloc: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } @@ -786,7 +791,7 @@ failed_pdev_alloc: static int mxs_saif_remove(struct platform_device *pdev) { mxs_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 26/54 v2] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (24 preceding siblings ...) 2013-03-21 10:33 ` [PATCH 25/54 v2] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto @ 2013-03-21 10:33 ` Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 27/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto ` (28 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:33 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/nuc900/nuc900-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 0418467..fe3285c 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { .ops = &nuc900_ac97_dai_ops, }; +static const struct snd_soc_component_driver nuc900_ac97_component = { + .name = "nuc900-ac97", +}; + static int nuc900_ac97_drvprobe(struct platform_device *pdev) { struct nuc900_audio *nuc900_audio; @@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) nuc900_ac97_data = nuc900_audio; - ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component, + &nuc900_ac97_dai, 1); if (ret) goto out3; @@ -384,7 +389,7 @@ out0: static int nuc900_ac97_drvremove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(nuc900_ac97_data->clk); iounmap(nuc900_ac97_data->mmio); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 27/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcbsp 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (25 preceding siblings ...) 2013-03-21 10:33 ` [PATCH 26/54 v2] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto @ 2013-03-21 10:33 ` Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 28/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto ` (27 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:33 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-mcbsp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 8d2defd..f51685d 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -586,6 +586,10 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = { .ops = &mcbsp_dai_ops, }; +static const struct snd_soc_component_driver omap_mcbsp_component = { + .name = "omap-mcbsp", +}; + static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -793,7 +797,8 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) ret = omap_mcbsp_init(pdev); if (!ret) - return snd_soc_register_dai(&pdev->dev, &omap_mcbsp_dai); + return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, + &omap_mcbsp_dai, 1); return ret; } @@ -802,7 +807,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) { struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 28/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcpdm 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (26 preceding siblings ...) 2013-03-21 10:33 ` [PATCH 27/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto @ 2013-03-21 10:33 ` Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 29/54 v2] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto ` (26 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:33 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-mcpdm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 5ca11bd..4cc9807 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -420,6 +420,10 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = { .ops = &omap_mcpdm_dai_ops, }; +static const struct snd_soc_component_driver omap_mcpdm_component = { + .name = "omap-mcpdm", +}; + void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd, u8 rx1, u8 rx2) { @@ -480,12 +484,13 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) mcpdm->dev = &pdev->dev; - return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); + return snd_soc_register_component(&pdev->dev, &omap_mcpdm_component, + &omap_mcpdm_dai, 1); } static int asoc_mcpdm_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 29/54 v2] ASoC: switch over to use snd_soc_register_component() on omap dmic 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (27 preceding siblings ...) 2013-03-21 10:33 ` [PATCH 28/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto @ 2013-03-21 10:33 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 30/54 v2] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto ` (25 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:33 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-dmic.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index ba49ccd..4c54542 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -448,6 +448,10 @@ static struct snd_soc_dai_driver omap_dmic_dai = { .ops = &omap_dmic_dai_ops, }; +static const struct snd_soc_component_driver omap_dmic_component = { + .name = "omap-dmic", +}; + static int asoc_dmic_probe(struct platform_device *pdev) { struct omap_dmic *dmic; @@ -507,7 +511,8 @@ static int asoc_dmic_probe(struct platform_device *pdev) goto err_put_clk; } - ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); + ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component, + &omap_dmic_dai, 1); if (ret) goto err_put_clk; @@ -522,7 +527,7 @@ static int asoc_dmic_remove(struct platform_device *pdev) { struct omap_dmic *dmic = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(dmic->fclk); return 0; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 30/54 v2] ASoC: switch over to use snd_soc_register_component() on omap hdmi 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (28 preceding siblings ...) 2013-03-21 10:33 ` [PATCH 29/54 v2] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 31/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto ` (24 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/omap/omap-hdmi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index 32fa840..7e120cc 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -264,6 +264,10 @@ static struct snd_soc_dai_driver omap_hdmi_dai = { .ops = &omap_hdmi_dai_ops, }; +static const struct snd_soc_component_driver omap_hdmi_component = { + .name = DRV_NAME, +}; + static int omap_hdmi_probe(struct platform_device *pdev) { int ret; @@ -321,7 +325,8 @@ static int omap_hdmi_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_dai(&pdev->dev, &omap_hdmi_dai); + ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, + &omap_hdmi_dai, 1); return ret; } @@ -330,7 +335,7 @@ static int omap_hdmi_remove(struct platform_device *pdev) { struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); if (hdmi_data == NULL) { dev_err(&pdev->dev, "cannot obtain HDMi data\n"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 31/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa ssp 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (29 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 30/54 v2] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 32/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto ` (23 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa-ssp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index d3eb0c2..6f4dd75 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -794,14 +794,19 @@ static struct snd_soc_dai_driver pxa_ssp_dai = { .ops = &pxa_ssp_dai_ops, }; +static const struct snd_soc_component_driver pxa_ssp_component = { + .name = "pxa-ssp", +}; + static int asoc_ssp_probe(struct platform_device *pdev) { - return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai); + return snd_soc_register_component(&pdev->dev, &pxa_ssp_component, + &pxa_ssp_dai, 1); } static int asoc_ssp_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 32/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (30 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 31/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 33/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto ` (22 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-ac97.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 88d2cc6..57ea8e6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -233,6 +233,10 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { }, }; +static const struct snd_soc_component_driver pxa_ac97_component = { + .name = "pxa-ac97", +}; + static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { if (pdev->id != -1) { @@ -244,13 +248,13 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) * driver to do interesting things with the clocking to get us up * and running. */ - return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver, - ARRAY_SIZE(pxa_ac97_dai_driver)); + return snd_soc_register_component(&pdev->dev, &pxa_ac97_component, + pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver)); } static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 33/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (31 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 32/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 34/54 v2] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto ` (21 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/pxa2xx-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 6b1a06f..f7ca716 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -360,14 +360,19 @@ static struct snd_soc_dai_driver pxa_i2s_dai = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver pxa_i2s_component = { + .name = "pxa-i2s", +}; + static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) { - return snd_soc_register_dai(&pdev->dev, &pxa_i2s_dai); + return snd_soc_register_component(&pdev->dev, &pxa_i2s_component, + &pxa_i2s_dai, 1); } static int pxa2xx_i2s_drv_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 34/54 v2] ASoC: switch over to use snd_soc_register_component() on mmp sspa 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (32 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 33/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 35/54 v2] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto ` (20 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/pxa/mmp-sspa.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 9140c4a..a647799 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -405,6 +405,10 @@ struct snd_soc_dai_driver mmp_sspa_dai = { .ops = &mmp_sspa_dai_ops, }; +static const struct snd_soc_component_driver mmp_sspa_component = { + .name = "mmp-sspa", +}; + static int asoc_mmp_sspa_probe(struct platform_device *pdev) { struct sspa_priv *priv; @@ -450,7 +454,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) priv->dai_fmt = (unsigned int) -1; platform_set_drvdata(pdev, priv); - return snd_soc_register_dai(&pdev->dev, &mmp_sspa_dai); + return snd_soc_register_component(&pdev->dev, &mmp_sspa_component, + &mmp_sspa_dai, 1); } static int asoc_mmp_sspa_remove(struct platform_device *pdev) @@ -460,7 +465,7 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev) clk_disable(priv->audio_clk); clk_put(priv->audio_clk); clk_put(priv->sysclk); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 35/54 v2] ASoC: switch over to use snd_soc_register_component() on s6000 i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (33 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 34/54 v2] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto @ 2013-03-21 10:34 ` Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 36/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto ` (19 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:34 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/s6000/s6000-i2s.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index fee4d47..73bb99f 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { .ops = &s6000_i2s_dai_ops, }; +static const struct snd_soc_component_driver s6000_i2s_component = { + .name = "s6000-i2s", +}; + static int s6000_i2s_probe(struct platform_device *pdev) { struct s6000_i2s_dev *dev; @@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev) S6_I2S_INT_UNDERRUN | S6_I2S_INT_OVERRUN); - ret = snd_soc_register_dai(&pdev->dev, &s6000_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &s6000_i2s_component, + &s6000_i2s_dai, 1); if (ret) goto err_release_dev; @@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev) struct resource *region; void __iomem *mmio = dev->scbbase; - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); s6000_i2s_stop_channel(dev, 0); s6000_i2s_stop_channel(dev, 1); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 36/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (34 preceding siblings ...) 2013-03-21 10:34 ` [PATCH 35/54 v2] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto @ 2013-03-21 10:35 ` Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 37/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto ` (18 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:35 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/s3c24xx-i2s.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 13f6dd1..5403176 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -465,11 +465,16 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = { .ops = &s3c24xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver s3c24xx_i2s_component = { + .name = "s3c24xx-i2s", +}; + static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, + &s3c24xx_i2s_dai, 1); if (ret) { pr_err("failed to register the dai\n"); return ret; @@ -483,14 +488,14 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return 0; err: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } static int s3c24xx_iis_dev_remove(struct platform_device *pdev) { asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 37/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (35 preceding siblings ...) 2013-03-21 10:35 ` [PATCH 36/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto @ 2013-03-21 10:35 ` Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 38/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto ` (17 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:35 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/s3c-i2s-v2.c | 9 +++++---- sound/soc/samsung/s3c-i2s-v2.h | 7 ++++--- sound/soc/samsung/s3c2412-i2s.c | 12 +++++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index 7a73380..20e98d1 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -731,8 +731,9 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai) #define s3c2412_i2s_resume NULL #endif -int s3c_i2sv2_register_dai(struct device *dev, int id, - struct snd_soc_dai_driver *drv) +int s3c_i2sv2_register_component(struct device *dev, int id, + struct snd_soc_component_driver *cmp_drv, + struct snd_soc_dai_driver *dai_drv) { struct snd_soc_dai_ops *ops = drv->ops; @@ -750,8 +751,8 @@ int s3c_i2sv2_register_dai(struct device *dev, int id, drv->suspend = s3c2412_i2s_suspend; drv->resume = s3c2412_i2s_resume; - return snd_soc_register_dai(dev, drv); + return snd_soc_register_component(dev, cmp_drv, dai_drv, 1); } -EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); +EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component); MODULE_LICENSE("GPL"); diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h index f8297d9..90abab3 100644 --- a/sound/soc/samsung/s3c-i2s-v2.h +++ b/sound/soc/samsung/s3c-i2s-v2.h @@ -92,7 +92,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, unsigned long base); /** - * s3c_i2sv2_register_dai - register dai with soc core + * s3c_i2sv2_register_component - register component and dai with soc core * @dev: DAI device * @id: DAI ID * @drv: The driver structure to register @@ -100,7 +100,8 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, * Fill in any missing fields and then register the given dai with the * soc core. */ -extern int s3c_i2sv2_register_dai(struct device *dev, int id, - struct snd_soc_dai_driver *drv); +extern int s3c_i2sv2_register_component(struct device *dev, int id, + struct snd_soc_component_driver *cmp_drv, + struct snd_soc_dai_driver *dai_drv); #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */ diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 2213377..47e2386 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -160,11 +160,17 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = { .ops = &s3c2412_i2s_dai_ops, }; +static const struct snd_soc_component_driver s3c2412_i2s_component = { + .name = "s3c2412-i2s", +}; + static int s3c2412_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai); + ret = s3c_i2sv2_register_component(&pdev->dev, -1, + &s3c2412_i2s_component, + &s3c2412_i2s_dai); if (ret) { pr_err("failed to register the dai\n"); return ret; @@ -178,14 +184,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) return 0; err: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } static int s3c2412_iis_dev_remove(struct platform_device *pdev) { asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 38/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (36 preceding siblings ...) 2013-03-21 10:35 ` [PATCH 37/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto @ 2013-03-21 10:35 ` Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 39/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto ` (16 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:35 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/ac97.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 0df3c56..32ff594 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -370,6 +370,10 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { }, }; +static const struct snd_soc_component_driver s3c_ac97_component = { + .name = "s3c-ac97", +}; + static int s3c_ac97_probe(struct platform_device *pdev) { struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res; @@ -457,8 +461,8 @@ static int s3c_ac97_probe(struct platform_device *pdev) goto err4; } - ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai, - ARRAY_SIZE(s3c_ac97_dai)); + ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component, + s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai)); if (ret) goto err5; @@ -470,7 +474,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) return 0; err6: - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); + snd_soc_unregister_component(&pdev->dev); err5: free_irq(irq_res->start, NULL); err4: @@ -490,7 +494,7 @@ static int s3c_ac97_remove(struct platform_device *pdev) struct resource *mem_res, *irq_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); + snd_soc_unregister_component(&pdev->dev); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (irq_res) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 39/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung spdif 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (37 preceding siblings ...) 2013-03-21 10:35 ` [PATCH 38/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto @ 2013-03-21 10:35 ` Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 40/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto ` (15 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:35 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/spdif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5008e5b..2e5ebb2 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -357,6 +357,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = { .resume = spdif_resume, }; +static const struct snd_soc_component_driver samsung_spdif_component = { + .name = "samsung-spdif", +}; + static int spdif_probe(struct platform_device *pdev) { struct s3c_audio_pdata *spdif_pdata; @@ -424,7 +428,8 @@ static int spdif_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, spdif); - ret = snd_soc_register_dai(&pdev->dev, &samsung_spdif_dai); + ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component, + &samsung_spdif_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "fail to register dai\n"); goto err4; @@ -445,7 +450,7 @@ static int spdif_probe(struct platform_device *pdev) return 0; err5: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); err4: iounmap(spdif->regs); err3: @@ -466,7 +471,7 @@ static int spdif_remove(struct platform_device *pdev) struct resource *mem_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(spdif->regs); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 40/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (38 preceding siblings ...) 2013-03-21 10:35 ` [PATCH 39/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto @ 2013-03-21 10:35 ` Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 41/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto ` (14 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:35 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/i2s.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index d7231e3..efa7314 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -963,6 +963,10 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = { .delay = i2s_delay, }; +static const struct snd_soc_component_driver samsung_i2s_component = { + .name = "samsung-i2s", +}; + #define SAMSUNG_I2S_RATES SNDRV_PCM_RATE_8000_96000 #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ @@ -1107,8 +1111,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (samsung_dai_type == TYPE_SEC) { sec_dai = dev_get_drvdata(&pdev->dev); - snd_soc_register_dai(&sec_dai->pdev->dev, - &sec_dai->i2s_dai_drv); + snd_soc_register_component(&sec_dai->pdev->dev, + &samsung_i2s_component, + &sec_dai->i2s_dai_drv, 1); asoc_dma_platform_register(&pdev->dev); return 0; } @@ -1237,7 +1242,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) } } - snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv); + snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component, + &pri_dai->i2s_dai_drv, 1); pm_runtime_enable(&pdev->dev); @@ -1276,7 +1282,7 @@ static int samsung_i2s_remove(struct platform_device *pdev) i2s->sec_dai = NULL; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 41/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung pcm 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (39 preceding siblings ...) 2013-03-21 10:35 ` [PATCH 40/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto @ 2013-03-21 10:36 ` Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 42/54 v2] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto ` (13 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:36 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/pcm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 13bab79..1566afe 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -490,6 +490,10 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = { }, }; +static const struct snd_soc_component_driver s3c_pcm_component = { + .name = "s3c-pcm", +}; + static int s3c_pcm_dev_probe(struct platform_device *pdev) { struct s3c_pcm_info *pcm; @@ -583,7 +587,8 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); - ret = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]); + ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component, + &s3c_pcm_dai[pdev->id], 1); if (ret != 0) { dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); goto err5; @@ -598,7 +603,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) return 0; err6: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); err5: clk_disable_unprepare(pcm->pclk); clk_put(pcm->pclk); @@ -619,7 +624,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) struct resource *mem_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); pm_runtime_disable(&pdev->dev); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 42/54 v2] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (40 preceding siblings ...) 2013-03-21 10:36 ` [PATCH 41/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto @ 2013-03-21 10:36 ` Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto ` (12 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:36 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/samsung/goni_wm8994.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index d37ede5..415ad81 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c @@ -218,6 +218,10 @@ static struct snd_soc_dai_driver voice_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE,}, }; +static const struct snd_soc_component_driver voice_component = { + .name = "goni-voice", +}; + static struct snd_soc_ops goni_voice_ops = { .hw_params = goni_voice_hw_params, }; @@ -270,7 +274,8 @@ static int __init goni_init(void) return -ENOMEM; /* register voice DAI here */ - ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai); + ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component, + &voice_dai, 1); if (ret) { platform_device_put(goni_snd_device); return ret; @@ -280,7 +285,7 @@ static int __init goni_init(void) ret = platform_device_add(goni_snd_device); if (ret) { - snd_soc_unregister_dai(&goni_snd_device->dev); + snd_soc_unregister_component(&goni_snd_device->dev); platform_device_put(goni_snd_device); } @@ -289,7 +294,7 @@ static int __init goni_init(void) static void __exit goni_exit(void) { - snd_soc_unregister_dai(&goni_snd_device->dev); + snd_soc_unregister_component(&goni_snd_device->dev); platform_device_unregister(goni_snd_device); } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (41 preceding siblings ...) 2013-03-21 10:36 ` [PATCH 42/54 v2] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto @ 2013-03-21 10:36 ` Kuninori Morimoto 2013-03-21 16:58 ` Stephen Warren 2013-03-21 10:36 ` [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto ` (11 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:36 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/ssi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index c8e73a7..e889405 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c @@ -379,15 +379,19 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = { #endif }; +static const struct snd_soc_component_driver sh4_ssi_component = { + .name = "sh4-ssi", +}; + static int sh4_soc_dai_probe(struct platform_device *pdev) { - return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, - ARRAY_SIZE(sh4_ssi_dai)); + return snd_soc_register_component(&pdev->dev, &sh4_ssi_component, + sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai)); } static int sh4_soc_dai_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi 2013-03-21 10:36 ` [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto @ 2013-03-21 16:58 ` Stephen Warren 2013-03-22 0:17 ` Kuninori Morimoto 0 siblings, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-21 16:58 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 04:36 AM, Kuninori Morimoto wrote: > diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c > static int sh4_soc_dai_probe(struct platform_device *pdev) > { > - return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, > - ARRAY_SIZE(sh4_ssi_dai)); > + return snd_soc_register_component(&pdev->dev, &sh4_ssi_component, > + sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai)); > } ARRAY_SIZE(sh4_ssi_dai) might be 1 or 2 here, based on #ifdef CONFIG_CPU_SUBTYPE_SH7760. If it's 1, then this change switches the code from calling snd_soc_register_dais() to snd_soc_register_dai(). This might be a problem. In practice, perhaps it's won't since the .name fields in the array entries already are "ssi-dai.0" and "ssi-dai.1", so perhaps the device ID is already expected not to be appended (because it's -1 as the device is a singleton)? But, this needs to be checked by someone familiar with the platform... ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi 2013-03-21 16:58 ` Stephen Warren @ 2013-03-22 0:17 ` Kuninori Morimoto 0 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-22 0:17 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto Hi Stephen Thank you for checking patch > > diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c > > > static int sh4_soc_dai_probe(struct platform_device *pdev) > > { > > - return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, > > - ARRAY_SIZE(sh4_ssi_dai)); > > + return snd_soc_register_component(&pdev->dev, &sh4_ssi_component, > > + sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai)); > > } > > ARRAY_SIZE(sh4_ssi_dai) might be 1 or 2 here, based on #ifdef > CONFIG_CPU_SUBTYPE_SH7760. If it's 1, then this change switches the code > from calling snd_soc_register_dais() to snd_soc_register_dai(). This > might be a problem. In practice, perhaps it's won't since the .name > fields in the array entries already are "ssi-dai.0" and "ssi-dai.1", so > perhaps the device ID is already expected not to be appended (because > it's -1 as the device is a singleton)? But, this needs to be checked by > someone familiar with the platform... I'm not sure why, but there was no user for this driver on upstream kernel Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (42 preceding siblings ...) 2013-03-21 10:36 ` [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto @ 2013-03-21 10:36 ` Kuninori Morimoto 2013-03-21 17:00 ` Stephen Warren 2013-03-22 7:54 ` [PATCH 44/54 v3] " Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto ` (10 subsequent siblings) 54 siblings, 2 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:36 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 8526e1e..5014a88 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -153,7 +153,7 @@ static int migor_dai_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link migor_dai = { .name = "wm8978", .stream_name = "WM8978", - .cpu_dai_name = "siu-i2s-dai", + .cpu_dai_name = "siu-pcm-audio", .codec_dai_name = "wm8978-hifi", .platform_name = "siu-pcm-audio", .codec_name = "wm8978.0-001a", diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 34facdc..9dc24ff 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = { .ops = &siu_dai_ops, }; +static const struct snd_soc_component_driver siu_i2s_component = { + .name = "siu-i2s", +}; + static int siu_probe(struct platform_device *pdev) { const struct firmware *fw_entry; @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); /* register using ARRAY version so we can keep dai name */ - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, + &siu_i2s_dai, 1); if (ret < 0) goto edaiinit; @@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev) return ret; esocregp: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); edaiinit: iounmap(info->reg); emapreg: @@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(info->reg); iounmap(info->yram); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-21 10:36 ` [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto @ 2013-03-21 17:00 ` Stephen Warren 2013-03-22 0:21 ` Kuninori Morimoto 2013-03-22 7:54 ` [PATCH 44/54 v3] " Kuninori Morimoto 1 sibling, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-21 17:00 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 04:36 AM, Kuninori Morimoto wrote: > diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c > static struct snd_soc_dai_link migor_dai = { > .name = "wm8978", > .stream_name = "WM8978", > - .cpu_dai_name = "siu-i2s-dai", > + .cpu_dai_name = "siu-pcm-audio", I'm not sure what that change is for. The need for it should be described in the commit description. > diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c > @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) > dev_set_drvdata(&pdev->dev, info); > > /* register using ARRAY version so we can keep dai name */ > - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); > + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, > + &siu_i2s_dai, 1); That changes from snd_soc_register_dais() to snd_soc_register_dai(). Will that be a problem? ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-21 17:00 ` Stephen Warren @ 2013-03-22 0:21 ` Kuninori Morimoto 2013-03-22 4:39 ` Stephen Warren 0 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-22 0:21 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto Hi Stephen Thank you for your checking > > static struct snd_soc_dai_link migor_dai = { > > .name = "wm8978", > > .stream_name = "WM8978", > > - .cpu_dai_name = "siu-i2s-dai", > > + .cpu_dai_name = "siu-pcm-audio", > > I'm not sure what that change is for. The need for it should be > described in the commit description. > > > diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c > > > @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) > > dev_set_drvdata(&pdev->dev, info); > > > > /* register using ARRAY version so we can keep dai name */ > > - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); > > + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, > > + &siu_i2s_dai, 1); > > That changes from snd_soc_register_dais() to snd_soc_register_dai(). > Will that be a problem? I think .cpu_dai_name will be "siu-i2s-dai" if it used dais(), and it will be "siu-pcm-audio" if it used dai() Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-22 0:21 ` Kuninori Morimoto @ 2013-03-22 4:39 ` Stephen Warren 0 siblings, 0 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-22 4:39 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 06:21 PM, Kuninori Morimoto wrote: > > Hi Stephen > > Thank you for your checking > > >>> static struct snd_soc_dai_link migor_dai = { >>> .name = "wm8978", >>> .stream_name = "WM8978", >>> - .cpu_dai_name = "siu-i2s-dai", >>> + .cpu_dai_name = "siu-pcm-audio", >> >> I'm not sure what that change is for. The need for it should be >> described in the commit description. >> >>> diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c >> >>> @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) >>> dev_set_drvdata(&pdev->dev, info); >>> >>> /* register using ARRAY version so we can keep dai name */ >>> - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); >>> + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, >>> + &siu_i2s_dai, 1); >> >> That changes from snd_soc_register_dais() to snd_soc_register_dai(). >> Will that be a problem? > > I think .cpu_dai_name will be "siu-i2s-dai" if it used dais(), > and it will be "siu-pcm-audio" if it used dai() Ah right, the difference between fmt_single_name() and fmt_multiple_name() is dev_name() vs. dai_drv->name; I thought it was just about including the device ID from dev_name(), or chopping it off. So, I think this is fine. A description of the change to migor_dai would be useful to explain this though. ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 44/54 v3] ASoC: switch over to use snd_soc_register_component() on sh4 siu 2013-03-21 10:36 ` [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto 2013-03-21 17:00 ` Stephen Warren @ 2013-03-22 7:54 ` Kuninori Morimoto 1 sibling, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-22 7:54 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto siu_dai.c is using snd_soc_register_dais(), even though array size of siu_i2s_dai is 1. OTOH, new API snd_soc_register_component() uses properly snd_soc_register_dai() (henceforth dai()) or snd_soc_register_dais() (henceforth dais()) via num_dai. Then, cpu_dai_name will be "siu-i2s-dai" if dais() was used, and it will be "siu-pcm-audio" if dai() was used. Therefore this patch fixup migor_dai :: cpu_dai_name too. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- v2 -> v3 - Description was updated sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 8526e1e..5014a88 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -153,7 +153,7 @@ static int migor_dai_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link migor_dai = { .name = "wm8978", .stream_name = "WM8978", - .cpu_dai_name = "siu-i2s-dai", + .cpu_dai_name = "siu-pcm-audio", .codec_dai_name = "wm8978-hifi", .platform_name = "siu-pcm-audio", .codec_name = "wm8978.0-001a", diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 34facdc..9dc24ff 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = { .ops = &siu_dai_ops, }; +static const struct snd_soc_component_driver siu_i2s_component = { + .name = "siu-i2s", +}; + static int siu_probe(struct platform_device *pdev) { const struct firmware *fw_entry; @@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); /* register using ARRAY version so we can keep dai name */ - ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, + &siu_i2s_dai, 1); if (ret < 0) goto edaiinit; @@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev) return ret; esocregp: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); edaiinit: iounmap(info->reg); emapreg: @@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(info->reg); iounmap(info->yram); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (43 preceding siblings ...) 2013-03-21 10:36 ` [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto @ 2013-03-21 10:36 ` Kuninori Morimoto 2013-03-21 17:01 ` Stephen Warren 2013-03-21 10:37 ` [PATCH 46/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto ` (9 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:36 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/hac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 4cc2d64..af19f77 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -310,15 +310,19 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = { #endif }; +static const struct snd_soc_component_driver sh4_hac_component = { + .name = "sh4-hac", +}; + static int hac_soc_platform_probe(struct platform_device *pdev) { - return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, - ARRAY_SIZE(sh4_hac_dai)); + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, + sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); } static int hac_soc_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai)); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac 2013-03-21 10:36 ` [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto @ 2013-03-21 17:01 ` Stephen Warren 2013-03-22 0:25 ` Kuninori Morimoto 0 siblings, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-21 17:01 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 04:36 AM, Kuninori Morimoto wrote: > static int hac_soc_platform_probe(struct platform_device *pdev) > { > - return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, > - ARRAY_SIZE(sh4_hac_dai)); > + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, > + sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); > } Again, ARRAY_SIZE(sh4_hac_dai) == 1 or 2 based on #ifdef CONFIG_CPU_SUBTYPE_SH7760, so the names might change due to falling back to snd_soc_register_dai() instead of snd_soc_register_dais(). ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac 2013-03-21 17:01 ` Stephen Warren @ 2013-03-22 0:25 ` Kuninori Morimoto 2013-03-22 4:44 ` Stephen Warren 0 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-22 0:25 UTC (permalink / raw) To: Stephen Warren Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto Hi Stephen Thank you for checking patch > > static int hac_soc_platform_probe(struct platform_device *pdev) > > { > > - return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, > > - ARRAY_SIZE(sh4_hac_dai)); > > + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, > > + sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); > > } > > Again, ARRAY_SIZE(sh4_hac_dai) == 1 or 2 based on #ifdef > CONFIG_CPU_SUBTYPE_SH7760, so the names might change due to falling back > to snd_soc_register_dai() instead of snd_soc_register_dais(). The user of this driver was only sh7760-ac97.c in upstream kernel, and it have CONFIG_CPU_SUBTYPE_SH7760 (ARRAY_SIZE() == 2). So, it always use dais() Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 139+ messages in thread
* Re: [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac 2013-03-22 0:25 ` Kuninori Morimoto @ 2013-03-22 4:44 ` Stephen Warren 0 siblings, 0 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-22 4:44 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 06:25 PM, Kuninori Morimoto wrote: > > Hi Stephen > > Thank you for checking patch > >>> static int hac_soc_platform_probe(struct platform_device *pdev) >>> { >>> - return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, >>> - ARRAY_SIZE(sh4_hac_dai)); >>> + return snd_soc_register_component(&pdev->dev, &sh4_hac_component, >>> + sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); >>> } >> >> Again, ARRAY_SIZE(sh4_hac_dai) == 1 or 2 based on #ifdef >> CONFIG_CPU_SUBTYPE_SH7760, so the names might change due to falling back >> to snd_soc_register_dai() instead of snd_soc_register_dais(). > > The user of this driver was only sh7760-ac97.c in upstream kernel, > and it have CONFIG_CPU_SUBTYPE_SH7760 (ARRAY_SIZE() == 2). > So, it always use dais() Oh yes, the Kconfig that enables this driver depends on CPU_SUBTYPE_SH7760. I wonder why the ifdef is there. ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 46/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif out 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (44 preceding siblings ...) 2013-03-21 10:36 ` [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 47/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto ` (8 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/spear/spdif_out.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index 5eac4cd..1e3c3dd 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -270,6 +270,10 @@ static struct snd_soc_dai_driver spdif_out_dai = { .ops = &spdif_out_dai_ops, }; +static const struct snd_soc_component_driver spdif_out_component = { + .name = "spdif-out", +}; + static int spdif_out_probe(struct platform_device *pdev) { struct spdif_out_dev *host; @@ -314,7 +318,8 @@ static int spdif_out_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, host); - ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai); + ret = snd_soc_register_component(&pdev->dev, &spdif_out_component, + &spdif_out_dai, 1); if (ret != 0) { clk_put(host->clk); return ret; @@ -327,7 +332,7 @@ static int spdif_out_remove(struct platform_device *pdev) { struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(host->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 47/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif in 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (45 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 46/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 48/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto ` (7 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/spear/spdif_in.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index c7c4b20..14d57e8 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -170,6 +170,10 @@ struct snd_soc_dai_driver spdif_in_dai = { .ops = &spdif_in_dai_ops, }; +static const struct snd_soc_component_driver spdif_in_component = { + .name = "spdif-in", +}; + static irqreturn_t spdif_in_irq(int irq, void *arg) { struct spdif_in_dev *host = (struct spdif_in_dev *)arg; @@ -258,7 +262,8 @@ static int spdif_in_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_register_dai(&pdev->dev, &spdif_in_dai); + ret = snd_soc_register_component(&pdev->dev, &spdif_in_component, + &spdif_in_dai, 1); if (ret != 0) { clk_put(host->clk); return ret; @@ -271,7 +276,7 @@ static int spdif_in_remove(struct platform_device *pdev) { struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); dev_set_drvdata(&pdev->dev, NULL); clk_put(host->clk); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 48/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (46 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 47/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 49/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto ` (6 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra30_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index f4e1ce8..f138d8f 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -336,6 +336,10 @@ static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver tegra30_i2s_component = { + .name = DRV_NAME, +}; + static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -464,7 +468,8 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &i2s->dai); + ret = snd_soc_register_component(&pdev->dev, &tegra30_i2s_component, + &i2s->dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -474,13 +479,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra30_i2s_runtime_suspend(&pdev->dev); @@ -501,7 +506,7 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev) tegra30_i2s_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 49/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (47 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 48/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto ` (5 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_spdif.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 04771d1..6fce0be 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -182,6 +182,10 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = { .ops = &tegra20_spdif_dai_ops, }; +static const struct snd_soc_component_driver tegra20_spdif_component = { + .name = DRV_NAME, +}; + static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -329,7 +333,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &tegra20_spdif_dai); + ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component, + &tegra20_spdif_dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -339,13 +344,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_spdif_runtime_suspend(&pdev->dev); @@ -366,7 +371,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev) tegra20_spdif_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(spdif->clk_spdif_out); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (48 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 49/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 17:03 ` Stephen Warren 2013-03-21 10:37 ` [PATCH 51/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto ` (4 subsequent siblings) 54 siblings, 1 reply; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_ac97.c | 15 ++++++++++----- sound/soc/tegra/tegra_wm9712.c | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 336dcdd..b5cee92 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -248,6 +248,10 @@ static struct snd_soc_dai_driver tegra20_ac97_dai = { .ops = &tegra20_ac97_dai_ops, }; +static const struct snd_soc_component_driver tegra20_ac97_component = { + .name = DRV_NAME, +}; + static bool tegra20_ac97_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -398,7 +402,8 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ac97->playback_dma_data.width = 32; ac97->playback_dma_data.req_sel = of_dma[1]; - ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1); + ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, + &tegra20_ac97_dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -408,7 +413,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); @@ -434,8 +439,8 @@ err_asoc_utils_fini: tegra_asoc_utils_fini(&ac97->util_data); err_unregister_pcm: tegra_pcm_platform_unregister(&pdev->dev); -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_clk_put: clk_put(ac97->clk_ac97); err: @@ -447,7 +452,7 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev) struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); tegra_asoc_utils_fini(&ac97->util_data); diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c index 68d4240..6839f88 100644 --- a/sound/soc/tegra/tegra_wm9712.c +++ b/sound/soc/tegra/tegra_wm9712.c @@ -55,7 +55,7 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link tegra_wm9712_dai = { .name = "AC97 HiFi", .stream_name = "AC97 HiFi", - .cpu_dai_name = "tegra-ac97-pcm", + .cpu_dai_name = "tegra20-ac97", .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", .init = tegra_wm9712_init, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 2013-03-21 10:37 ` [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto @ 2013-03-21 17:03 ` Stephen Warren [not found] ` <1363886347.1846.10.camel@antimon> 0 siblings, 1 reply; 139+ messages in thread From: Stephen Warren @ 2013-03-21 17:03 UTC (permalink / raw) To: Lucas Stach Cc: Linux-ALSA, Lars-Peter Clausen, Kuninori Morimoto, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 04:37 AM, Kuninori Morimoto wrote: Lucas, can you please test this to make sure that the change from snd_soc_register_dais() to snd_soc_register_dai() (the latter inside snd_soc_register_component()) coupled with the change to the tegra_wm9712.c machine driver yields the correct results. Thanks. > diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c > - ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1); > + ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component, > + &tegra20_ac97_dai, 1); > diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c > static struct snd_soc_dai_link tegra_wm9712_dai = { > .name = "AC97 HiFi", > .stream_name = "AC97 HiFi", > - .cpu_dai_name = "tegra-ac97-pcm", > + .cpu_dai_name = "tegra20-ac97", ^ permalink raw reply [flat|nested] 139+ messages in thread
[parent not found: <1363886347.1846.10.camel@antimon>]
* Re: [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 [not found] ` <1363886347.1846.10.camel@antimon> @ 2013-03-21 17:20 ` Stephen Warren 0 siblings, 0 replies; 139+ messages in thread From: Stephen Warren @ 2013-03-21 17:20 UTC (permalink / raw) To: Lucas Stach Cc: Linux-ALSA, Lars-Peter Clausen, Kuninori Morimoto, Mark Brown, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto On 03/21/2013 11:19 AM, Lucas Stach wrote: > Am Donnerstag, den 21.03.2013, 11:03 -0600 schrieb Stephen Warren: >> On 03/21/2013 04:37 AM, Kuninori Morimoto wrote: >> >> Lucas, can you please test this to make sure that the change from >> snd_soc_register_dais() to snd_soc_register_dai() (the latter inside >> snd_soc_register_component()) coupled with the change to the >> tegra_wm9712.c machine driver yields the correct results. Thanks. > > Can someone please FWD me the whole patch? I'm not subscribed to > ALSA-devel and wasn't on CC for this patch. I'll do that off-list. ^ permalink raw reply [flat|nested] 139+ messages in thread
* [PATCH 51/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (49 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto @ 2013-03-21 10:37 ` Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 52/54 v2] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto ` (3 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:37 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/tegra/tegra20_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index caa772d..8b1ceb8 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -276,6 +276,10 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { .symmetric_rates = 1, }; +static const struct snd_soc_component_driver tegra20_i2s_component = { + .name = DRV_NAME, +}; + static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -419,7 +423,8 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) goto err_pm_disable; } - ret = snd_soc_register_dai(&pdev->dev, &i2s->dai); + ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component, + &i2s->dai, 1); if (ret) { dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); ret = -ENOMEM; @@ -429,13 +434,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) ret = tegra_pcm_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + goto err_unregister_component; } return 0; -err_unregister_dai: - snd_soc_unregister_dai(&pdev->dev); +err_unregister_component: + snd_soc_unregister_component(&pdev->dev); err_suspend: if (!pm_runtime_status_suspended(&pdev->dev)) tegra20_i2s_runtime_suspend(&pdev->dev); @@ -456,7 +461,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev) tegra20_i2s_runtime_suspend(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); clk_put(i2s->clk_i2s); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 52/54 v2] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (50 preceding siblings ...) 2013-03-21 10:37 ` [PATCH 51/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto @ 2013-03-21 10:38 ` Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 53/54 v2] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto ` (2 subsequent siblings) 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:38 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/txx9/txx9aclc-ac97.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 16ab696..8a28403 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -170,6 +170,10 @@ static struct snd_soc_dai_driver txx9aclc_ac97_dai = { }, }; +static const struct snd_soc_component_driver txx9aclc_ac97_component = { + .name = "txx9aclc-ac97", +}; + static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) { struct txx9aclc_plat_drvdata *drvdata; @@ -205,12 +209,13 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (err < 0) return err; - return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai); + return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component, + &txx9aclc_ac97_dai, 1); } static int txx9aclc_ac97_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 53/54 v2] ASoC: switch over to use snd_soc_register_component() on ux500 msp 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (51 preceding siblings ...) 2013-03-21 10:38 ` [PATCH 52/54 v2] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto @ 2013-03-21 10:38 ` Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 54/54 v2] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto 2013-03-26 21:56 ` [PATCH 0/54 v2] ASoC: switch over to use snd_soc_register_component() Mark Brown 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:38 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/ux500/ux500_msp_dai.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 94a3e57..f1e8a5e 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -768,6 +768,11 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = { }, }; +static const struct snd_soc_component_driver ux500_msp_component = { + .name = "ux500-msp", +}; + + static int ux500_msp_drv_probe(struct platform_device *pdev) { struct ux500_msp_i2s_drvdata *drvdata; @@ -825,8 +830,8 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, drvdata); - ret = snd_soc_register_dai(&pdev->dev, - &ux500_msp_dai_drv[drvdata->msp->id]); + ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component, + &ux500_msp_dai_drv[drvdata->msp->id], 1); if (ret < 0) { dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n", __func__, drvdata->msp->id); @@ -844,7 +849,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) return 0; err_reg_plat: - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); + snd_soc_unregister_component(&pdev->dev); err_init_msp: clk_put(drvdata->clk); err_clk: @@ -861,7 +866,7 @@ static int ux500_msp_drv_remove(struct platform_device *pdev) ux500_pcm_unregister_platform(pdev); - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); + snd_soc_unregister_component(&pdev->dev); devm_regulator_put(drvdata->reg_vape); prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* [PATCH 54/54 v2] ASoC: snd_soc_[un]register_dai[s]() become non global function 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (52 preceding siblings ...) 2013-03-21 10:38 ` [PATCH 53/54 v2] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto @ 2013-03-21 10:38 ` Kuninori Morimoto 2013-03-26 21:56 ` [PATCH 0/54 v2] ASoC: switch over to use snd_soc_register_component() Mark Brown 54 siblings, 0 replies; 139+ messages in thread From: Kuninori Morimoto @ 2013-03-21 10:38 UTC (permalink / raw) To: Mark Brown, Liam Girdwood, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi Cc: Linux-ALSA, Simon, Kuninori Morimoto All drivers are using snd_soc_register_component() instead of snd_soc_register_dai[s]() snd_soc_[un]register_dai[s]() are no longer needed Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- include/sound/soc-dai.h | 8 -------- sound/soc/soc-core.c | 12 ++++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 3d84808..ae9a227 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -95,14 +95,6 @@ struct snd_soc_dai_driver; struct snd_soc_dai; struct snd_ac97_bus_ops; -/* Digital Audio Interface registration */ -int snd_soc_register_dai(struct device *dev, - struct snd_soc_dai_driver *dai_drv); -void snd_soc_unregister_dai(struct device *dev); -int snd_soc_register_dais(struct device *dev, - struct snd_soc_dai_driver *dai_drv, size_t count); -void snd_soc_unregister_dais(struct device *dev, size_t count); - /* Digital Audio Interface clocking API.*/ int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2ecaaf1..f6cda7b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3739,7 +3739,7 @@ static inline char *fmt_multiple_name(struct device *dev, * * @dai: DAI to register */ -int snd_soc_register_dai(struct device *dev, +static int snd_soc_register_dai(struct device *dev, struct snd_soc_dai_driver *dai_drv) { struct snd_soc_codec *codec; @@ -3786,14 +3786,13 @@ int snd_soc_register_dai(struct device *dev, return 0; } -EXPORT_SYMBOL_GPL(snd_soc_register_dai); /** * snd_soc_unregister_dai - Unregister a DAI from the ASoC core * * @dai: DAI to unregister */ -void snd_soc_unregister_dai(struct device *dev) +static void snd_soc_unregister_dai(struct device *dev) { struct snd_soc_dai *dai; @@ -3812,7 +3811,6 @@ found: kfree(dai->name); kfree(dai); } -EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); /** * snd_soc_register_dais - Register multiple DAIs with the ASoC core @@ -3820,7 +3818,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai); * @dai: Array of DAIs to register * @count: Number of DAIs */ -int snd_soc_register_dais(struct device *dev, +static int snd_soc_register_dais(struct device *dev, struct snd_soc_dai_driver *dai_drv, size_t count) { struct snd_soc_codec *codec; @@ -3884,7 +3882,6 @@ err: return ret; } -EXPORT_SYMBOL_GPL(snd_soc_register_dais); /** * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core @@ -3892,14 +3889,13 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dais); * @dai: Array of DAIs to unregister * @count: Number of DAIs */ -void snd_soc_unregister_dais(struct device *dev, size_t count) +static void snd_soc_unregister_dais(struct device *dev, size_t count) { int i; for (i = 0; i < count; i++) snd_soc_unregister_dai(dev); } -EXPORT_SYMBOL_GPL(snd_soc_unregister_dais); /** * snd_soc_register_platform - Register a platform with the ASoC core -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 139+ messages in thread
* Re: [PATCH 0/54 v2] ASoC: switch over to use snd_soc_register_component() 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto ` (53 preceding siblings ...) 2013-03-21 10:38 ` [PATCH 54/54 v2] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto @ 2013-03-26 21:56 ` Mark Brown 54 siblings, 0 replies; 139+ messages in thread From: Mark Brown @ 2013-03-26 21:56 UTC (permalink / raw) To: Kuninori Morimoto Cc: Linux-ALSA, Lars-Peter Clausen, Stephen Warren, Peter Ujfalusi, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 379 bytes --] On Thu, Mar 21, 2013 at 07:26:34PM +0900, Kuninori Morimoto wrote: > These are v2 patch set of switch over to use snd_soc_register_component() > instead of snd_soc_register_dai[s]() on all drivers Applied all, thanks a lot for all your hard work on this! I think I got the latest version of everything, if not please send incremental fixups. Seems to work fine on my systems. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 139+ messages in thread
end of thread, other threads:[~2013-03-26 21:56 UTC | newest] Thread overview: 139+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-03-18 6:18 [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 01/53] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:19 ` [PATCH 02/53] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 03/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 04/53] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto, Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 05/53] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 06/53] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto 2013-03-18 6:20 ` [PATCH 07/53] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 08/53] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 09/53] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto 2013-03-18 6:21 ` [PATCH 10/53] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto 2013-03-18 6:22 ` [PATCH 11/53] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 12/53] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 13/53] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 14/53] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 15/53] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto 2013-03-18 6:23 ` [PATCH 16/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 17/53] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 18/53] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 19/53] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 20/53] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 21/53] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 22/53] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto 2013-03-18 6:24 ` [PATCH 23/53] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 24/53] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 25/53] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto 2013-03-19 12:36 ` Peter Ujfalusi 2013-03-18 6:25 ` [PATCH 26/53] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto 2013-03-18 6:25 ` [PATCH 27/53] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 28/53] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 29/53] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 30/53] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 31/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 32/53] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto 2013-03-18 6:26 ` [PATCH 33/53] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto 2013-03-18 6:27 ` [PATCH 34/53] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto 2013-03-18 6:27 ` [PATCH 35/53] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 01/18] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 37/53] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 38/53] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 39/53] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto 2013-03-18 6:33 ` [PATCH 40/53] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 41/53] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 42/53] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 43/53] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 44/53] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 45/53] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 46/53] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto 2013-03-18 6:34 ` [PATCH 47/53] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto 2013-03-18 15:39 ` Stephen Warren 2013-03-18 6:35 ` [PATCH 48/53] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 49/53] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 50/53] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 51/53] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 52/53] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto 2013-03-18 6:35 ` [PATCH 53/53] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto 2013-03-18 15:44 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen 2013-03-19 0:32 ` Kuninori Morimoto 2013-03-19 0:36 ` [PATCH] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto 2013-03-19 8:35 ` [PATCH 0/53] ASoC: switch over to use snd_soc_register_component() Lars-Peter Clausen 2013-03-19 15:38 ` Stephen Warren 2013-03-21 0:14 ` Kuninori Morimoto 2013-03-21 10:26 ` [PATCH 0/54 v2] " Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 01/54 v2] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Kuninori Morimoto 2013-03-21 10:27 ` [PATCH 02/54 v2] ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition Kuninori Morimoto 2013-03-22 11:13 ` Mark Brown 2013-03-21 10:28 ` [PATCH 03/54 v2] ASoC: switch over to use snd_soc_register_component() on atmel ssc Kuninori Morimoto 2013-03-21 10:28 ` [PATCH 04/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x i2sc Kuninori Morimoto 2013-03-21 10:28 ` [PATCH 05/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 06/54 v2] ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 07/54] ASoC: switch over to use snd_soc_register_component() on au1x ac97c Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 08/54 v2] ASoC: switch over to use snd_soc_register_component() on bf6xx i2s Kuninori Morimoto 2013-03-21 10:29 ` [PATCH 09/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 10/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx i2s Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 11/54 v2] ASoC: switch over to use snd_soc_register_component() on bf5xx tdm Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 12/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 13/54 v2] ASoC: switch over to use snd_soc_register_component() on ep93xx i2s Kuninori Morimoto 2013-03-21 10:30 ` [PATCH 14/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci i2s Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 15/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci vcif Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 16/54 v2] ASoC: switch over to use snd_soc_register_component() on davinci mcasp Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 17/54 v2] ASoC: switch over to use snd_soc_register_component() on dw i2s Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 18/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 Kuninori Morimoto 2013-03-21 10:31 ` [PATCH 19/54 v2] ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s Kuninori Morimoto 2013-03-21 16:53 ` Stephen Warren 2013-03-22 1:19 ` Kuninori Morimoto 2013-03-22 5:04 ` Stephen Warren 2013-03-22 10:26 ` Mark Brown 2013-03-25 0:24 ` Kuninori Morimoto 2013-03-25 15:58 ` Stephen Warren 2013-03-25 3:11 ` Shawn Guo 2013-03-22 10:22 ` Mark Brown 2013-03-21 10:32 ` [PATCH 20/54 v2] ASoC: switch over to use snd_soc_register_component() on fsl ssi Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 21/54 v2] ASoC: switch over to use snd_soc_register_component() on imx ssi Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s Kuninori Morimoto 2013-03-25 10:48 ` Lars-Peter Clausen 2013-03-21 10:32 ` [PATCH 23/54 v2] ASoC: switch over to use snd_soc_register_component() on kirkwood i2s Kuninori Morimoto 2013-03-21 10:32 ` [PATCH 24/54 v2] ASoC: switch over to use snd_soc_register_component() on sst Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 25/54 v2] ASoC: switch over to use snd_soc_register_component() on mxs saif Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 26/54 v2] ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 27/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcbsp Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 28/54 v2] ASoC: switch over to use snd_soc_register_component() on omap mcpdm Kuninori Morimoto 2013-03-21 10:33 ` [PATCH 29/54 v2] ASoC: switch over to use snd_soc_register_component() on omap dmic Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 30/54 v2] ASoC: switch over to use snd_soc_register_component() on omap hdmi Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 31/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa ssp Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 32/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 33/54 v2] ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 34/54 v2] ASoC: switch over to use snd_soc_register_component() on mmp sspa Kuninori Morimoto 2013-03-21 10:34 ` [PATCH 35/54 v2] ASoC: switch over to use snd_soc_register_component() on s6000 i2s Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 36/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 37/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c i2s Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 38/54 v2] ASoC: switch over to use snd_soc_register_component() on s3c ac97 Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 39/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung spdif Kuninori Morimoto 2013-03-21 10:35 ` [PATCH 40/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung i2s Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 41/54 v2] ASoC: switch over to use snd_soc_register_component() on samsung pcm Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 42/54 v2] ASoC: switch over to use snd_soc_register_component() on goni_wm8994 Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 43/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 ssi Kuninori Morimoto 2013-03-21 16:58 ` Stephen Warren 2013-03-22 0:17 ` Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 44/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 siu Kuninori Morimoto 2013-03-21 17:00 ` Stephen Warren 2013-03-22 0:21 ` Kuninori Morimoto 2013-03-22 4:39 ` Stephen Warren 2013-03-22 7:54 ` [PATCH 44/54 v3] " Kuninori Morimoto 2013-03-21 10:36 ` [PATCH 45/54 v2] ASoC: switch over to use snd_soc_register_component() on sh4 hac Kuninori Morimoto 2013-03-21 17:01 ` Stephen Warren 2013-03-22 0:25 ` Kuninori Morimoto 2013-03-22 4:44 ` Stephen Warren 2013-03-21 10:37 ` [PATCH 46/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif out Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 47/54 v2] ASoC: switch over to use snd_soc_register_component() on spear spdif in Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 48/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra30 i2s Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 49/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 spdif Kuninori Morimoto 2013-03-21 10:37 ` [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 Kuninori Morimoto 2013-03-21 17:03 ` Stephen Warren [not found] ` <1363886347.1846.10.camel@antimon> 2013-03-21 17:20 ` Stephen Warren 2013-03-21 10:37 ` [PATCH 51/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 i2s Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 52/54 v2] ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 53/54 v2] ASoC: switch over to use snd_soc_register_component() on ux500 msp Kuninori Morimoto 2013-03-21 10:38 ` [PATCH 54/54 v2] ASoC: snd_soc_[un]register_dai[s]() become non global function Kuninori Morimoto 2013-03-26 21:56 ` [PATCH 0/54 v2] ASoC: switch over to use snd_soc_register_component() Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.