Unverified Commit 93e0f69a authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: finalize Baytrail/CherryTrail support" from... 

Merge series "ASoC: SOF: finalize Baytrail/CherryTrail support" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

This long-overdue patchset adds missing system suspend/resume support
and hardens the IPC to solve module load/unload issues on specific
devices such as Cyan Chromebook. With this series SOF is finally
iso-feature with the legacy driver. Thanks to Ranjani and Keyon for
the basic patches and Enric for testing.

The last part needed for Baytrail/Cherrytrail is simplification of the
driver/card names and turn-key UCM support (on-going work with
Jaroslav).

Keyon Jie (1):
  ASoC: SOF: Intel: BYT: harden IPC initialization and handling

Pierre-Louis Bossart (3):
  ASoC: Intel: bytcr_rt5640/51: remove .ignore_suspend
  ASoC: Intel: byt/cht: add .pm_ops
  ASoC: SOF: Intel: BYT: mask BUSY or DONE interrupts in handler

Ranjani Sridharan (4):
  ASoC: SOF: Intel: byt: Add PM callbacks
  ASoC: SOF: pm: handle resume on legacy Intel platforms
  ASoC: SOF: ipc: ignore DSP replies received when they are not expected
  ASoC: SOF: Intel: BYT: add .remove op

 sound/soc/intel/boards/bytcht_cx2072x.c      |   3 +
 sound/soc/intel/boards/bytcht_da7213.c       |   3 +
 sound/soc/intel/boards/bytcht_es8316.c       |   3 +
 sound/soc/intel/boards/bytcr_rt5640.c        |   7 +-
 sound/soc/intel/boards/bytcr_rt5651.c        |   6 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c |   3 +
 sound/soc/intel/boards/cht_bsw_nau8824.c     |   3 +
 sound/soc/intel/boards/cht_bsw_rt5645.c      |   3 +
 sound/soc/intel/boards/cht_bsw_rt5672.c      |   3 +
 sound/soc/sof/intel/byt.c                    | 116 ++++++++++++++-----
 sound/soc/sof/ipc.c                          |   9 +-
 sound/soc/sof/pm.c                           |   8 +-
 sound/soc/sof/sof-priv.h                     |   2 +-
 13 files changed, 122 insertions(+), 47 deletions(-)

base-commit: 0d71a5cf
--
2.20.1
parents 18545763 3d2e5c48

sound/soc/intel/boards/bytcht_cx2072x.c

+3 −0
Original line number Diff line number Diff line
@@ -261,6 +261,9 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev) 
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

+3 −0
Original line number Diff line number Diff line
@@ -272,6 +272,9 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -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 = {

	.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

+3 −4
Original line number Diff line number Diff line
@@ -910,9 +910,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) 
	if (ret)

		return ret;



	snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");



	if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {

		/*

		 * The firmware might enable the clock at
@@ -1065,7 +1062,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

						| SND_SOC_DAIFMT_CBS_CFS,

		.be_hw_params_fixup = byt_rt5640_codec_fixup,

		.ignore_suspend = 1,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,
@@ -1323,6 +1319,9 @@ 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

+3 −3
Original line number Diff line number Diff line
@@ -601,8 +601,6 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 
		dev_err(card->dev, "unable to add card controls\n");

		return ret;

	}

	snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");

	snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");



	if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {

		/*
@@ -775,7 +773,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

						| SND_SOC_DAIFMT_CBS_CFS,

		.be_hw_params_fixup = byt_rt5651_codec_fixup,

		.ignore_suspend = 1,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,
@@ -1100,6 +1097,9 @@ 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,

};