Unverified Commit 05ff312b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20201112223825.39765-7-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 41656c3d

sound/soc/intel/boards/bytcht_cx2072x.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/intel/boards/bytcht_da7213.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/intel/boards/bytcht_es8316.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

sound/soc/intel/boards/bytcr_rt5640.c

+5 −3
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/intel/boards/bytcr_rt5651.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE