Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 10:56:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2015-08-30 15:55:41 +01:00
commit d781c23e9b
11 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm2200.c
View File

@ -2481,7 +2481,7 @@ static int wm2200_runtime_resume(struct device *dev)
} }
#endif #endif
static struct dev_pm_ops wm2200_pm = { static const struct dev_pm_ops wm2200_pm = {
SET_RUNTIME_PM_OPS(wm2200_runtime_suspend, wm2200_runtime_resume, SET_RUNTIME_PM_OPS(wm2200_runtime_suspend, wm2200_runtime_resume,
NULL) NULL)
}; };

2
sound/soc/codecs/wm5100.c
View File

@ -2708,7 +2708,7 @@ static int wm5100_runtime_resume(struct device *dev)
} }
#endif #endif
static struct dev_pm_ops wm5100_pm = { static const struct dev_pm_ops wm5100_pm = {
SET_RUNTIME_PM_OPS(wm5100_runtime_suspend, wm5100_runtime_resume, SET_RUNTIME_PM_OPS(wm5100_runtime_suspend, wm5100_runtime_resume,
NULL) NULL)
}; };

2
sound/soc/codecs/wm8962.c
View File

@ -3859,7 +3859,7 @@ static int wm8962_runtime_suspend(struct device *dev)
} }
#endif #endif
static struct dev_pm_ops wm8962_pm = { static const struct dev_pm_ops wm8962_pm = {
SET_RUNTIME_PM_OPS(wm8962_runtime_suspend, wm8962_runtime_resume, NULL) SET_RUNTIME_PM_OPS(wm8962_runtime_suspend, wm8962_runtime_resume, NULL)
}; };

9
sound/soc/pxa/mmp-pcm.c
View File

@ -232,13 +232,7 @@ static int mmp_pcm_probe(struct platform_device *pdev)
mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max = mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max =
pdata->period_max_capture; pdata->period_max_capture;
} }
return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform); return devm_snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);
}
static int mmp_pcm_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
} }
static struct platform_driver mmp_pcm_driver = { static struct platform_driver mmp_pcm_driver = {
@ -247,7 +241,6 @@ static struct platform_driver mmp_pcm_driver = {
}, },
.probe = mmp_pcm_probe, .probe = mmp_pcm_probe,
.remove = mmp_pcm_remove,
}; };
module_platform_driver(mmp_pcm_driver); module_platform_driver(mmp_pcm_driver);

11
sound/soc/pxa/pxa-ssp.c
View File

@ -813,14 +813,8 @@ static const struct of_device_id pxa_ssp_of_ids[] = {
static int asoc_ssp_probe(struct platform_device *pdev) static int asoc_ssp_probe(struct platform_device *pdev)
{ {
return snd_soc_register_component(&pdev->dev, &pxa_ssp_component, return devm_snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
&pxa_ssp_dai, 1); &pxa_ssp_dai, 1);
}
static int asoc_ssp_remove(struct platform_device *pdev)
{
snd_soc_unregister_component(&pdev->dev);
return 0;
} }
static struct platform_driver asoc_ssp_driver = { static struct platform_driver asoc_ssp_driver = {
@ -830,7 +824,6 @@ static struct platform_driver asoc_ssp_driver = {
}, },
.probe = asoc_ssp_probe, .probe = asoc_ssp_probe,
.remove = asoc_ssp_remove,
}; };
module_platform_driver(asoc_ssp_driver); module_platform_driver(asoc_ssp_driver);

11
sound/soc/pxa/pxa2xx-i2s.c
View File

@ -367,19 +367,12 @@ static const struct snd_soc_component_driver pxa_i2s_component = {
static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
{ {
return snd_soc_register_component(&pdev->dev, &pxa_i2s_component, return devm_snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
&pxa_i2s_dai, 1); &pxa_i2s_dai, 1);
}
static int pxa2xx_i2s_drv_remove(struct platform_device *pdev)
{
snd_soc_unregister_component(&pdev->dev);
return 0;
} }
static struct platform_driver pxa2xx_i2s_driver = { static struct platform_driver pxa2xx_i2s_driver = {
.probe = pxa2xx_i2s_drv_probe, .probe = pxa2xx_i2s_drv_probe,
.remove = pxa2xx_i2s_drv_remove,
.driver = { .driver = {
.name = "pxa2xx-i2s", .name = "pxa2xx-i2s",

9
sound/soc/pxa/pxa2xx-pcm.c
View File

@ -124,13 +124,7 @@ static struct snd_soc_platform_driver pxa2xx_soc_platform = {
static int pxa2xx_soc_platform_probe(struct platform_device *pdev) static int pxa2xx_soc_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform); return devm_snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform);
}
static int pxa2xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
@ -147,7 +141,6 @@ static struct platform_driver pxa_pcm_driver = {
}, },
.probe = pxa2xx_soc_platform_probe, .probe = pxa2xx_soc_platform_probe,
.remove = pxa2xx_soc_platform_remove,
}; };
module_platform_driver(pxa_pcm_driver); module_platform_driver(pxa_pcm_driver);

7
sound/soc/qcom/Kconfig
View File

@ -1,5 +1,6 @@
config SND_SOC_QCOM config SND_SOC_QCOM
tristate "ASoC support for QCOM platforms" tristate "ASoC support for QCOM platforms"
depends on ARCH_QCOM || COMPILE_TEST
help help
Say Y or M if you want to add support to use audio devices Say Y or M if you want to add support to use audio devices
in Qualcomm Technologies SOC-based platforms. in Qualcomm Technologies SOC-based platforms.
@ -14,19 +15,17 @@ config SND_SOC_LPASS_PLATFORM
config SND_SOC_LPASS_IPQ806X config SND_SOC_LPASS_IPQ806X
tristate tristate
depends on SND_SOC_QCOM
select SND_SOC_LPASS_CPU select SND_SOC_LPASS_CPU
select SND_SOC_LPASS_PLATFORM select SND_SOC_LPASS_PLATFORM
config SND_SOC_LPASS_APQ8016 config SND_SOC_LPASS_APQ8016
tristate tristate
depends on SND_SOC_QCOM
select SND_SOC_LPASS_CPU select SND_SOC_LPASS_CPU
select SND_SOC_LPASS_PLATFORM select SND_SOC_LPASS_PLATFORM
config SND_SOC_STORM config SND_SOC_STORM
tristate "ASoC I2S support for Storm boards" tristate "ASoC I2S support for Storm boards"
depends on SND_SOC_QCOM && (ARCH_QCOM || COMPILE_TEST) depends on SND_SOC_QCOM
select SND_SOC_LPASS_IPQ806X select SND_SOC_LPASS_IPQ806X
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
help help
@ -35,7 +34,7 @@ config SND_SOC_STORM
config SND_SOC_APQ8016_SBC config SND_SOC_APQ8016_SBC
tristate "SoC Audio support for APQ8016 SBC platforms" tristate "SoC Audio support for APQ8016 SBC platforms"
depends on SND_SOC_QCOM && (ARCH_QCOM || COMPILE_TEST) depends on SND_SOC_QCOM
select SND_SOC_LPASS_APQ8016 select SND_SOC_LPASS_APQ8016
help help
Support for Qualcomm Technologies LPASS audio block in Support for Qualcomm Technologies LPASS audio block in

2
sound/soc/qcom/lpass-cpu.c
View File

@ -235,7 +235,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
return ret; return ret;
} }
struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = { const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = {
.set_sysclk = lpass_cpu_daiops_set_sysclk, .set_sysclk = lpass_cpu_daiops_set_sysclk,
.startup = lpass_cpu_daiops_startup, .startup = lpass_cpu_daiops_startup,
.shutdown = lpass_cpu_daiops_shutdown, .shutdown = lpass_cpu_daiops_shutdown,

2
sound/soc/qcom/lpass-ipq806x.c
View File

@ -73,7 +73,7 @@ static int ipq806x_lpass_free_dma_channel(struct lpass_data *drvdata, int chan)
return 0; return 0;
} }
struct lpass_variant ipq806x_data = { static struct lpass_variant ipq806x_data = {
.i2sctrl_reg_base = 0x0010, .i2sctrl_reg_base = 0x0010,
.i2sctrl_reg_stride = 0x04, .i2sctrl_reg_stride = 0x04,
.i2s_ports = 5, .i2s_ports = 5,

2
sound/soc/qcom/lpass.h
View File

@ -93,6 +93,6 @@ int asoc_qcom_lpass_platform_register(struct platform_device *);
int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev); int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev);
int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev); int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev);
int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai); int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai);
extern struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops; extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops;
#endif /* __LPASS_H__ */ #endif /* __LPASS_H__ */