ASoC: Samsung: Do not register samsung audio dma device as pdev
Previously, the ASoC 'platform' (PCM/DMA) object was instantiated via a platform_device. This didn't represent the hardware well, since there was no separate hardware associated with this platform_device; it was a virtual device with sole purpose to call snd_soc_register_platform(). This change removes the platform_device completely. Each Samsung DAI now registers the ASoC 'platform' itself. Machine drivers are adjusted for the new 'platform' name. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
1974a042dd
commit
a08485d8fd
|
@ -147,7 +147,6 @@ static struct platform_device *armlex4210_devices[] __initdata = {
|
||||||
&s3c_device_hsmmc3,
|
&s3c_device_hsmmc3,
|
||||||
&s3c_device_rtc,
|
&s3c_device_rtc,
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&armlex4210_smsc911x,
|
&armlex4210_smsc911x,
|
||||||
&exynos4_device_ahci,
|
&exynos4_device_ahci,
|
||||||
};
|
};
|
||||||
|
|
|
@ -311,7 +311,6 @@ static struct platform_device *smdkv310_devices[] __initdata = {
|
||||||
&s5p_device_mfc_l,
|
&s5p_device_mfc_l,
|
||||||
&s5p_device_mfc_r,
|
&s5p_device_mfc_r,
|
||||||
&exynos4_device_spdif,
|
&exynos4_device_spdif,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&samsung_asoc_idma,
|
&samsung_asoc_idma,
|
||||||
&s5p_device_fimd0,
|
&s5p_device_fimd0,
|
||||||
&smdkv310_device_audio,
|
&smdkv310_device_audio,
|
||||||
|
|
|
@ -521,7 +521,6 @@ static struct platform_device *gta02_devices[] __initdata = {
|
||||||
>a02_nor_flash,
|
>a02_nor_flash,
|
||||||
&s3c24xx_pwm_device,
|
&s3c24xx_pwm_device,
|
||||||
&s3c_device_iis,
|
&s3c_device_iis,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s3c_device_i2c0,
|
&s3c_device_i2c0,
|
||||||
>a02_dfbmcs320_device,
|
>a02_dfbmcs320_device,
|
||||||
>a02_buttons_device,
|
>a02_buttons_device,
|
||||||
|
|
|
@ -632,7 +632,6 @@ static struct platform_device *h1940_devices[] __initdata = {
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&s3c_device_i2c0,
|
&s3c_device_i2c0,
|
||||||
&s3c_device_iis,
|
&s3c_device_iis,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s3c_device_usbgadget,
|
&s3c_device_usbgadget,
|
||||||
&h1940_device_leds,
|
&h1940_device_leds,
|
||||||
&h1940_device_bluetooth,
|
&h1940_device_bluetooth,
|
||||||
|
|
|
@ -519,7 +519,6 @@ static struct platform_device *mini2440_devices[] __initdata = {
|
||||||
&s3c_device_iis,
|
&s3c_device_iis,
|
||||||
&uda1340_codec,
|
&uda1340_codec,
|
||||||
&mini2440_audio,
|
&mini2440_audio,
|
||||||
&samsung_asoc_dma,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init mini2440_map_io(void)
|
static void __init mini2440_map_io(void)
|
||||||
|
|
|
@ -712,7 +712,6 @@ static struct platform_device *rx1950_devices[] __initdata = {
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&s3c_device_i2c0,
|
&s3c_device_i2c0,
|
||||||
&s3c_device_iis,
|
&s3c_device_iis,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s3c_device_usbgadget,
|
&s3c_device_usbgadget,
|
||||||
&s3c_device_rtc,
|
&s3c_device_rtc,
|
||||||
&s3c_device_nand,
|
&s3c_device_nand,
|
||||||
|
|
|
@ -357,7 +357,6 @@ static struct platform_device *crag6410_devices[] __initdata = {
|
||||||
&s3c_device_timer[0],
|
&s3c_device_timer[0],
|
||||||
&s3c64xx_device_iis0,
|
&s3c64xx_device_iis0,
|
||||||
&s3c64xx_device_iis1,
|
&s3c64xx_device_iis1,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&samsung_device_keypad,
|
&samsung_device_keypad,
|
||||||
&crag6410_gpio_keydev,
|
&crag6410_gpio_keydev,
|
||||||
&crag6410_dm9k_device,
|
&crag6410_dm9k_device,
|
||||||
|
|
|
@ -275,7 +275,6 @@ static struct platform_device *smdk6410_devices[] __initdata = {
|
||||||
&s3c_device_fb,
|
&s3c_device_fb,
|
||||||
&s3c_device_ohci,
|
&s3c_device_ohci,
|
||||||
&s3c_device_usb_hsotg,
|
&s3c_device_usb_hsotg,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s3c64xx_device_iisv4,
|
&s3c64xx_device_iisv4,
|
||||||
&samsung_device_keypad,
|
&samsung_device_keypad,
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,6 @@ static struct platform_device *smdk6440_devices[] __initdata = {
|
||||||
&s3c_device_i2c1,
|
&s3c_device_i2c1,
|
||||||
&s3c_device_ts,
|
&s3c_device_ts,
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s5p6440_device_iis,
|
&s5p6440_device_iis,
|
||||||
&s3c_device_fb,
|
&s3c_device_fb,
|
||||||
&smdk6440_lcd_lte480wv,
|
&smdk6440_lcd_lte480wv,
|
||||||
|
|
|
@ -183,7 +183,6 @@ static struct platform_device *smdk6450_devices[] __initdata = {
|
||||||
&s3c_device_i2c1,
|
&s3c_device_i2c1,
|
||||||
&s3c_device_ts,
|
&s3c_device_ts,
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s5p6450_device_iis0,
|
&s5p6450_device_iis0,
|
||||||
&s3c_device_fb,
|
&s3c_device_fb,
|
||||||
&smdk6450_lcd_lte480wv,
|
&smdk6450_lcd_lte480wv,
|
||||||
|
|
|
@ -197,7 +197,6 @@ static struct platform_device *smdkc100_devices[] __initdata = {
|
||||||
&s3c_device_ts,
|
&s3c_device_ts,
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
&smdkc100_lcd_powerdev,
|
&smdkc100_lcd_powerdev,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s5pc100_device_iis0,
|
&s5pc100_device_iis0,
|
||||||
&samsung_device_keypad,
|
&samsung_device_keypad,
|
||||||
&s5pc100_device_ac97,
|
&s5pc100_device_ac97,
|
||||||
|
|
|
@ -85,7 +85,6 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device *smdkc110_devices[] __initdata = {
|
static struct platform_device *smdkc110_devices[] __initdata = {
|
||||||
&samsung_asoc_dma,
|
|
||||||
&s5pv210_device_iis0,
|
&s5pv210_device_iis0,
|
||||||
&s5pv210_device_ac97,
|
&s5pv210_device_ac97,
|
||||||
&s5pv210_device_spdif,
|
&s5pv210_device_spdif,
|
||||||
|
|
|
@ -234,7 +234,6 @@ static struct platform_device *smdkv210_devices[] __initdata = {
|
||||||
&s5pv210_device_ac97,
|
&s5pv210_device_ac97,
|
||||||
&s5pv210_device_iis0,
|
&s5pv210_device_iis0,
|
||||||
&s5pv210_device_spdif,
|
&s5pv210_device_spdif,
|
||||||
&samsung_asoc_dma,
|
|
||||||
&samsung_asoc_idma,
|
&samsung_asoc_idma,
|
||||||
&samsung_device_keypad,
|
&samsung_device_keypad,
|
||||||
&smdkv210_dm9000,
|
&smdkv210_dm9000,
|
||||||
|
|
|
@ -146,15 +146,6 @@ struct platform_device s3c_device_camif = {
|
||||||
|
|
||||||
/* ASOC DMA */
|
/* ASOC DMA */
|
||||||
|
|
||||||
struct platform_device samsung_asoc_dma = {
|
|
||||||
.name = "samsung-audio",
|
|
||||||
.id = -1,
|
|
||||||
.dev = {
|
|
||||||
.dma_mask = &samsung_device_dma_mask,
|
|
||||||
.coherent_dma_mask = DMA_BIT_MASK(32),
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct platform_device samsung_asoc_idma = {
|
struct platform_device samsung_asoc_idma = {
|
||||||
.name = "samsung-idma",
|
.name = "samsung-idma",
|
||||||
.id = -1,
|
.id = -1,
|
||||||
|
|
|
@ -135,7 +135,6 @@ extern struct platform_device exynos4_device_spdif;
|
||||||
|
|
||||||
extern struct platform_device exynos_device_drm;
|
extern struct platform_device exynos_device_drm;
|
||||||
|
|
||||||
extern struct platform_device samsung_asoc_dma;
|
|
||||||
extern struct platform_device samsung_asoc_idma;
|
extern struct platform_device samsung_asoc_idma;
|
||||||
extern struct platform_device samsung_device_keypad;
|
extern struct platform_device samsung_device_keypad;
|
||||||
|
|
||||||
|
|
|
@ -462,8 +462,15 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err5;
|
goto err5;
|
||||||
|
|
||||||
return 0;
|
ret = asoc_dma_platform_register(&pdev->dev);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
|
||||||
|
goto err6;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
err6:
|
||||||
|
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
|
||||||
err5:
|
err5:
|
||||||
free_irq(irq_res->start, NULL);
|
free_irq(irq_res->start, NULL);
|
||||||
err4:
|
err4:
|
||||||
|
@ -482,6 +489,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct resource *mem_res, *irq_res;
|
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_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
|
||||||
|
|
||||||
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||||
|
|
|
@ -233,7 +233,7 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
|
||||||
.stream_name = "CPU-DSP",
|
.stream_name = "CPU-DSP",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm0010-sdi1",
|
.codec_dai_name = "wm0010-sdi1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "spi0.0",
|
.codec_name = "spi0.0",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
| SND_SOC_DAIFMT_CBM_CFM,
|
| SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
@ -257,7 +257,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
|
||||||
.stream_name = "CPU-DSP",
|
.stream_name = "CPU-DSP",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm0010-sdi1",
|
.codec_dai_name = "wm0010-sdi1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "spi0.0",
|
.codec_name = "spi0.0",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
| SND_SOC_DAIFMT_CBM_CFM,
|
| SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
@ -303,7 +303,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
|
||||||
.stream_name = "CPU-DSP",
|
.stream_name = "CPU-DSP",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm0010-sdi1",
|
.codec_dai_name = "wm0010-sdi1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "spi0.0",
|
.codec_name = "spi0.0",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
| SND_SOC_DAIFMT_CBM_CFM,
|
| SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
|
|
@ -432,30 +432,18 @@ static struct snd_soc_platform_driver samsung_asoc_platform = {
|
||||||
.pcm_free = dma_free_dma_buffers,
|
.pcm_free = dma_free_dma_buffers,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit samsung_asoc_platform_probe(struct platform_device *pdev)
|
int __devinit asoc_dma_platform_register(struct device *dev)
|
||||||
{
|
{
|
||||||
return snd_soc_register_platform(&pdev->dev, &samsung_asoc_platform);
|
return snd_soc_register_platform(dev, &samsung_asoc_platform);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(asoc_dma_platform_register);
|
||||||
|
|
||||||
static int __devexit samsung_asoc_platform_remove(struct platform_device *pdev)
|
void __devexit asoc_dma_platform_unregister(struct device *dev)
|
||||||
{
|
{
|
||||||
snd_soc_unregister_platform(&pdev->dev);
|
snd_soc_unregister_platform(dev);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(asoc_dma_platform_unregister);
|
||||||
static struct platform_driver asoc_dma_driver = {
|
|
||||||
.driver = {
|
|
||||||
.name = "samsung-audio",
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
},
|
|
||||||
|
|
||||||
.probe = samsung_asoc_platform_probe,
|
|
||||||
.remove = __devexit_p(samsung_asoc_platform_remove),
|
|
||||||
};
|
|
||||||
|
|
||||||
module_platform_driver(asoc_dma_driver);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
|
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
|
||||||
MODULE_DESCRIPTION("Samsung ASoC DMA Driver");
|
MODULE_DESCRIPTION("Samsung ASoC DMA Driver");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
MODULE_ALIAS("platform:samsung-audio");
|
|
||||||
|
|
|
@ -21,4 +21,7 @@ struct s3c_dma_params {
|
||||||
struct samsung_dma_ops *ops;
|
struct samsung_dma_ops *ops;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
int asoc_dma_platform_register(struct device *dev);
|
||||||
|
void asoc_dma_platform_unregister(struct device *dev);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -228,7 +228,7 @@ static struct snd_soc_dai_link goni_dai[] = {
|
||||||
.stream_name = "WM8994 HiFi",
|
.stream_name = "WM8994 HiFi",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8994-aif1",
|
.codec_dai_name = "wm8994-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8994-codec.0-001a",
|
.codec_name = "wm8994-codec.0-001a",
|
||||||
.init = goni_wm8994_init,
|
.init = goni_wm8994_init,
|
||||||
.ops = &goni_hifi_ops,
|
.ops = &goni_hifi_ops,
|
||||||
|
|
|
@ -207,7 +207,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.codec_dai_name = "uda1380-hifi",
|
.codec_dai_name = "uda1380-hifi",
|
||||||
.init = h1940_uda1380_init,
|
.init = h1940_uda1380_init,
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
.codec_name = "uda1380-codec.0-001a",
|
.codec_name = "uda1380-codec.0-001a",
|
||||||
.ops = &h1940_ops,
|
.ops = &h1940_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -1009,6 +1009,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev)
|
||||||
sec_dai = dev_get_drvdata(&pdev->dev);
|
sec_dai = dev_get_drvdata(&pdev->dev);
|
||||||
snd_soc_register_dai(&sec_dai->pdev->dev,
|
snd_soc_register_dai(&sec_dai->pdev->dev,
|
||||||
&sec_dai->i2s_dai_drv);
|
&sec_dai->i2s_dai_drv);
|
||||||
|
asoc_dma_platform_register(&pdev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1107,6 +1108,8 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
pm_runtime_enable(&pdev->dev);
|
pm_runtime_enable(&pdev->dev);
|
||||||
|
|
||||||
|
asoc_dma_platform_register(&pdev->dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err:
|
err:
|
||||||
release_mem_region(regs_base, resource_size(res));
|
release_mem_region(regs_base, resource_size(res));
|
||||||
|
@ -1135,6 +1138,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev)
|
||||||
i2s->pri_dai = NULL;
|
i2s->pri_dai = NULL;
|
||||||
i2s->sec_dai = NULL;
|
i2s->sec_dai = NULL;
|
||||||
|
|
||||||
|
asoc_dma_platform_unregister(&pdev->dev);
|
||||||
snd_soc_unregister_dai(&pdev->dev);
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -118,7 +118,7 @@ static struct snd_soc_dai_link jive_dai = {
|
||||||
.stream_name = "WM8750",
|
.stream_name = "WM8750",
|
||||||
.cpu_dai_name = "s3c2412-i2s",
|
.cpu_dai_name = "s3c2412-i2s",
|
||||||
.codec_dai_name = "wm8750-hifi",
|
.codec_dai_name = "wm8750-hifi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c2412-i2s",
|
||||||
.codec_name = "wm8750.0-001a",
|
.codec_name = "wm8750.0-001a",
|
||||||
.init = jive_wm8750_init,
|
.init = jive_wm8750_init,
|
||||||
.ops = &jive_ops,
|
.ops = &jive_ops,
|
||||||
|
|
|
@ -145,7 +145,7 @@ static struct snd_soc_dai_link littlemill_dai[] = {
|
||||||
.stream_name = "CPU",
|
.stream_name = "CPU",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8994-aif1",
|
.codec_dai_name = "wm8994-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8994-codec",
|
.codec_name = "wm8994-codec",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
| SND_SOC_DAIFMT_CBM_CFM,
|
| SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
|
|
@ -28,7 +28,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
|
||||||
.cpu_dai_name = "samsung-ac97",
|
.cpu_dai_name = "samsung-ac97",
|
||||||
.codec_dai_name = "ac97-hifi",
|
.codec_dai_name = "ac97-hifi",
|
||||||
.codec_name = "ac97-codec",
|
.codec_name = "ac97-codec",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-ac97",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,7 @@ static struct snd_soc_dai_link lowland_dai[] = {
|
||||||
.stream_name = "CPU",
|
.stream_name = "CPU",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm5100-aif1",
|
.codec_dai_name = "wm5100-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm5100.1-001a",
|
.codec_name = "wm5100.1-001a",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
||||||
SND_SOC_DAIFMT_CBM_CFM,
|
SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
|
|
@ -364,7 +364,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
|
||||||
{ /* Hifi Playback - for similatious use with voice below */
|
{ /* Hifi Playback - for similatious use with voice below */
|
||||||
.name = "WM8753",
|
.name = "WM8753",
|
||||||
.stream_name = "WM8753 HiFi",
|
.stream_name = "WM8753 HiFi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.codec_dai_name = "wm8753-hifi",
|
.codec_dai_name = "wm8753-hifi",
|
||||||
.codec_name = "wm8753.0-001a",
|
.codec_name = "wm8753.0-001a",
|
||||||
|
|
|
@ -589,8 +589,16 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev)
|
||||||
goto err5;
|
goto err5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = asoc_dma_platform_register(&pdev->dev);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
|
||||||
|
goto err6;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
err6:
|
||||||
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
err5:
|
err5:
|
||||||
clk_disable_unprepare(pcm->pclk);
|
clk_disable_unprepare(pcm->pclk);
|
||||||
clk_put(pcm->pclk);
|
clk_put(pcm->pclk);
|
||||||
|
@ -610,6 +618,7 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev)
|
||||||
struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
|
struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
|
||||||
struct resource *mem_res;
|
struct resource *mem_res;
|
||||||
|
|
||||||
|
asoc_dma_platform_unregister(&pdev->dev);
|
||||||
snd_soc_unregister_dai(&pdev->dev);
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
|
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
|
|
@ -85,7 +85,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.codec_dai_name = "uda1380-hifi",
|
.codec_dai_name = "uda1380-hifi",
|
||||||
.init = rx1950_uda1380_init,
|
.init = rx1950_uda1380_init,
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
.codec_name = "uda1380-codec.0-001a",
|
.codec_name = "uda1380-codec.0-001a",
|
||||||
.ops = &rx1950_ops,
|
.ops = &rx1950_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -162,11 +162,29 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
|
||||||
|
|
||||||
static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev)
|
static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
|
int ret = 0;
|
||||||
|
|
||||||
|
ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
|
||||||
|
if (ret) {
|
||||||
|
pr_err("failed to register the dai\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = asoc_dma_platform_register(&pdev->dev);
|
||||||
|
if (ret) {
|
||||||
|
pr_err("failed to register the DMA: %d\n", ret);
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
err:
|
||||||
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)
|
static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
asoc_dma_platform_unregister(&pdev->dev);
|
||||||
snd_soc_unregister_dai(&pdev->dev);
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -467,11 +467,29 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = {
|
||||||
|
|
||||||
static __devinit int s3c24xx_iis_dev_probe(struct platform_device *pdev)
|
static __devinit int s3c24xx_iis_dev_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
return snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
|
int ret = 0;
|
||||||
|
|
||||||
|
ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
|
||||||
|
if (ret) {
|
||||||
|
pr_err("failed to register the dai\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = asoc_dma_platform_register(&pdev->dev);
|
||||||
|
if (ret) {
|
||||||
|
pr_err("failed to register the dma: %d\n", ret);
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
err:
|
||||||
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev)
|
static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
asoc_dma_platform_unregister(&pdev->dev);
|
||||||
snd_soc_unregister_dai(&pdev->dev);
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = {
|
||||||
.codec_name = "tlv320aic3x-codec.0-001a",
|
.codec_name = "tlv320aic3x-codec.0-001a",
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.codec_dai_name = "tlv320aic3x-hifi",
|
.codec_dai_name = "tlv320aic3x-hifi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
.init = simtec_hermes_init,
|
.init = simtec_hermes_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = {
|
||||||
.codec_name = "tlv320aic3x-codec.0-001a",
|
.codec_name = "tlv320aic3x-codec.0-001a",
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.codec_dai_name = "tlv320aic3x-hifi",
|
.codec_dai_name = "tlv320aic3x-hifi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
.init = simtec_tlv320aic23_init,
|
.init = simtec_tlv320aic23_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -224,7 +224,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
|
||||||
.codec_dai_name = "uda134x-hifi",
|
.codec_dai_name = "uda134x-hifi",
|
||||||
.cpu_dai_name = "s3c24xx-iis",
|
.cpu_dai_name = "s3c24xx-iis",
|
||||||
.ops = &s3c24xx_uda134x_ops,
|
.ops = &s3c24xx_uda134x_ops,
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "s3c24xx-iis",
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
|
static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
|
||||||
|
|
|
@ -189,7 +189,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
|
||||||
.stream_name = "SmartQ Hi-Fi",
|
.stream_name = "SmartQ Hi-Fi",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8750-hifi",
|
.codec_dai_name = "wm8750-hifi",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8750.0-0x1a",
|
.codec_name = "wm8750.0-0x1a",
|
||||||
.init = smartq_wm8987_init,
|
.init = smartq_wm8987_init,
|
||||||
.ops = &smartq_hifi_ops,
|
.ops = &smartq_hifi_ops,
|
||||||
|
|
|
@ -24,7 +24,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
|
||||||
.cpu_dai_name = "samsung-ac97",
|
.cpu_dai_name = "samsung-ac97",
|
||||||
.codec_dai_name = "ac97-hifi",
|
.codec_dai_name = "ac97-hifi",
|
||||||
.codec_name = "ac97-codec",
|
.codec_name = "ac97-codec",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-ac97",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,7 @@ static struct snd_soc_ops smdk_spdif_ops = {
|
||||||
static struct snd_soc_dai_link smdk_dai = {
|
static struct snd_soc_dai_link smdk_dai = {
|
||||||
.name = "S/PDIF",
|
.name = "S/PDIF",
|
||||||
.stream_name = "S/PDIF PCM Playback",
|
.stream_name = "S/PDIF PCM Playback",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-spdif",
|
||||||
.cpu_dai_name = "samsung-spdif",
|
.cpu_dai_name = "samsung-spdif",
|
||||||
.codec_dai_name = "dit-hifi",
|
.codec_dai_name = "dit-hifi",
|
||||||
.codec_name = "spdif-dit",
|
.codec_name = "spdif-dit",
|
||||||
|
|
|
@ -176,7 +176,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Playback",
|
.stream_name = "Playback",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8580-hifi-playback",
|
.codec_dai_name = "wm8580-hifi-playback",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8580.0-001b",
|
.codec_name = "wm8580.0-001b",
|
||||||
.ops = &smdk_ops,
|
.ops = &smdk_ops,
|
||||||
},
|
},
|
||||||
|
@ -185,7 +185,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Capture",
|
.stream_name = "Capture",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8580-hifi-capture",
|
.codec_dai_name = "wm8580-hifi-capture",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8580.0-001b",
|
.codec_name = "wm8580.0-001b",
|
||||||
.init = smdk_wm8580_init_paiftx,
|
.init = smdk_wm8580_init_paiftx,
|
||||||
.ops = &smdk_ops,
|
.ops = &smdk_ops,
|
||||||
|
@ -195,7 +195,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Playback",
|
.stream_name = "Playback",
|
||||||
.cpu_dai_name = "samsung-i2s.x",
|
.cpu_dai_name = "samsung-i2s.x",
|
||||||
.codec_dai_name = "wm8580-hifi-playback",
|
.codec_dai_name = "wm8580-hifi-playback",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.x",
|
||||||
.codec_name = "wm8580.0-001b",
|
.codec_name = "wm8580.0-001b",
|
||||||
.ops = &smdk_ops,
|
.ops = &smdk_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -135,7 +135,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Capture",
|
.stream_name = "Capture",
|
||||||
.cpu_dai_name = "samsung-pcm.0",
|
.cpu_dai_name = "samsung-pcm.0",
|
||||||
.codec_dai_name = "wm8580-hifi-capture",
|
.codec_dai_name = "wm8580-hifi-capture",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-pcm.0",
|
||||||
.codec_name = "wm8580.0-001b",
|
.codec_name = "wm8580.0-001b",
|
||||||
.ops = &smdk_wm8580_pcm_ops,
|
.ops = &smdk_wm8580_pcm_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -127,7 +127,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Pri_Dai",
|
.stream_name = "Pri_Dai",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8994-aif1",
|
.codec_dai_name = "wm8994-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8994-codec",
|
.codec_name = "wm8994-codec",
|
||||||
.init = smdk_wm8994_init_paiftx,
|
.init = smdk_wm8994_init_paiftx,
|
||||||
.ops = &smdk_ops,
|
.ops = &smdk_ops,
|
||||||
|
@ -136,7 +136,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Sec_Dai",
|
.stream_name = "Sec_Dai",
|
||||||
.cpu_dai_name = "samsung-i2s.4",
|
.cpu_dai_name = "samsung-i2s.4",
|
||||||
.codec_dai_name = "wm8994-aif1",
|
.codec_dai_name = "wm8994-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.4",
|
||||||
.codec_name = "wm8994-codec",
|
.codec_name = "wm8994-codec",
|
||||||
.ops = &smdk_ops,
|
.ops = &smdk_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -116,7 +116,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||||
.stream_name = "Primary PCM",
|
.stream_name = "Primary PCM",
|
||||||
.cpu_dai_name = "samsung-pcm.0",
|
.cpu_dai_name = "samsung-pcm.0",
|
||||||
.codec_dai_name = "wm8994-aif1",
|
.codec_dai_name = "wm8994-aif1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-pcm.0",
|
||||||
.codec_name = "wm8994-codec",
|
.codec_name = "wm8994-codec",
|
||||||
.ops = &smdk_wm8994_pcm_ops,
|
.ops = &smdk_wm8994_pcm_ops,
|
||||||
},
|
},
|
||||||
|
|
|
@ -42,7 +42,7 @@ static struct snd_soc_card smdk;
|
||||||
static struct snd_soc_dai_link smdk_dai = {
|
static struct snd_soc_dai_link smdk_dai = {
|
||||||
.name = "AC97",
|
.name = "AC97",
|
||||||
.stream_name = "AC97 PCM",
|
.stream_name = "AC97 PCM",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-ac97",
|
||||||
.cpu_dai_name = "samsung-ac97",
|
.cpu_dai_name = "samsung-ac97",
|
||||||
.codec_dai_name = "wm9713-hifi",
|
.codec_dai_name = "wm9713-hifi",
|
||||||
.codec_name = "wm9713-codec",
|
.codec_name = "wm9713-codec",
|
||||||
|
|
|
@ -437,8 +437,15 @@ static __devinit int spdif_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
spdif->dma_playback = &spdif_stereo_out;
|
spdif->dma_playback = &spdif_stereo_out;
|
||||||
|
|
||||||
return 0;
|
ret = asoc_dma_platform_register(&pdev->dev);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(&pdev->dev, "failed to register DMA: %d\n", ret);
|
||||||
|
goto err5;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
err5:
|
||||||
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
err4:
|
err4:
|
||||||
iounmap(spdif->regs);
|
iounmap(spdif->regs);
|
||||||
err3:
|
err3:
|
||||||
|
@ -458,6 +465,7 @@ static __devexit int spdif_remove(struct platform_device *pdev)
|
||||||
struct samsung_spdif_info *spdif = &spdif_info;
|
struct samsung_spdif_info *spdif = &spdif_info;
|
||||||
struct resource *mem_res;
|
struct resource *mem_res;
|
||||||
|
|
||||||
|
asoc_dma_platform_unregister(&pdev->dev);
|
||||||
snd_soc_unregister_dai(&pdev->dev);
|
snd_soc_unregister_dai(&pdev->dev);
|
||||||
|
|
||||||
iounmap(spdif->regs);
|
iounmap(spdif->regs);
|
||||||
|
|
|
@ -198,7 +198,7 @@ static struct snd_soc_dai_link speyside_dai[] = {
|
||||||
.stream_name = "CPU-DSP",
|
.stream_name = "CPU-DSP",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm0010-sdi1",
|
.codec_dai_name = "wm0010-sdi1",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "spi0.0",
|
.codec_name = "spi0.0",
|
||||||
.init = speyside_wm0010_init,
|
.init = speyside_wm0010_init,
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
|
|
|
@ -110,7 +110,7 @@ static struct snd_soc_dai_link tobermory_dai[] = {
|
||||||
.stream_name = "CPU",
|
.stream_name = "CPU",
|
||||||
.cpu_dai_name = "samsung-i2s.0",
|
.cpu_dai_name = "samsung-i2s.0",
|
||||||
.codec_dai_name = "wm8962",
|
.codec_dai_name = "wm8962",
|
||||||
.platform_name = "samsung-audio",
|
.platform_name = "samsung-i2s.0",
|
||||||
.codec_name = "wm8962.1-001a",
|
.codec_name = "wm8962.1-001a",
|
||||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||||
| SND_SOC_DAIFMT_CBM_CFM,
|
| SND_SOC_DAIFMT_CBM_CFM,
|
||||||
|
|
Loading…
Reference in a new issue