Commit 68224376 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: Intel: byt/cht: add .pm_ops

Add required .pm_ops to support suspend/resume on baytrail/cherrytrail
machines.

This .pm_ops is conditionally-added to avoid impacting the legacy
driver where power management is handled differently.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tested-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200526203640.25980-5-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 512e7672
...@@ -261,6 +261,9 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev) ...@@ -261,6 +261,9 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
static struct platform_driver snd_byt_cht_cx2072x_driver = { static struct platform_driver snd_byt_cht_cx2072x_driver = {
.driver = { .driver = {
.name = "bytcht_cx2072x", .name = "bytcht_cx2072x",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_byt_cht_cx2072x_probe, .probe = snd_byt_cht_cx2072x_probe,
}; };
......
...@@ -272,6 +272,9 @@ static int bytcht_da7213_probe(struct platform_device *pdev) ...@@ -272,6 +272,9 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
static struct platform_driver bytcht_da7213_driver = { static struct platform_driver bytcht_da7213_driver = {
.driver = { .driver = {
.name = "bytcht_da7213", .name = "bytcht_da7213",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = bytcht_da7213_probe, .probe = bytcht_da7213_probe,
}; };
......
...@@ -605,6 +605,9 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev) ...@@ -605,6 +605,9 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)
static struct platform_driver snd_byt_cht_es8316_mc_driver = { static struct platform_driver snd_byt_cht_es8316_mc_driver = {
.driver = { .driver = {
.name = "bytcht_es8316", .name = "bytcht_es8316",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_byt_cht_es8316_mc_probe, .probe = snd_byt_cht_es8316_mc_probe,
.remove = snd_byt_cht_es8316_mc_remove, .remove = snd_byt_cht_es8316_mc_remove,
......
...@@ -1319,6 +1319,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) ...@@ -1319,6 +1319,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_byt_rt5640_mc_driver = { static struct platform_driver snd_byt_rt5640_mc_driver = {
.driver = { .driver = {
.name = "bytcr_rt5640", .name = "bytcr_rt5640",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_byt_rt5640_mc_probe, .probe = snd_byt_rt5640_mc_probe,
}; };
......
...@@ -1097,6 +1097,9 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) ...@@ -1097,6 +1097,9 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_byt_rt5651_mc_driver = { static struct platform_driver snd_byt_rt5651_mc_driver = {
.driver = { .driver = {
.name = "bytcr_rt5651", .name = "bytcr_rt5651",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_byt_rt5651_mc_probe, .probe = snd_byt_rt5651_mc_probe,
}; };
......
...@@ -616,6 +616,9 @@ static int snd_cht_mc_remove(struct platform_device *pdev) ...@@ -616,6 +616,9 @@ static int snd_cht_mc_remove(struct platform_device *pdev)
static struct platform_driver snd_cht_mc_driver = { static struct platform_driver snd_cht_mc_driver = {
.driver = { .driver = {
.name = "cht-bsw-max98090", .name = "cht-bsw-max98090",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_cht_mc_probe, .probe = snd_cht_mc_probe,
.remove = snd_cht_mc_remove, .remove = snd_cht_mc_remove,
......
...@@ -282,6 +282,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev) ...@@ -282,6 +282,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_cht_mc_driver = { static struct platform_driver snd_cht_mc_driver = {
.driver = { .driver = {
.name = "cht-bsw-nau8824", .name = "cht-bsw-nau8824",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_cht_mc_probe, .probe = snd_cht_mc_probe,
}; };
......
...@@ -680,6 +680,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev) ...@@ -680,6 +680,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_cht_mc_driver = { static struct platform_driver snd_cht_mc_driver = {
.driver = { .driver = {
.name = "cht-bsw-rt5645", .name = "cht-bsw-rt5645",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_cht_mc_probe, .probe = snd_cht_mc_probe,
}; };
......
...@@ -459,6 +459,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev) ...@@ -459,6 +459,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
static struct platform_driver snd_cht_mc_driver = { static struct platform_driver snd_cht_mc_driver = {
.driver = { .driver = {
.name = "cht-bsw-rt5672", .name = "cht-bsw-rt5672",
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
.pm = &snd_soc_pm_ops,
#endif
}, },
.probe = snd_cht_mc_probe, .probe = snd_cht_mc_probe,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment