1 files changed, 12 insertions, 26 deletions

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 1ba27db660a6..6d7b7ca7d530 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1612,29 +1612,6 @@ static int rt5631_probe(struct snd_soc_codec *codec)
         return 0;
 }
 
-static int rt5631_remove(struct snd_soc_codec *codec)
-{
-        rt5631_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int rt5631_suspend(struct snd_soc_codec *codec)
-{
-        rt5631_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
-static int rt5631_resume(struct snd_soc_codec *codec)
-{
-        rt5631_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        return 0;
-}
-#else
-#define rt5631_suspend NULL
-#define rt5631_resume NULL
-#endif
-
 #define RT5631_STEREO_RATES SNDRV_PCM_RATE_8000_96000
 #define RT5631_FORMAT   (SNDRV_PCM_FMTBIT_S16_LE | \
                         SNDRV_PCM_FMTBIT_S20_3LE | \
@@ -1672,10 +1649,8 @@ static struct snd_soc_dai_driver rt5631_dai[] = {
 
 static struct snd_soc_codec_driver soc_codec_dev_rt5631 = {
         .probe = rt5631_probe,
-        .remove = rt5631_remove,
-        .suspend = rt5631_suspend,
-        .resume = rt5631_resume,
         .set_bias_level = rt5631_set_bias_level,
+        .suspend_bias_off = true,
         .controls = rt5631_snd_controls,
         .num_controls = ARRAY_SIZE(rt5631_snd_controls),
         .dapm_widgets = rt5631_dapm_widgets,
@@ -1686,10 +1661,20 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5631 = {
 
 static const struct i2c_device_id rt5631_i2c_id[] = {
         { "rt5631", 0 },
+        { "alc5631", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5631_i2c_id);
 
+#ifdef CONFIG_OF
+static struct of_device_id rt5631_i2c_dt_ids[] = {
+        { .compatible = "realtek,rt5631"},
+        { .compatible = "realtek,alc5631"},
+        { }
+};
+MODULE_DEVICE_TABLE(of, rt5631_i2c_dt_ids);
+#endif
+
 static const struct regmap_config rt5631_regmap_config = {
         .reg_bits = 8,
         .val_bits = 16,
@@ -1734,6 +1719,7 @@ static struct i2c_driver rt5631_i2c_driver = {
         .driver = {
                 .name = "rt5631",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(rt5631_i2c_dt_ids),
         },
         .probe = rt5631_i2c_probe,
         .remove   = rt5631_i2c_remove,