From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Mon, 9 May 2016 10:38:10 +0000 (+0300)
Subject: UPSTREAM: ASoC: simple-card: Add pm callbacks to platform driver
X-Git-Tag: firefly_0821_release~1656
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e867dd12a79af88fea439130593b0ed04659b1d;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: ASoC: simple-card: Add pm callbacks to platform driver

Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM
operations are going to happen. This is needed to get suspend/resume
working correctly when the audio is using simple-card.

Change-Id: Id0355673bc89456fedd3d035cbfd0f7f8f51d1da
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 7c3767115a04bc7aa87bdbd3352d1801d4bbeea4)
---

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index ff6fcd9f92f7..dc971a02443e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -645,6 +645,7 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 static struct platform_driver asoc_simple_card = {
 	.driver = {
 		.name = "asoc-simple-card",
+		.pm = &snd_soc_pm_ops,
 		.of_match_table = asoc_simple_of_match,
 	},
 	.probe = asoc_simple_card_probe,