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

diff --git a/sound/soc/rockchip/rk2928-card.c b/sound/soc/rockchip/rk2928-card.c
index 4f2a244eb04c4eaf9afd01aac8198745df295714..84ad4ca34c1ba88e92e5c067ba1b862937c99056 100755 (executable)
--- a/sound/soc/rockchip/rk2928-card.c
+++ b/sound/soc/rockchip/rk2928-card.c
@@ -122,20 +122,21 @@ static int rockchip_rk2928_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk2928_of_match[] = {
-        { .compatible = "rockchip-rk2928", },
-        {},
+       { .compatible = "rockchip-rk2928", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk2928_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk2928_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk2928",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk2928_of_match),
-        },
-        .probe          = rockchip_rk2928_audio_probe,
-        .remove         = rockchip_rk2928_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rk2928",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk2928_of_match),
+       },
+       .probe          = rockchip_rk2928_audio_probe,
+       .remove         = rockchip_rk2928_audio_remove,
 };
 
 module_platform_driver(rockchip_rk2928_audio_driver);

diff --git a/sound/soc/rockchip/rk_aic3111.c b/sound/soc/rockchip/rk_aic3111.c
index efb84fc70f2f1d48f04ae42dc3025e1e26d8c85f..8daf90317417596e697914d4477d2d5e195d34d6 100644 (file)
--- a/sound/soc/rockchip/rk_aic3111.c
+++ b/sound/soc/rockchip/rk_aic3111.c
@@ -179,20 +179,21 @@ static int rockchip_aic3111_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_aic3111_of_match[] = {
-        { .compatible = "rockchip-aic3111", },
-        {},
+       { .compatible = "rockchip-aic3111", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_aic3111_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_aic3111_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-aic3111",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_aic3111_of_match),
-        },
-        .probe          = rockchip_aic3111_audio_probe,
-        .remove         = rockchip_aic3111_audio_remove,
+       .driver         = {
+               .name   = "rockchip-aic3111",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_aic3111_of_match),
+       },
+       .probe          = rockchip_aic3111_audio_probe,
+       .remove         = rockchip_aic3111_audio_remove,
 };
 
 module_platform_driver(rockchip_aic3111_audio_driver);

diff --git a/sound/soc/rockchip/rk_aic3262.c b/sound/soc/rockchip/rk_aic3262.c
index 5312c4630b4b058ccc9f2da18a051f5cc5470861..eb554e6780e38c0fd4cccee785d68b9353f423f7 100644 (file)
--- a/sound/soc/rockchip/rk_aic3262.c
+++ b/sound/soc/rockchip/rk_aic3262.c
@@ -473,20 +473,21 @@ static int rockchip_aic3262_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_aic3262_of_match[] = {
-        { .compatible = "rockchip-aic3262", },
-        {},
+       { .compatible = "rockchip-aic3262", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_aic3262_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_aic3262_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-aic3262",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_aic3262_of_match),
-        },
-        .probe          = rockchip_aic3262_audio_probe,
-        .remove         = rockchip_aic3262_audio_remove,
+       .driver         = {
+               .name   = "rockchip-aic3262",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_aic3262_of_match),
+       },
+       .probe          = rockchip_aic3262_audio_probe,
+       .remove         = rockchip_aic3262_audio_remove,
 };
 
 module_platform_driver(rockchip_aic3262_audio_driver);

diff --git a/sound/soc/rockchip/rk_ak4396.c b/sound/soc/rockchip/rk_ak4396.c
index 3af5966bfc79cfb6fcc535c63535872218065275..b3f84ca9008311c553bbd028b949bafa557c9f9c 100755 (executable)
--- a/sound/soc/rockchip/rk_ak4396.c
+++ b/sound/soc/rockchip/rk_ak4396.c
@@ -165,20 +165,21 @@ static int rockchip_ak4396_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_ak4396_of_match[] = {
-        { .compatible = "rockchip-ak4396", },
-        {},
+       { .compatible = "rockchip-ak4396", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_ak4396_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_ak4396_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-ak4396",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_ak4396_of_match),
-        },
-        .probe          = rockchip_ak4396_audio_probe,
-        .remove         = rockchip_ak4396_audio_remove,
+       .driver         = {
+               .name   = "rockchip-ak4396",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_ak4396_of_match),
+       },
+       .probe          = rockchip_ak4396_audio_probe,
+       .remove         = rockchip_ak4396_audio_remove,
 };
 module_platform_driver(rockchip_ak4396_audio_driver);
 

diff --git a/sound/soc/rockchip/rk_cs42l52.c b/sound/soc/rockchip/rk_cs42l52.c
index 175b9e811be255788a3cc129e2fe1f9da3dc4380..3c4673d6fe7e297d19c3b173410cc66515b2eec4 100755 (executable)
--- a/sound/soc/rockchip/rk_cs42l52.c
+++ b/sound/soc/rockchip/rk_cs42l52.c
@@ -186,20 +186,21 @@ static int rockchip_cs42l52_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_cs42l52_of_match[] = {
-        { .compatible = "rockchip-cs42l52", },
-        {},
+       { .compatible = "rockchip-cs42l52", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_cs42l52_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_cs42l52_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-cs42l52",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_cs42l52_of_match),
-        },
-        .probe          = rockchip_cs42l52_audio_probe,
-        .remove         = rockchip_cs42l52_audio_remove,
+       .driver         = {
+               .name   = "rockchip-cs42l52",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_cs42l52_of_match),
+       },
+       .probe          = rockchip_cs42l52_audio_probe,
+       .remove         = rockchip_cs42l52_audio_remove,
 };
 
 module_platform_driver(rockchip_cs42l52_audio_driver);

diff --git a/sound/soc/rockchip/rk_cx2070x.c b/sound/soc/rockchip/rk_cx2070x.c
index 83c00caba4770973fe2eddd9587442407516ff37..ac0c3c68f780d26d77ae37184a0c62cf84c3acf1 100644 (file)
--- a/sound/soc/rockchip/rk_cx2070x.c
+++ b/sound/soc/rockchip/rk_cx2070x.c
@@ -221,20 +221,21 @@ static int rockchip_cx2070x_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_cx2070x_of_match[] = {
-        { .compatible = "rockchip-cx2070x", },
-        {},
+       { .compatible = "rockchip-cx2070x", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_cx2070x_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_cx2070x_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-cx2070x",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_cx2070x_of_match),
-        },
-        .probe          = rockchip_cx2070x_audio_probe,
-        .remove         = rockchip_cx2070x_audio_remove,
+       .driver         = {
+               .name   = "rockchip-cx2070x",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_cx2070x_of_match),
+       },
+       .probe          = rockchip_cx2070x_audio_probe,
+       .remove         = rockchip_cx2070x_audio_remove,
 };
 
 module_platform_driver(rockchip_cx2070x_audio_driver);

diff --git a/sound/soc/rockchip/rk_es8323.c b/sound/soc/rockchip/rk_es8323.c
index 960634e413b1a478f92f5522f5ee882fb9bfd56a..c26f896002a7182da66bb9c409cc183e99b67b7f 100755 (executable)
--- a/sound/soc/rockchip/rk_es8323.c
+++ b/sound/soc/rockchip/rk_es8323.c
@@ -192,20 +192,21 @@ static int rockchip_es8323_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_es8323_of_match[] = {
-        { .compatible = "rockchip-es8323", },
-        {},
+       { .compatible = "rockchip-es8323", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_es8323_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_es8323_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-es8323",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_es8323_of_match),
-        },
-        .probe          = rockchip_es8323_audio_probe,
-        .remove         = rockchip_es8323_audio_remove,
+       .driver         = {
+               .name   = "rockchip-es8323",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_es8323_of_match),
+       },
+       .probe          = rockchip_es8323_audio_probe,
+       .remove         = rockchip_es8323_audio_remove,
 };
 
 module_platform_driver(rockchip_es8323_audio_driver);

diff --git a/sound/soc/rockchip/rk_hdmi_i2s.c b/sound/soc/rockchip/rk_hdmi_i2s.c
index ae81712a1a7df356a2ca0a131ed5c9dc7bf8cf97..3e16d401c4b05fbabdf5fc2822215d7d5804c4b6 100644 (file)
--- a/sound/soc/rockchip/rk_hdmi_i2s.c
+++ b/sound/soc/rockchip/rk_hdmi_i2s.c
@@ -128,13 +128,14 @@ MODULE_DEVICE_TABLE(of, rockchip_hdmi_i2s_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_hdmi_i2s_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-hdmi-i2s",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match),
-        },
-        .probe          = rockchip_hdmi_i2s_audio_probe,
-        .remove         = rockchip_hdmi_i2s_audio_remove,
+       .driver         = {
+               .name   = "rockchip-hdmi-i2s",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_hdmi_i2s_of_match),
+       },
+       .probe          = rockchip_hdmi_i2s_audio_probe,
+       .remove         = rockchip_hdmi_i2s_audio_remove,
 };
 
 module_platform_driver(rockchip_hdmi_i2s_audio_driver);

diff --git a/sound/soc/rockchip/rk_hdmi_spdif.c b/sound/soc/rockchip/rk_hdmi_spdif.c
index 4875a4392b0fc6ca4bb67714b9aef05c4c520d39..897e9aba13ffb8bdc8b56b8b99ec531917120082 100755 (executable)
--- a/sound/soc/rockchip/rk_hdmi_spdif.c
+++ b/sound/soc/rockchip/rk_hdmi_spdif.c
@@ -176,20 +176,21 @@ static int rockchip_hdmi_spdif_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_hdmi_spdif_of_match[] = {
-        { .compatible = "rockchip-hdmi-spdif"},
-        {},
+       { .compatible = "rockchip-hdmi-spdif"},
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_hdmi_spdif_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_hdmi_spdif_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-hdmi-spdif",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_hdmi_spdif_of_match),
-        },
-        .probe          = rockchip_hdmi_spdif_audio_probe,
-        .remove         = rockchip_hdmi_spdif_audio_remove,
+       .driver         = {
+               .name   = "rockchip-hdmi-spdif",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_hdmi_spdif_of_match),
+       },
+       .probe          = rockchip_hdmi_spdif_audio_probe,
+       .remove         = rockchip_hdmi_spdif_audio_remove,
 };
 
 module_platform_driver(rockchip_hdmi_spdif_audio_driver);

diff --git a/sound/soc/rockchip/rk_jetta_codec.c b/sound/soc/rockchip/rk_jetta_codec.c
index 9f06c662f272a6183b53a0645c6bd36b5976bac8..6487cb681793681d5e9718f59ef1f1d2ee0c876b 100755 (executable)
--- a/sound/soc/rockchip/rk_jetta_codec.c
+++ b/sound/soc/rockchip/rk_jetta_codec.c
@@ -151,20 +151,21 @@ static int rockchip_rk610_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk610_of_match[] = {
-        { .compatible = "rockchip-rk610", },
-        {},
+       { .compatible = "rockchip-rk610", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk610_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk610_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk610",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk610_of_match),
-        },
-        .probe          = rockchip_rk610_audio_probe,
-        .remove         = rockchip_rk610_audio_remove,
+       .driver         = {
+       .name   = "rockchip-rk610",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk610_of_match),
+       },
+       .probe          = rockchip_rk610_audio_probe,
+       .remove         = rockchip_rk610_audio_remove,
 };
 
 module_platform_driver(rockchip_rk610_audio_driver);

diff --git a/sound/soc/rockchip/rk_rk1000codec.c b/sound/soc/rockchip/rk_rk1000codec.c
index ad7d59e24b6f6c20444389eb9eaf61c1aa2d4ab4..f10384687ac2dbfc7ab3c241e7f2675402848394 100755 (executable)
--- a/sound/soc/rockchip/rk_rk1000codec.c
+++ b/sound/soc/rockchip/rk_rk1000codec.c
@@ -118,20 +118,21 @@ static int rockchip_rk1000_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk1000_of_match[] = {
-        { .compatible = "rockchip-rk1000", },
-        {},
+       { .compatible = "rockchip-rk1000", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk1000_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk1000_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk1000",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk1000_of_match),
-        },
-        .probe          = rockchip_rk1000_audio_probe,
-        .remove         = rockchip_rk1000_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rk1000",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk1000_of_match),
+       },
+       .probe          = rockchip_rk1000_audio_probe,
+       .remove         = rockchip_rk1000_audio_remove,
 };
 
 module_platform_driver(rockchip_rk1000_audio_driver);

diff --git a/sound/soc/rockchip/rk_rk3026.c b/sound/soc/rockchip/rk_rk3026.c
index b904ba4ce63a0c830c34e6a4c39c832af0f11dbb..dfca69ff7f9008c3872d3b67ba8218a160554ebf 100644 (file)
--- a/sound/soc/rockchip/rk_rk3026.c
+++ b/sound/soc/rockchip/rk_rk3026.c
@@ -266,20 +266,21 @@ static int rockchip_rk3026_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk3026_of_match[] = {
-        { .compatible = "rockchip-rk3026", },
-        {},
+       { .compatible = "rockchip-rk3026", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk3026_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk3026_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk3026",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk3026_of_match),
-        },
-        .probe          = rockchip_rk3026_audio_probe,
-        .remove         = rockchip_rk3026_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rk3026",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk3026_of_match),
+       },
+       .probe          = rockchip_rk3026_audio_probe,
+       .remove         = rockchip_rk3026_audio_remove,
 };
 
 module_platform_driver(rockchip_rk3026_audio_driver);

diff --git a/sound/soc/rockchip/rk_rk3190.c b/sound/soc/rockchip/rk_rk3190.c
index 2210b73d8d3011b866107ce6071ca2752e95dad2..966fc815c1cd7b7c9632a0c1c5318679403f655f 100755 (executable)
--- a/sound/soc/rockchip/rk_rk3190.c
+++ b/sound/soc/rockchip/rk_rk3190.c
@@ -244,20 +244,21 @@ static int rockchip_rk3190_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk3190_of_match[] = {
-        { .compatible = "rockchip-rk3190", },
-        {},
+       { .compatible = "rockchip-rk3190", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk3190_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk3190_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk3190",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk3190_of_match),
-        },
-        .probe          = rockchip_rk3190_audio_probe,
-        .remove         = rockchip_rk3190_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rk3190",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk3190_of_match),
+       },
+       .probe          = rockchip_rk3190_audio_probe,
+       .remove         = rockchip_rk3190_audio_remove,
 };
 
 module_platform_driver(rockchip_rk3190_audio_driver);

diff --git a/sound/soc/rockchip/rk_rk616.c b/sound/soc/rockchip/rk_rk616.c
index 0f7a36c969bde27f8c5f09b2f9c9b3f9a620fbd9..9d1fffdc2b243f7f42155499fc50bd952db2214c 100755 (executable)
--- a/sound/soc/rockchip/rk_rk616.c
+++ b/sound/soc/rockchip/rk_rk616.c
@@ -347,20 +347,21 @@ static int rockchip_rk616_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rk616_of_match[] = {
-        { .compatible = "rockchip-rk616", },
-        {},
+       { .compatible = "rockchip-rk616", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rk616_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rk616_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rk616",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rk616_of_match),
-        },
-        .probe          = rockchip_rk616_audio_probe,
-        .remove         = rockchip_rk616_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rk616",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rk616_of_match),
+       },
+       .probe          = rockchip_rk616_audio_probe,
+       .remove         = rockchip_rk616_audio_remove,
 };
 
 module_platform_driver(rockchip_rk616_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt3261.c b/sound/soc/rockchip/rk_rt3261.c
index 66acee89dc1900c351ada498be5bddc8df30cc33..cf1683ba5bcc5fdc57387ce25c0cb6b8508d1f7e 100644 (file)
--- a/sound/soc/rockchip/rk_rt3261.c
+++ b/sound/soc/rockchip/rk_rt3261.c
@@ -312,20 +312,21 @@ static int rockchip_rt3261_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt3261_of_match[] = {
-        { .compatible = "rockchip-rt3261", },
-        {},
+       { .compatible = "rockchip-rt3261", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt3261_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt3261_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt3261",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt3261_of_match),
-        },
-        .probe          = rockchip_rt3261_audio_probe,
-        .remove         = rockchip_rt3261_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt3261",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt3261_of_match),
+       },
+       .probe          = rockchip_rt3261_audio_probe,
+       .remove         = rockchip_rt3261_audio_remove,
 };
 
 module_platform_driver(rockchip_rt3261_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5512.c b/sound/soc/rockchip/rk_rt5512.c
index 3737d70ba40d6dc7e13d13f599cbc44245512307..882f88c84e6b5e2e408cb5aa4561fa51f92d1558 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5512.c
+++ b/sound/soc/rockchip/rk_rt5512.c
@@ -320,20 +320,21 @@ static int rockchip_rt5512_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5512_of_match[] = {
-        { .compatible = "rockchip-rt5512", },
-        {},
+       { .compatible = "rockchip-rt5512", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5512_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5512_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5512",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5512_of_match),
-        },
-        .probe          = rockchip_rt5512_audio_probe,
-        .remove         = rockchip_rt5512_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5512",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5512_of_match),
+       },
+       .probe          = rockchip_rt5512_audio_probe,
+       .remove         = rockchip_rt5512_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5512_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5616.c b/sound/soc/rockchip/rk_rt5616.c
index b410bdfbbc746d531f260a90d61613537cf2a465..f28a644d25697e87f350b487c95cc453a51b3003 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5616.c
+++ b/sound/soc/rockchip/rk_rt5616.c
@@ -190,20 +190,21 @@ static int rockchip_rt5616_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5616_of_match[] = {
-        { .compatible = "rockchip-rt5616", },
-        {},
+       { .compatible = "rockchip-rt5616", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5616_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5616_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5616",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5616_of_match),
-        },
-        .probe          = rockchip_rt5616_audio_probe,
-        .remove         = rockchip_rt5616_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5616",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5616_of_match),
+       },
+       .probe          = rockchip_rt5616_audio_probe,
+       .remove         = rockchip_rt5616_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5616_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5621.c b/sound/soc/rockchip/rk_rt5621.c
index c25d294db2707cb53e9c0d5b4f84092527381987..d0e6835deca11a662325796677b1207326a4b7f0 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5621.c
+++ b/sound/soc/rockchip/rk_rt5621.c
@@ -189,20 +189,21 @@ static int rockchip_rt5621_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5621_of_match[] = {
-        { .compatible = "rockchip-rt5621", },
-        {},
+       { .compatible = "rockchip-rt5621", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5621_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5621_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5621",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5621_of_match),
-        },
-        .probe          = rockchip_rt5621_audio_probe,
-        .remove         = rockchip_rt5621_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5621",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5621_of_match),
+       },
+       .probe          = rockchip_rt5621_audio_probe,
+       .remove         = rockchip_rt5621_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5621_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5625.c b/sound/soc/rockchip/rk_rt5625.c
index 48400f8fdcb0e841347e22a762f8493451f56efd..c78c06540f8462f823a631860576b5d263db5a7c 100644 (file)
--- a/sound/soc/rockchip/rk_rt5625.c
+++ b/sound/soc/rockchip/rk_rt5625.c
@@ -206,20 +206,21 @@ static int rockchip_rt5625_audio_remove(struct platform_device *pdev)
 \r
 #ifdef CONFIG_OF\r
 static const struct of_device_id rockchip_rt5625_of_match[] = {\r
-        { .compatible = "rockchip-rt5625", },\r
-        {},\r
+       { .compatible = "rockchip-rt5625", },\r
+       {},\r
 };\r
 MODULE_DEVICE_TABLE(of, rockchip_rt5625_of_match);\r
 #endif /* CONFIG_OF */\r
 \r
 static struct platform_driver rockchip_rt5625_audio_driver = {\r
-        .driver         = {\r
-                .name   = "rockchip-rt5625",\r
-                .owner  = THIS_MODULE,\r
-                .of_match_table = of_match_ptr(rockchip_rt5625_of_match),\r
-        },\r
-        .probe          = rockchip_rt5625_audio_probe,\r
-        .remove         = rockchip_rt5625_audio_remove,\r
+       .driver         = {\r
+               .name   = "rockchip-rt5625",\r
+               .owner  = THIS_MODULE,\r
+               .pm = &snd_soc_pm_ops,\r
+               .of_match_table = of_match_ptr(rockchip_rt5625_of_match),\r
+       },\r
+       .probe          = rockchip_rt5625_audio_probe,\r
+       .remove         = rockchip_rt5625_audio_remove,\r
 };\r
 \r
 module_platform_driver(rockchip_rt5625_audio_driver);\r

diff --git a/sound/soc/rockchip/rk_rt5631.c b/sound/soc/rockchip/rk_rt5631.c
index 44829172a9e47bdd2c266a7a8a0227b359d03923..529f521c80fa30a87084aeb180f5e8921b603a80 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5631.c
+++ b/sound/soc/rockchip/rk_rt5631.c
@@ -212,20 +212,21 @@ static int rockchip_rt5631_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5631_of_match[] = {
-        { .compatible = "rockchip-rt5631", },
-        {},
+       { .compatible = "rockchip-rt5631", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5631_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5631_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5631",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5631_of_match),
-        },
-        .probe          = rockchip_rt5631_audio_probe,
-        .remove         = rockchip_rt5631_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5631",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5631_of_match),
+       },
+       .probe          = rockchip_rt5631_audio_probe,
+       .remove         = rockchip_rt5631_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5631_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5631_phone.c b/sound/soc/rockchip/rk_rt5631_phone.c
index 02f045a9dbeaab101f67d82cd6df05b249c79775..06eeac8fa60d5a878079dc3db9919ea6724ef91a 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5631_phone.c
+++ b/sound/soc/rockchip/rk_rt5631_phone.c
@@ -265,20 +265,21 @@ static int rockchip_rt5631_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5631_of_match[] = {
-        { .compatible = "rockchip-rt5631-phone", },
-        {},
+       { .compatible = "rockchip-rt5631-phone", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5631_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5631_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5631-phone",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5631_of_match),
-        },
-        .probe          = rockchip_rt5631_audio_probe,
-        .remove         = rockchip_rt5631_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5631-phone",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5631_of_match),
+       },
+       .probe          = rockchip_rt5631_audio_probe,
+       .remove         = rockchip_rt5631_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5631_audio_driver);

diff --git a/sound/soc/rockchip/rk_rt5639.c b/sound/soc/rockchip/rk_rt5639.c
index 53db2c3305a83b260444b5d00432d7ea4a35b5e3..4761b1adc2e049ce567c28d4a105ec58f0388bae 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5639.c
+++ b/sound/soc/rockchip/rk_rt5639.c
@@ -206,20 +206,21 @@ static int rockchip_rt5639_audio_remove(struct platform_device *pdev)
 \r
 #ifdef CONFIG_OF\r
 static const struct of_device_id rockchip_rt5639_of_match[] = {\r
-        { .compatible = "rockchip-rt5639", },\r
-        {},\r
+       { .compatible = "rockchip-rt5639", },\r
+       {},\r
 };\r
 MODULE_DEVICE_TABLE(of, rockchip_rt5639_of_match);\r
 #endif /* CONFIG_OF */\r
 \r
 static struct platform_driver rockchip_rt5639_audio_driver = {\r
-        .driver         = {\r
-                .name   = "rockchip-rt5639",\r
-                .owner  = THIS_MODULE,\r
-                .of_match_table = of_match_ptr(rockchip_rt5639_of_match),\r
-        },\r
-        .probe          = rockchip_rt5639_audio_probe,\r
-        .remove         = rockchip_rt5639_audio_remove,\r
+       .driver         = {\r
+               .name   = "rockchip-rt5639",\r
+               .owner  = THIS_MODULE,\r
+               .pm = &snd_soc_pm_ops,\r
+               .of_match_table = of_match_ptr(rockchip_rt5639_of_match),\r
+       },\r
+       .probe          = rockchip_rt5639_audio_probe,\r
+       .remove         = rockchip_rt5639_audio_remove,\r
 };\r
 \r
 module_platform_driver(rockchip_rt5639_audio_driver);\r

diff --git a/sound/soc/rockchip/rk_rt5640.c b/sound/soc/rockchip/rk_rt5640.c
index ed41ee9cefcc94816c7a5fa91a7537876985347b..0ec9de7e86b4a8dd2821702c2615419fd6d3d44e 100755 (executable)
--- a/sound/soc/rockchip/rk_rt5640.c
+++ b/sound/soc/rockchip/rk_rt5640.c
@@ -278,20 +278,21 @@ static int rockchip_rt5640_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_rt5640_of_match[] = {
-        { .compatible = "rockchip-rt5640", },
-        {},
+       { .compatible = "rockchip-rt5640", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_rt5640_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_rt5640_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-rt5640",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_rt5640_of_match),
-        },
-        .probe          = rockchip_rt5640_audio_probe,
-        .remove         = rockchip_rt5640_audio_remove,
+       .driver         = {
+               .name   = "rockchip-rt5640",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_rt5640_of_match),
+       },
+       .probe          = rockchip_rt5640_audio_probe,
+       .remove         = rockchip_rt5640_audio_remove,
 };
 
 module_platform_driver(rockchip_rt5640_audio_driver);

diff --git a/sound/soc/rockchip/rk_wm8900.c b/sound/soc/rockchip/rk_wm8900.c
index d3fc1bbe6632e22dc81f4a0cd1f56d61ae143c83..67f0961cd5d38874c86c1d12003417c1508ef603 100755 (executable)
--- a/sound/soc/rockchip/rk_wm8900.c
+++ b/sound/soc/rockchip/rk_wm8900.c
@@ -209,20 +209,21 @@ static int rockchip_wm8900_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_wm8900_of_match[] = {
-        { .compatible = "rockchip-wm8900", },
-        {},
+       { .compatible = "rockchip-wm8900", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_wm8900_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_wm8900_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-wm8900",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_wm8900_of_match),
-        },
-        .probe          = rockchip_wm8900_audio_probe,
-        .remove         = rockchip_wm8900_audio_remove,
+       .driver         = {
+               .name   = "rockchip-wm8900",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_wm8900_of_match),
+       },
+       .probe          = rockchip_wm8900_audio_probe,
+       .remove         = rockchip_wm8900_audio_remove,
 };
 
 module_platform_driver(rockchip_wm8900_audio_driver);

diff --git a/sound/soc/rockchip/rk_wm8988.c b/sound/soc/rockchip/rk_wm8988.c
index 14d36c216c71cd7c111b241cc07b69e720ef3ca4..31ca22924cf86d308e692232b23ef5b4915631db 100755 (executable)
--- a/sound/soc/rockchip/rk_wm8988.c
+++ b/sound/soc/rockchip/rk_wm8988.c
@@ -160,20 +160,21 @@ static int rockchip_wm8988_audio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id rockchip_wm8988_of_match[] = {
-        { .compatible = "rockchip-wm8988", },
-        {},
+       { .compatible = "rockchip-wm8988", },
+       {},
 };
 MODULE_DEVICE_TABLE(of, rockchip_wm8988_of_match);
 #endif /* CONFIG_OF */
 
 static struct platform_driver rockchip_wm8988_audio_driver = {
-        .driver         = {
-                .name   = "rockchip-wm8988",
-                .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(rockchip_wm8988_of_match),
-        },
-        .probe          = rockchip_wm8988_audio_probe,
-        .remove         = rockchip_wm8988_audio_remove,
+       .driver         = {
+               .name   = "rockchip-wm8988",
+               .owner  = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+               .of_match_table = of_match_ptr(rockchip_wm8988_of_match),
+       },
+       .probe          = rockchip_wm8988_audio_probe,
+       .remove         = rockchip_wm8988_audio_remove,
 };
 
 module_platform_driver(rockchip_wm8988_audio_driver);

diff --git a/sound/soc/rockchip/rk_wm8994.c b/sound/soc/rockchip/rk_wm8994.c
index d0adf39e0ba86403135a73d9da2710de273b4c34..b69b2b38554d102b59e351a2367e415d27da6fb1 100755 (executable)
--- a/sound/soc/rockchip/rk_wm8994.c
+++ b/sound/soc/rockchip/rk_wm8994.c
@@ -410,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);