| Message ID | 1416390207-11020-1-git-send-email-vinod.koul@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 92a6e2a227da5fcaa5b31c9124eabf8c64a6d9f9 |
| Headers | show |
On Wed, Nov 19, 2014 at 03:13:26PM +0530, Vinod Koul wrote: > For ACPI we missed to pm_runtime_enable() call which is required to tell PM > core that runtime on this device is enabled now. Since this is common to > both PCI and APCI move it out. Also for ACPI we do not require > pm_runtime_allow() call, so remove that Applied, thanks.
Hi Mark and Vinod, Could you tell me where are the two patches in git repo? I cannot find them on topic/intel branch. I want to rebase the Cherrytrail/Braswell machine driver on the two applied patches. Thanks Mengdong > -----Original Message----- > From: alsa-devel-bounces@alsa-project.org > [mailto:alsa-devel-bounces@alsa-project.org] On Behalf Of Mark Brown > Sent: Wednesday, November 19, 2014 6:57 PM > To: Koul, Vinod > Cc: alsa-devel@alsa-project.org; lgirdwood@gmail.com > Subject: Re: [alsa-devel] [PATCH 1/2] ASoC: Intel: cleanup runtime_pm > initialization > > On Wed, Nov 19, 2014 at 03:13:26PM +0530, Vinod Koul wrote: > > For ACPI we missed to pm_runtime_enable() call which is required to > > tell PM core that runtime on this device is enabled now. Since this is > > common to both PCI and APCI move it out. Also for ACPI we do not > > require > > pm_runtime_allow() call, so remove that > > Applied, thanks.
On Thu, Nov 20, 2014 at 02:35:33PM +0530, Lin, Mengdong wrote: > Hi Mark and Vinod, Please don't top post > > Could you tell me where are the two patches in git repo? > > I cannot find them on topic/intel branch. > I want to rebase the Cherrytrail/Braswell machine driver on the two > applied patches. I think Mark forgot to push :) don't see update to tree since yesterday
On Thu, Nov 20, 2014 at 02:42:08PM +0530, Vinod Koul wrote: > On Thu, Nov 20, 2014 at 02:35:33PM +0530, Lin, Mengdong wrote: > > Could you tell me where are the two patches in git repo? > > I cannot find them on topic/intel branch. > > I want to rebase the Cherrytrail/Braswell machine driver on the two > > applied patches. > I think Mark forgot to push :) don't see update to tree since yesterday No, I haven't forgotten. I've got spotty connectivity since I'm travelling.
> -----Original Message----- > From: Mark Brown [mailto:broonie@kernel.org] > Sent: Thursday, November 20, 2014 5:39 PM > > On Thu, Nov 20, 2014 at 02:42:08PM +0530, Vinod Koul wrote: > > On Thu, Nov 20, 2014 at 02:35:33PM +0530, Lin, Mengdong wrote: > > > > Could you tell me where are the two patches in git repo? > > > > I cannot find them on topic/intel branch. > > > I want to rebase the Cherrytrail/Braswell machine driver on the two > > > applied patches. > > > I think Mark forgot to push :) don't see update to tree since > > yesterday > > No, I haven't forgotten. I've got spotty connectivity since I'm travelling. Got it. Thanks! I posted the new v6 Cherrytrail & Braswell patches based on Vinod's patches: [PATCH v6 1/2] ASoC: Intel: Add Cherrytrail & Braswell machine driver cht_bsw_rt5672 [PATCH v6 2/2] ASoC: Intel: add support for Cherrytrail and Braswell in SST driver Regards Mengdong
diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/sst/sst.c index b2b5604..9e68a7c 100644 --- a/sound/soc/intel/sst/sst.c +++ b/sound/soc/intel/sst/sst.c @@ -378,13 +378,13 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx) * initially active. So change the state to active before * enabling the pm */ - if (acpi_disabled) { + pm_runtime_enable(ctx->dev); + + if (acpi_disabled) pm_runtime_set_active(ctx->dev); - pm_runtime_enable(ctx->dev); - } else { - pm_runtime_allow(ctx->dev); + else pm_runtime_put_noidle(ctx->dev); - } + sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); } EXPORT_SYMBOL_GPL(sst_configure_runtime_pm);
For ACPI we missed to pm_runtime_enable() call which is required to tell PM core that runtime on this device is enabled now. Since this is common to both PCI and APCI move it out. Also for ACPI we do not require pm_runtime_allow() call, so remove that Signed-off-by: Vinod Koul <vinod.koul@intel.com> --- sound/soc/intel/sst/sst.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)