ASoC: Intel: byt/cht: set pm ops dynamically

The Atom/SST driver does not rely on ASoC power management, but the
SOF driver does. Rather than using a hard-coded build-time assignment,
we can set this pm_ops dynamically depending on what the parent
is. That will remove the last build-time dependency and allow for
coexistence of both SST and SOF drivers for Baytrail/Cherrytrail.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20201112223825.39765-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c
index 762f09190f10bb92f728736df49cdd7272fec023..2bfe3e4c696fd1a218ae239f65e8dee64045a4eb 100644 (file)
--- a/sound/soc/intel/boards/bytcht_cx2072x.c
+++ b/sound/soc/intel/boards/bytcht_cx2072x.c
@@ -275,15 +275,16 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
                byt_cht_cx2072x_card.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        return devm_snd_soc_register_card(&pdev->dev, &byt_cht_cx2072x_card);
 }
 
 static struct platform_driver snd_byt_cht_cx2072x_driver = {
        .driver = {
                .name = "bytcht_cx2072x",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_byt_cht_cx2072x_probe,
 };

diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index ef6682226a853ec0ee17a737edb132260aefe0f3..cfeba27252ba58e0b9565a1172e9708d2316136b 100644 (file)
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -279,6 +279,10 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
                bytcht_da7213_card.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret_val) {
                dev_err(&pdev->dev,
@@ -292,9 +296,6 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
 static struct platform_driver bytcht_da7213_driver = {
        .driver = {
                .name = "bytcht_da7213",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = bytcht_da7213_probe,
 };

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index fbb62bab9dccd54725f9f5da5b78210299c3246f..892cf684216e31945fc6477ab38407fb7725f4c9 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -598,6 +598,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                byt_cht_es8316_card.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               dev->driver->pm = &snd_soc_pm_ops;
+
        /* register the soc card */
        snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv);
 
@@ -623,9 +627,6 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)
 static struct platform_driver snd_byt_cht_es8316_mc_driver = {
        .driver = {
                .name = "bytcht_es8316",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_byt_cht_es8316_mc_probe,
        .remove = snd_byt_cht_es8316_mc_remove,

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 574b489a32836bf02575810a5fbcdaae4f45eb99..18f668fbc64c00d5992b38dc308c5008f4df23d3 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1163,6 +1163,7 @@ struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */
 
 static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        static const char * const map_name[] = { "dmic1", "dmic2", "in1", "in3" };
        const struct dmi_system_id *dmi_id;
        struct byt_rt5640_private *priv;
@@ -1344,6 +1345,10 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                byt_rt5640_card.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               dev->driver->pm = &snd_soc_pm_ops;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5640_card);
 
        if (ret_val) {
@@ -1358,9 +1363,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
 static struct platform_driver snd_byt_rt5640_mc_driver = {
        .driver = {
                .name = "bytcr_rt5640",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_byt_rt5640_mc_probe,
 };

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 69e1d84e4de3d1ef6497a3a7978d1454c2ac2696..f289ec8563a11840ff77039982a88a5573cca4a6 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -1103,6 +1103,10 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                byt_rt5651_card.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);
 
        if (ret_val) {
@@ -1117,9 +1121,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
 static struct platform_driver snd_byt_rt5651_mc_driver = {
        .driver = {
                .name = "bytcr_rt5651",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_byt_rt5651_mc_probe,
 };

diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index a1d456d7a9c29e298e5ff84416aa9fa982b4ad5b..131882378a5947a09258dc26623c8ce45ac1e974 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -610,6 +610,10 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snd_soc_card_cht.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               dev->driver->pm = &snd_soc_pm_ops;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
        if (ret_val) {
                dev_err(&pdev->dev,
@@ -634,9 +638,6 @@ static int snd_cht_mc_remove(struct platform_device *pdev)
 static struct platform_driver snd_cht_mc_driver = {
        .driver = {
                .name = "cht-bsw-max98090",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_cht_mc_probe,
        .remove = snd_cht_mc_remove,

diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c
index f173793d867bfb17ca2e4fd1a547edf33d7865ef..8131af1730f7a76ea395bc372b24e15dc14600cb 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_nau8824.c
+++ b/sound/soc/intel/boards/cht_bsw_nau8824.c
@@ -285,6 +285,10 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snd_soc_card_cht.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        /* register the soc card */
        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
        if (ret_val) {
@@ -300,9 +304,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 static struct platform_driver snd_cht_mc_driver = {
        .driver = {
                .name = "cht-bsw-nau8824",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_cht_mc_probe,
 };

diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index bdaf8d00fc6b8f0d060a03610795ceee85dccf48..6fea554cfed572bb4966bcb0b6c7a5add9ddbeff 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -691,6 +691,10 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snd_soc_card_chtrt5650.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        ret_val = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret_val) {
                dev_err(&pdev->dev,
@@ -704,9 +708,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 static struct platform_driver snd_cht_mc_driver = {
        .driver = {
                .name = "cht-bsw-rt5645",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_cht_mc_probe,
 };

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index 6c46bfc43b504f8d534d63de3a97ab5d9b4cdedf..10c88ef2f85d46fc6ea8f712444cc985af750481 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -466,6 +466,10 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
                snd_soc_card_cht.driver_name = DRIVER_NAME;
        }
 
+       /* set pm ops */
+       if (sof_parent)
+               pdev->dev.driver->pm = &snd_soc_pm_ops;
+
        /* register the soc card */
        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
        if (ret_val) {
@@ -480,9 +484,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 static struct platform_driver snd_cht_mc_driver = {
        .driver = {
                .name = "cht-bsw-rt5672",
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
-               .pm = &snd_soc_pm_ops,
-#endif
        },
        .probe = snd_cht_mc_probe,
 };