Audio: add dev_pm_ops to machine driver, fix soc suspend/resume error.

[firefly-linux-kernel-4.4.55.git] / sound / soc / rockchip / rk_wm8994.c

diff --git a/sound/soc/rockchip/rk_wm8994.c b/sound/soc/rockchip/rk_wm8994.c
index 4139c9b7a26d52ec83289453e958a9fe6b18d813..b69b2b38554d102b59e351a2367e415d27da6fb1 100755 (executable)
--- a/sound/soc/rockchip/rk_wm8994.c
+++ b/sound/soc/rockchip/rk_wm8994.c
@@ -312,12 +312,7 @@ static int rk29_wm8994_init(struct snd_soc_pcm_runtime *rtd)
 //     snd_soc_dapm_nc_pin(dapm, "LINEOUT1P");
        snd_soc_dapm_nc_pin(dapm, "LINEOUT2N");
        snd_soc_dapm_nc_pin(dapm, "LINEOUT2P");
-#ifdef CONFIG_HDMI
-extern int hdmi_is_insert(void);
-extern void codec_set_spk(bool on);
-       if(hdmi_is_insert())
-               codec_set_spk(false);
-#endif
+
        snd_soc_dapm_sync(dapm);
 
        /* Headset jack detection */
@@ -415,20 +410,21 @@ static int rockchip_wm8994_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_wm8994_of_match[] = {
-        { .compatible = "rockchip-wm8994", },
-        {},
+       { .compatible = "rockchip-wm8994", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_wm8994_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_wm8994_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-wm8994",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_wm8994_of_match),
-        },
-        .probe          = rockchip_wm8994_audio_probe,
-        .remove         = rockchip_wm8994_audio_remove,
+       .driver         = {
+               .name   = "rockchip-wm8994",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_wm8994_of_match),
+       },
+       .probe          = rockchip_wm8994_audio_probe,
+       .remove         = rockchip_wm8994_audio_remove,
 };
 
 module_platform_driver(rockchip_wm8994_audio_driver);