Merge remote-tracking branch 'asoc/topic/ssm4567' into asoc-next

106 files changed, 1599 insertions, 111 deletions

diff --git a/include/sound/rt298.h b/include/sound/rt298.h
new file mode 100644
index 000000000000..7fffeaa84f64
--- /dev/null
+++ b/include/sound/rt298.h
@@ -0,0 +1,20 @@
+/*
+ * linux/sound/rt286.h -- Platform data for RT286
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_SND_RT298_H
+#define __LINUX_SND_RT298_H
+
+struct rt298_platform_data {
+        bool cbj_en; /*combo jack enable*/
+        bool gpio2_en; /*GPIO2 enable*/
+        bool suspend_power_off; /* power is off during suspend */
+};
+
+#endif
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index efaafce8ba38..76125a281557 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -83,6 +83,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_PCM512x_I2C if I2C
         select SND_SOC_PCM512x_SPI if SPI_MASTER
         select SND_SOC_RT286 if I2C
+        select SND_SOC_RT298 if I2C
         select SND_SOC_RT5631 if I2C
         select SND_SOC_RT5640 if I2C
         select SND_SOC_RT5645 if I2C
@@ -512,12 +513,18 @@ config SND_SOC_RL6231
 config SND_SOC_RL6347A
         tristate
         default y if SND_SOC_RT286=y
+        default y if SND_SOC_RT298=y
         default m if SND_SOC_RT286=m
+        default m if SND_SOC_RT298=m
 
 config SND_SOC_RT286
         tristate
         depends on I2C
 
+config SND_SOC_RT298
+        tristate
+        depends on I2C
+
 config SND_SOC_RT5631
         tristate "Realtek ALC5631/RT5631 CODEC"
         depends on I2C
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index cf160d972cb3..3b58c4571859 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -79,6 +79,7 @@ snd-soc-pcm512x-spi-objs := pcm512x-spi.o
 snd-soc-rl6231-objs := rl6231.o
 snd-soc-rl6347a-objs := rl6347a.o
 snd-soc-rt286-objs := rt286.o
+snd-soc-rt298-objs := rt298.o
 snd-soc-rt5631-objs := rt5631.o
 snd-soc-rt5640-objs := rt5640.o
 snd-soc-rt5645-objs := rt5645.o
@@ -266,6 +267,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
 obj-$(CONFIG_SND_SOC_RL6231)    += snd-soc-rl6231.o
 obj-$(CONFIG_SND_SOC_RL6347A)   += snd-soc-rl6347a.o
 obj-$(CONFIG_SND_SOC_RT286)     += snd-soc-rt286.o
+obj-$(CONFIG_SND_SOC_RT298)     += snd-soc-rt298.o
 obj-$(CONFIG_SND_SOC_RT5631)    += snd-soc-rt5631.o
 obj-$(CONFIG_SND_SOC_RT5640)    += snd-soc-rt5640.o
 obj-$(CONFIG_SND_SOC_RT5645)    += snd-soc-rt5645.o
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index a43160254929..6c96860f46de 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -1534,7 +1534,6 @@ MODULE_DEVICE_TABLE(i2c, adau1373_i2c_id);
 static struct i2c_driver adau1373_i2c_driver = {
         .driver = {
                 .name = "adau1373",
-                .owner = THIS_MODULE,
         },
         .probe = adau1373_i2c_probe,
         .remove = adau1373_i2c_remove,
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index ff7f846e3b76..de53c0d7bf10 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -915,7 +915,6 @@ MODULE_DEVICE_TABLE(i2c, adau1701_i2c_id);
 static struct i2c_driver adau1701_i2c_driver = {
         .driver = {
                 .name   = "adau1701",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(adau1701_dt_ids),
         },
         .probe          = adau1701_i2c_probe,
diff --git a/sound/soc/codecs/adau1761-i2c.c b/sound/soc/codecs/adau1761-i2c.c
index 862796dec693..348ccb17d3cc 100644
--- a/sound/soc/codecs/adau1761-i2c.c
+++ b/sound/soc/codecs/adau1761-i2c.c
@@ -47,7 +47,6 @@ MODULE_DEVICE_TABLE(i2c, adau1761_i2c_ids);
 static struct i2c_driver adau1761_i2c_driver = {
         .driver = {
                 .name = "adau1761",
-                .owner = THIS_MODULE,
         },
         .probe = adau1761_i2c_probe,
         .remove = adau1761_i2c_remove,
diff --git a/sound/soc/codecs/adau1781-i2c.c b/sound/soc/codecs/adau1781-i2c.c
index 2ce4362ccec1..0e32bba92339 100644
--- a/sound/soc/codecs/adau1781-i2c.c
+++ b/sound/soc/codecs/adau1781-i2c.c
@@ -45,7 +45,6 @@ MODULE_DEVICE_TABLE(i2c, adau1781_i2c_ids);
 static struct i2c_driver adau1781_i2c_driver = {
         .driver = {
                 .name = "adau1781",
-                .owner = THIS_MODULE,
         },
         .probe = adau1781_i2c_probe,
         .remove = adau1781_i2c_remove,
diff --git a/sound/soc/codecs/adau1977-i2c.c b/sound/soc/codecs/adau1977-i2c.c
index 9700e8c838c9..21e7394a972a 100644
--- a/sound/soc/codecs/adau1977-i2c.c
+++ b/sound/soc/codecs/adau1977-i2c.c
@@ -46,7 +46,6 @@ MODULE_DEVICE_TABLE(i2c, adau1977_i2c_ids);
 static struct i2c_driver adau1977_i2c_driver = {
         .driver = {
                 .name = "adau1977",
-                .owner = THIS_MODULE,
         },
         .probe = adau1977_i2c_probe,
         .remove = adau1977_i2c_remove,
diff --git a/sound/soc/codecs/adav803.c b/sound/soc/codecs/adav803.c
index 66d9fce34e62..52881faedcf6 100644
--- a/sound/soc/codecs/adav803.c
+++ b/sound/soc/codecs/adav803.c
@@ -36,7 +36,6 @@ static int adav803_remove(struct i2c_client *client)
 static struct i2c_driver adav803_driver = {
         .driver = {
                 .name = "adav803",
-                .owner = THIS_MODULE,
         },
         .probe = adav803_probe,
         .remove = adav803_remove,
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 8670861e5bec..54428c64387b 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -444,7 +444,6 @@ MODULE_DEVICE_TABLE(i2c, ak4535_i2c_id);
 static struct i2c_driver ak4535_i2c_driver = {
         .driver = {
                 .name = "ak4535",
-                .owner = THIS_MODULE,
         },
         .probe =    ak4535_i2c_probe,
         .remove =   ak4535_i2c_remove,
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 2d0ff4595ea0..b14176f8d884 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -609,7 +609,6 @@ MODULE_DEVICE_TABLE(i2c, ak4641_i2c_id);
 static struct i2c_driver ak4641_i2c_driver = {
         .driver = {
                 .name = "ak4641",
-                .owner = THIS_MODULE,
         },
         .probe =    ak4641_i2c_probe,
         .remove =   ak4641_i2c_remove,
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 7c0f6552c229..66352f70ac47 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -626,7 +626,6 @@ MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id);
 static struct i2c_driver ak4642_i2c_driver = {
         .driver = {
                 .name = "ak4642-codec",
-                .owner = THIS_MODULE,
                 .of_match_table = ak4642_of_match,
         },
         .probe          = ak4642_i2c_probe,
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 0e59063aeb6f..c73a9f6914b6 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -663,7 +663,6 @@ MODULE_DEVICE_TABLE(i2c, ak4671_i2c_id);
 static struct i2c_driver ak4671_i2c_driver = {
         .driver = {
                 .name = "ak4671-codec",
-                .owner = THIS_MODULE,
         },
         .probe = ak4671_i2c_probe,
         .remove = ak4671_i2c_remove,
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 0fc24e0d518c..cf99c4e90acc 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -1085,7 +1085,6 @@ MODULE_DEVICE_TABLE(of, alc5623_of_match);
 static struct i2c_driver alc5623_i2c_driver = {
         .driver = {
                 .name = "alc562x-codec",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(alc5623_of_match),
         },
         .probe = alc5623_i2c_probe,
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 607a63b9705f..9277ac68b696 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1183,7 +1183,6 @@ MODULE_DEVICE_TABLE(of, alc5632_of_match);
 static struct i2c_driver alc5632_i2c_driver = {
         .driver = {
                 .name = "alc5632",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(alc5632_of_match),
         },
         .probe = alc5632_i2c_probe,
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 8f40025b7e7c..76564dc752d3 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -607,7 +607,6 @@ MODULE_DEVICE_TABLE(i2c, cs35l32_id);
 static struct i2c_driver cs35l32_i2c_driver = {
         .driver = {
                    .name = "cs35l32",
-                   .owner = THIS_MODULE,
                    .pm = &cs35l32_runtime_pm,
                    .of_match_table = cs35l32_of_match,
                    },
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c
index 8e36198474d9..e42a5038b983 100644
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
@@ -658,7 +658,6 @@ MODULE_DEVICE_TABLE(i2c, cs4265_id);
 static struct i2c_driver cs4265_i2c_driver = {
         .driver = {
                 .name = "cs4265",
-                .owner = THIS_MODULE,
                 .of_match_table = cs4265_of_match,
         },
         .id_table = cs4265_id,
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index e6d4ff9fd992..e07807d96b68 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -751,7 +751,6 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id);
 static struct i2c_driver cs4270_i2c_driver = {
         .driver = {
                 .name = "cs4270",
-                .owner = THIS_MODULE,
                 .of_match_table = cs4270_of_match,
         },
         .id_table = cs4270_id,
diff --git a/sound/soc/codecs/cs4271-i2c.c b/sound/soc/codecs/cs4271-i2c.c
index b264da030340..dcb3223d7d8f 100644
--- a/sound/soc/codecs/cs4271-i2c.c
+++ b/sound/soc/codecs/cs4271-i2c.c
@@ -48,7 +48,6 @@ MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id);
 static struct i2c_driver cs4271_i2c_driver = {
         .driver = {
                 .name = "cs4271",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(cs4271_dt_ids),
         },
         .probe = cs4271_i2c_probe,
diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c
index c40428f25ba5..9bad478474fa 100644
--- a/sound/soc/codecs/cs42l51-i2c.c
+++ b/sound/soc/codecs/cs42l51-i2c.c
@@ -45,7 +45,6 @@ static int cs42l51_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver cs42l51_i2c_driver = {
         .driver = {
                 .name = "cs42l51",
-                .owner = THIS_MODULE,
                 .of_match_table = cs42l51_of_match,
         },
         .probe = cs42l51_i2c_probe,
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 4de52c9957ac..b82d8e5b76ed 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1285,7 +1285,6 @@ MODULE_DEVICE_TABLE(i2c, cs42l52_id);
 static struct i2c_driver cs42l52_i2c_driver = {
         .driver = {
                 .name = "cs42l52",
-                .owner = THIS_MODULE,
                 .of_match_table = cs42l52_of_match,
         },
         .id_table = cs42l52_id,
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index 1e11ba45a79f..4ae793365985 100644
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -1408,7 +1408,6 @@ MODULE_DEVICE_TABLE(i2c, cs42l56_id);
 static struct i2c_driver cs42l56_i2c_driver = {
         .driver = {
                 .name = "cs42l56",
-                .owner = THIS_MODULE,
                 .of_match_table = cs42l56_of_match,
         },
         .id_table = cs42l56_id,
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index b7853b9d3a60..7cb1d7091dae 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1491,7 +1491,6 @@ MODULE_DEVICE_TABLE(i2c, cs42l73_id);
 static struct i2c_driver cs42l73_i2c_driver = {
         .driver = {
                    .name = "cs42l73",
-                   .owner = THIS_MODULE,
                    .of_match_table = cs42l73_of_match,
                    },
         .id_table = cs42l73_id,
diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
index 657dce27eade..800c1d549347 100644
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
@@ -20,7 +20,7 @@
 static int cs42xx8_i2c_probe(struct i2c_client *i2c,
                              const struct i2c_device_id *id)
 {
-        u32 ret = cs42xx8_probe(&i2c->dev,
+        int ret = cs42xx8_probe(&i2c->dev,
                         devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));
         if (ret)
                 return ret;
@@ -49,8 +49,8 @@ MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id);
 static struct i2c_driver cs42xx8_i2c_driver = {
         .driver = {
                 .name = "cs42xx8",
-                .owner = THIS_MODULE,
                 .pm = &cs42xx8_pm,
+                .of_match_table = cs42xx8_of_match,
         },
         .probe = cs42xx8_i2c_probe,
         .remove = cs42xx8_i2c_remove,
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index e1d46862e81f..d562e1b9a5d1 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = {
 };
 EXPORT_SYMBOL_GPL(cs42888_data);
 
-static const struct of_device_id cs42xx8_of_match[] = {
+const struct of_device_id cs42xx8_of_match[] = {
         { .compatible = "cirrus,cs42448", .data = &cs42448_data, },
         { .compatible = "cirrus,cs42888", .data = &cs42888_data, },
         { /* sentinel */ }
@@ -435,16 +435,24 @@ EXPORT_SYMBOL_GPL(cs42xx8_of_match);
 
 int cs42xx8_probe(struct device *dev, struct regmap *regmap)
 {
-        const struct of_device_id *of_id = of_match_device(cs42xx8_of_match, dev);
+        const struct of_device_id *of_id;
         struct cs42xx8_priv *cs42xx8;
         int ret, val, i;
 
+        if (IS_ERR(regmap)) {
+                ret = PTR_ERR(regmap);
+                dev_err(dev, "failed to allocate regmap: %d\n", ret);
+                return ret;
+        }
+
         cs42xx8 = devm_kzalloc(dev, sizeof(*cs42xx8), GFP_KERNEL);
         if (cs42xx8 == NULL)
                 return -ENOMEM;
 
+        cs42xx8->regmap = regmap;
         dev_set_drvdata(dev, cs42xx8);
 
+        of_id = of_match_device(cs42xx8_of_match, dev);
         if (of_id)
                 cs42xx8->drvdata = of_id->data;
 
@@ -482,13 +490,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
         /* Make sure hardware reset done */
         msleep(5);
 
-        cs42xx8->regmap = regmap;
-        if (IS_ERR(cs42xx8->regmap)) {
-                ret = PTR_ERR(cs42xx8->regmap);
-                dev_err(dev, "failed to allocate regmap: %d\n", ret);
-                goto err_enable;
-        }
-
         /*
          * We haven't marked the chip revision as volatile due to
          * sharing a register with the right input volume; explicitly
diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h
index b2c10e537ef6..d36c61b6df74 100644
--- a/sound/soc/codecs/cs42xx8.h
+++ b/sound/soc/codecs/cs42xx8.h
@@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm;
 extern const struct cs42xx8_driver_data cs42448_data;
 extern const struct cs42xx8_driver_data cs42888_data;
 extern const struct regmap_config cs42xx8_regmap_config;
+extern const struct of_device_id cs42xx8_of_match[];
 int cs42xx8_probe(struct device *dev, struct regmap *regmap);
 
 /* CS42888 register map */
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 21810e5f3321..9c7b41a8642d 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -1259,7 +1259,6 @@ MODULE_DEVICE_TABLE(i2c, da7210_i2c_id);
 static struct i2c_driver da7210_i2c_driver = {
         .driver = {
                 .name = "da7210",
-                .owner = THIS_MODULE,
         },
         .probe          = da7210_i2c_probe,
         .remove         = da7210_i2c_remove,
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 238e48a3a4fe..f635401b7730 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1585,7 +1585,6 @@ MODULE_DEVICE_TABLE(i2c, da7213_i2c_id);
 static struct i2c_driver da7213_i2c_driver = {
         .driver = {
                 .name = "da7213",
-                .owner = THIS_MODULE,
         },
         .probe          = da7213_i2c_probe,
         .remove         = da7213_remove,
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 207523686bd5..5446d047d2de 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1572,7 +1572,6 @@ MODULE_DEVICE_TABLE(i2c, da732x_i2c_id);
 static struct i2c_driver da732x_i2c_driver = {
         .driver         = {
                 .name   = "da7320",
-                .owner  = THIS_MODULE,
         },
         .probe          = da732x_i2c_probe,
         .remove         = da732x_i2c_remove,
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c
index 66bb446473b8..7d5baa66b132 100644
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
@@ -1538,7 +1538,6 @@ static const struct of_device_id da9055_of_match[] = {
 static struct i2c_driver da9055_i2c_driver = {
         .driver = {
                 .name = "da9055-codec",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(da9055_of_match),
         },
         .probe          = da9055_i2c_probe,
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c
index ebd90283c960..58a43b11eb7e 100644
--- a/sound/soc/codecs/isabelle.c
+++ b/sound/soc/codecs/isabelle.c
@@ -1149,7 +1149,6 @@ MODULE_DEVICE_TABLE(i2c, isabelle_i2c_id);
 static struct i2c_driver isabelle_i2c_driver = {
         .driver = {
                 .name = "isabelle",
-                .owner = THIS_MODULE,
         },
         .probe = isabelle_i2c_probe,
         .remove = isabelle_i2c_remove,
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c
index 99ffc49aa779..558de1053f73 100644
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -142,7 +142,6 @@ MODULE_DEVICE_TABLE(i2c, lm4857_i2c_id);
 static struct i2c_driver lm4857_i2c_driver = {
         .driver = {
                 .name = "lm4857",
-                .owner = THIS_MODULE,
         },
         .probe = lm4857_i2c_probe,
         .id_table = lm4857_i2c_id,
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 6600aa0a33dc..9b2e38395eb9 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -1460,7 +1460,6 @@ MODULE_DEVICE_TABLE(i2c, lm49453_i2c_id);
 static struct i2c_driver lm49453_i2c_driver = {
         .driver = {
                 .name = "lm49453",
-                .owner = THIS_MODULE,
         },
         .probe = lm49453_i2c_probe,
         .remove = lm49453_i2c_remove,
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index e1c196a41930..1526aef2f2a9 100644
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(i2c, max9768_i2c_id);
 static struct i2c_driver max9768_i2c_driver = {
         .driver = {
                 .name = "max9768",
-                .owner = THIS_MODULE,
         },
         .probe = max9768_i2c_probe,
         .remove = max9768_i2c_remove,
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index d0f45348bfbb..99c2daa0eebf 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -2011,7 +2011,6 @@ MODULE_DEVICE_TABLE(i2c, max98088_i2c_id);
 static struct i2c_driver max98088_i2c_driver = {
         .driver = {
                 .name = "max98088",
-                .owner = THIS_MODULE,
         },
         .probe  = max98088_i2c_probe,
         .remove = max98088_i2c_remove,
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 2a4c2e12972a..c09196f951f6 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2748,7 +2748,6 @@ MODULE_DEVICE_TABLE(acpi, max98090_acpi_match);
 static struct i2c_driver max98090_i2c_driver = {
         .driver = {
                 .name = "max98090",
-                .owner = THIS_MODULE,
                 .pm = &max98090_pm,
                 .of_match_table = of_match_ptr(max98090_of_match),
                 .acpi_match_table = ACPI_PTR(max98090_acpi_match),
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 9a46d3dcf703..ea45c355d324 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -2431,7 +2431,6 @@ MODULE_DEVICE_TABLE(of, max98095_of_match);
 static struct i2c_driver max98095_i2c_driver = {
         .driver = {
                 .name = "max98095",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(max98095_of_match),
         },
         .probe  = max98095_i2c_probe,
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index 481d58f1cb3f..7c990521638c 100644
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -352,7 +352,6 @@ MODULE_DEVICE_TABLE(i2c, max9850_i2c_id);
 static struct i2c_driver max9850_i2c_driver = {
         .driver = {
                 .name = "max9850",
-                .owner = THIS_MODULE,
         },
         .probe = max9850_i2c_probe,
         .remove = max9850_i2c_remove,
diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index 29549cdbf4c1..7692623ad5c3 100644
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -174,7 +174,6 @@ MODULE_DEVICE_TABLE(i2c, max9877_i2c_id);
 static struct i2c_driver max9877_i2c_driver = {
         .driver = {
                 .name = "max9877",
-                .owner = THIS_MODULE,
         },
         .probe = max9877_i2c_probe,
         .remove = max9877_i2c_remove,
diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c
index aad664225dc3..ce551eecbf95 100644
--- a/sound/soc/codecs/max98925.c
+++ b/sound/soc/codecs/max98925.c
@@ -639,7 +639,6 @@ MODULE_DEVICE_TABLE(of, max98925_of_match);
 static struct i2c_driver max98925_i2c_driver = {
         .driver = {
                 .name = "max98925",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(max98925_of_match),
                 .pm = NULL,
         },
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c
index b74118e019fb..bda2bd751be4 100644
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@@ -597,7 +597,6 @@ MODULE_DEVICE_TABLE(i2c, ml26124_i2c_id);
 static struct i2c_driver ml26124_i2c_driver = {
         .driver = {
                 .name = "ml26124",
-                .owner = THIS_MODULE,
         },
         .probe = ml26124_i2c_probe,
         .remove = ml26124_i2c_remove,
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 490970e5ab8c..58325234285c 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -335,7 +335,6 @@ static int pcm1681_i2c_remove(struct i2c_client *client)
 static struct i2c_driver pcm1681_i2c_driver = {
         .driver = {
                 .name   = "pcm1681",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(pcm1681_dt_ids),
         },
         .id_table       = pcm1681_i2c_id,
diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c
index dcdfac0ffeb1..dbff416e38be 100644
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
@@ -67,7 +67,6 @@ static struct i2c_driver pcm512x_i2c_driver = {
         .id_table       = pcm512x_i2c_id,
         .driver         = {
                 .name   = "pcm512x",
-                .owner  = THIS_MODULE,
                 .of_match_table = pcm512x_of_match,
                 .pm     = &pcm512x_pm_ops,
         },
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 5c43e263b2c1..83029e461309 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1259,7 +1259,6 @@ static int rt286_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt286_i2c_driver = {
         .driver = {
                    .name = "rt286",
-                   .owner = THIS_MODULE,
                    .acpi_match_table = ACPI_PTR(rt286_acpi_match),
                    },
         .probe = rt286_i2c_probe,
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
new file mode 100644
index 000000000000..75e5679dfef8
--- /dev/null
+++ b/sound/soc/codecs/rt298.c
@@ -0,0 +1,1273 @@
+/*
+ * rt298.c  --  RT298 ALSA SoC audio codec driver
+ *
+ * Copyright 2015 Realtek Semiconductor Corp.
+ * Author: Bard Liao <bardliao@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/acpi.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+#include <sound/jack.h>
+#include <linux/workqueue.h>
+#include <sound/rt298.h>
+#include <sound/hda_verbs.h>
+
+#include "rl6347a.h"
+#include "rt298.h"
+
+#define RT298_VENDOR_ID 0x10ec0298
+
+struct rt298_priv {
+        struct reg_default *index_cache;
+        int index_cache_size;
+        struct regmap *regmap;
+        struct snd_soc_codec *codec;
+        struct rt298_platform_data pdata;
+        struct i2c_client *i2c;
+        struct snd_soc_jack *jack;
+        struct delayed_work jack_detect_work;
+        int sys_clk;
+        int clk_id;
+        int is_hp_in;
+};
+
+static struct reg_default rt298_index_def[] = {
+        { 0x01, 0xaaaa },
+        { 0x02, 0x8aaa },
+        { 0x03, 0x0002 },
+        { 0x04, 0xaf01 },
+        { 0x08, 0x000d },
+        { 0x09, 0xd810 },
+        { 0x0a, 0x0120 },
+        { 0x0b, 0x0000 },
+        { 0x0d, 0x2800 },
+        { 0x0f, 0x0000 },
+        { 0x19, 0x0a17 },
+        { 0x20, 0x0020 },
+        { 0x33, 0x0208 },
+        { 0x46, 0x0300 },
+        { 0x49, 0x0004 },
+        { 0x4f, 0x50e9 },
+        { 0x50, 0x2000 },
+        { 0x63, 0x2902 },
+        { 0x67, 0x1111 },
+        { 0x68, 0x1016 },
+        { 0x69, 0x273f },
+};
+#define INDEX_CACHE_SIZE ARRAY_SIZE(rt298_index_def)
+
+static const struct reg_default rt298_reg[] = {
+        { 0x00170500, 0x00000400 },
+        { 0x00220000, 0x00000031 },
+        { 0x00239000, 0x0000007f },
+        { 0x0023a000, 0x0000007f },
+        { 0x00270500, 0x00000400 },
+        { 0x00370500, 0x00000400 },
+        { 0x00870500, 0x00000400 },
+        { 0x00920000, 0x00000031 },
+        { 0x00935000, 0x000000c3 },
+        { 0x00936000, 0x000000c3 },
+        { 0x00970500, 0x00000400 },
+        { 0x00b37000, 0x00000097 },
+        { 0x00b37200, 0x00000097 },
+        { 0x00b37300, 0x00000097 },
+        { 0x00c37000, 0x00000000 },
+        { 0x00c37100, 0x00000080 },
+        { 0x01270500, 0x00000400 },
+        { 0x01370500, 0x00000400 },
+        { 0x01371f00, 0x411111f0 },
+        { 0x01439000, 0x00000080 },
+        { 0x0143a000, 0x00000080 },
+        { 0x01470700, 0x00000000 },
+        { 0x01470500, 0x00000400 },
+        { 0x01470c00, 0x00000000 },
+        { 0x01470100, 0x00000000 },
+        { 0x01837000, 0x00000000 },
+        { 0x01870500, 0x00000400 },
+        { 0x02050000, 0x00000000 },
+        { 0x02139000, 0x00000080 },
+        { 0x0213a000, 0x00000080 },
+        { 0x02170100, 0x00000000 },
+        { 0x02170500, 0x00000400 },
+        { 0x02170700, 0x00000000 },
+        { 0x02270100, 0x00000000 },
+        { 0x02370100, 0x00000000 },
+        { 0x01870700, 0x00000020 },
+        { 0x00830000, 0x000000c3 },
+        { 0x00930000, 0x000000c3 },
+        { 0x01270700, 0x00000000 },
+};
+
+static bool rt298_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case 0 ... 0xff:
+        case RT298_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID):
+        case RT298_GET_HP_SENSE:
+        case RT298_GET_MIC1_SENSE:
+        case RT298_PROC_COEF:
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_MIC1, 0):
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_SPK_OUT, 0):
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_HP_OUT, 0):
+                return true;
+        default:
+                return true;
+        }
+
+
+}
+
+static bool rt298_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case 0 ... 0xff:
+        case RT298_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID):
+        case RT298_GET_HP_SENSE:
+        case RT298_GET_MIC1_SENSE:
+        case RT298_SET_AUDIO_POWER:
+        case RT298_SET_HPO_POWER:
+        case RT298_SET_SPK_POWER:
+        case RT298_SET_DMIC1_POWER:
+        case RT298_SPK_MUX:
+        case RT298_HPO_MUX:
+        case RT298_ADC0_MUX:
+        case RT298_ADC1_MUX:
+        case RT298_SET_MIC1:
+        case RT298_SET_PIN_HPO:
+        case RT298_SET_PIN_SPK:
+        case RT298_SET_PIN_DMIC1:
+        case RT298_SPK_EAPD:
+        case RT298_SET_AMP_GAIN_HPO:
+        case RT298_SET_DMIC2_DEFAULT:
+        case RT298_DACL_GAIN:
+        case RT298_DACR_GAIN:
+        case RT298_ADCL_GAIN:
+        case RT298_ADCR_GAIN:
+        case RT298_MIC_GAIN:
+        case RT298_SPOL_GAIN:
+        case RT298_SPOR_GAIN:
+        case RT298_HPOL_GAIN:
+        case RT298_HPOR_GAIN:
+        case RT298_F_DAC_SWITCH:
+        case RT298_F_RECMIX_SWITCH:
+        case RT298_REC_MIC_SWITCH:
+        case RT298_REC_I2S_SWITCH:
+        case RT298_REC_LINE_SWITCH:
+        case RT298_REC_BEEP_SWITCH:
+        case RT298_DAC_FORMAT:
+        case RT298_ADC_FORMAT:
+        case RT298_COEF_INDEX:
+        case RT298_PROC_COEF:
+        case RT298_SET_AMP_GAIN_ADC_IN1:
+        case RT298_SET_AMP_GAIN_ADC_IN2:
+        case RT298_SET_POWER(RT298_DAC_OUT1):
+        case RT298_SET_POWER(RT298_DAC_OUT2):
+        case RT298_SET_POWER(RT298_ADC_IN1):
+        case RT298_SET_POWER(RT298_ADC_IN2):
+        case RT298_SET_POWER(RT298_DMIC2):
+        case RT298_SET_POWER(RT298_MIC1):
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_MIC1, 0):
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_SPK_OUT, 0):
+        case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_HP_OUT, 0):
+                return true;
+        default:
+                return false;
+        }
+}
+
+#ifdef CONFIG_PM
+static void rt298_index_sync(struct snd_soc_codec *codec)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+        int i;
+
+        for (i = 0; i < INDEX_CACHE_SIZE; i++) {
+                snd_soc_write(codec, rt298->index_cache[i].reg,
+                                  rt298->index_cache[i].def);
+        }
+}
+#endif
+
+static int rt298_support_power_controls[] = {
+        RT298_DAC_OUT1,
+        RT298_DAC_OUT2,
+        RT298_ADC_IN1,
+        RT298_ADC_IN2,
+        RT298_MIC1,
+        RT298_DMIC1,
+        RT298_DMIC2,
+        RT298_SPK_OUT,
+        RT298_HP_OUT,
+};
+#define RT298_POWER_REG_LEN ARRAY_SIZE(rt298_support_power_controls)
+
+static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic)
+{
+        struct snd_soc_dapm_context *dapm;
+        unsigned int val, buf;
+
+        *hp = false;
+        *mic = false;
+
+        if (!rt298->codec)
+                return -EINVAL;
+
+        dapm = snd_soc_codec_get_dapm(rt298->codec);
+
+        if (rt298->pdata.cbj_en) {
+                regmap_read(rt298->regmap, RT298_GET_HP_SENSE, &buf);
+                *hp = buf & 0x80000000;
+                if (*hp == rt298->is_hp_in)
+                        return -1;
+                rt298->is_hp_in = *hp;
+                if (*hp) {
+                        /* power on HV,VERF */
+                        regmap_update_bits(rt298->regmap,
+                                RT298_DC_GAIN, 0x200, 0x200);
+
+                        snd_soc_dapm_force_enable_pin(dapm, "HV");
+                        snd_soc_dapm_force_enable_pin(dapm, "VREF");
+                        /* power LDO1 */
+                        snd_soc_dapm_force_enable_pin(dapm, "LDO1");
+                        snd_soc_dapm_sync(dapm);
+
+                        regmap_write(rt298->regmap, RT298_SET_MIC1, 0x24);
+                        msleep(50);
+
+                        regmap_update_bits(rt298->regmap,
+                                RT298_CBJ_CTRL1, 0xfcc0, 0xd400);
+                        msleep(300);
+                        regmap_read(rt298->regmap, RT298_CBJ_CTRL2, &val);
+
+                        if (0x0070 == (val & 0x0070)) {
+                                *mic = true;
+                        } else {
+                                regmap_update_bits(rt298->regmap,
+                                        RT298_CBJ_CTRL1, 0xfcc0, 0xe400);
+                                msleep(300);
+                                regmap_read(rt298->regmap,
+                                        RT298_CBJ_CTRL2, &val);
+                                if (0x0070 == (val & 0x0070))
+                                        *mic = true;
+                                else
+                                        *mic = false;
+                        }
+                        regmap_update_bits(rt298->regmap,
+                                RT298_DC_GAIN, 0x200, 0x0);
+
+                } else {
+                        *mic = false;
+                        regmap_write(rt298->regmap, RT298_SET_MIC1, 0x20);
+                }
+        } else {
+                regmap_read(rt298->regmap, RT298_GET_HP_SENSE, &buf);
+                *hp = buf & 0x80000000;
+                regmap_read(rt298->regmap, RT298_GET_MIC1_SENSE, &buf);
+                *mic = buf & 0x80000000;
+        }
+
+        snd_soc_dapm_disable_pin(dapm, "HV");
+        snd_soc_dapm_disable_pin(dapm, "VREF");
+        if (!*hp)
+                snd_soc_dapm_disable_pin(dapm, "LDO1");
+        snd_soc_dapm_sync(dapm);
+
+        pr_debug("*hp = %d *mic = %d\n", *hp, *mic);
+
+        return 0;
+}
+
+static void rt298_jack_detect_work(struct work_struct *work)
+{
+        struct rt298_priv *rt298 =
+                container_of(work, struct rt298_priv, jack_detect_work.work);
+        int status = 0;
+        bool hp = false;
+        bool mic = false;
+
+        if (rt298_jack_detect(rt298, &hp, &mic) < 0)
+                return;
+
+        if (hp == true)
+                status |= SND_JACK_HEADPHONE;
+
+        if (mic == true)
+                status |= SND_JACK_MICROPHONE;
+
+        snd_soc_jack_report(rt298->jack, status,
+                SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
+}
+
+int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        rt298->jack = jack;
+
+        /* Send an initial empty report */
+        snd_soc_jack_report(rt298->jack, 0,
+                SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt298_mic_detect);
+
+static int is_mclk_mode(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        if (rt298->clk_id == RT298_SCLK_S_MCLK)
+                return 1;
+        else
+                return 0;
+}
+
+static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -6350, 50, 0);
+static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0);
+
+static const struct snd_kcontrol_new rt298_snd_controls[] = {
+        SOC_DOUBLE_R_TLV("DAC0 Playback Volume", RT298_DACL_GAIN,
+                            RT298_DACR_GAIN, 0, 0x7f, 0, out_vol_tlv),
+        SOC_DOUBLE_R_TLV("ADC0 Capture Volume", RT298_ADCL_GAIN,
+                            RT298_ADCR_GAIN, 0, 0x7f, 0, out_vol_tlv),
+        SOC_SINGLE_TLV("AMIC Volume", RT298_MIC_GAIN,
+                            0, 0x3, 0, mic_vol_tlv),
+        SOC_DOUBLE_R("Speaker Playback Switch", RT298_SPOL_GAIN,
+                            RT298_SPOR_GAIN, RT298_MUTE_SFT, 1, 1),
+};
+
+/* Digital Mixer */
+static const struct snd_kcontrol_new rt298_front_mix[] = {
+        SOC_DAPM_SINGLE("DAC Switch",  RT298_F_DAC_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+        SOC_DAPM_SINGLE("RECMIX Switch", RT298_F_RECMIX_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+};
+
+/* Analog Input Mixer */
+static const struct snd_kcontrol_new rt298_rec_mix[] = {
+        SOC_DAPM_SINGLE("Mic1 Switch", RT298_REC_MIC_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+        SOC_DAPM_SINGLE("I2S Switch", RT298_REC_I2S_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Line1 Switch", RT298_REC_LINE_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Beep Switch", RT298_REC_BEEP_SWITCH,
+                        RT298_MUTE_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new spo_enable_control =
+        SOC_DAPM_SINGLE("Switch", RT298_SET_PIN_SPK,
+                        RT298_SET_PIN_SFT, 1, 0);
+
+static const struct snd_kcontrol_new hpol_enable_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT298_HPOL_GAIN,
+                        RT298_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpor_enable_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT298_HPOR_GAIN,
+                        RT298_MUTE_SFT, 1, 1);
+
+/* ADC0 source */
+static const char * const rt298_adc_src[] = {
+        "Mic", "RECMIX", "Dmic"
+};
+
+static const int rt298_adc_values[] = {
+        0, 4, 5,
+};
+
+static SOC_VALUE_ENUM_SINGLE_DECL(
+        rt298_adc0_enum, RT298_ADC0_MUX, RT298_ADC_SEL_SFT,
+        RT298_ADC_SEL_MASK, rt298_adc_src, rt298_adc_values);
+
+static const struct snd_kcontrol_new rt298_adc0_mux =
+        SOC_DAPM_ENUM("ADC 0 source", rt298_adc0_enum);
+
+static SOC_VALUE_ENUM_SINGLE_DECL(
+        rt298_adc1_enum, RT298_ADC1_MUX, RT298_ADC_SEL_SFT,
+        RT298_ADC_SEL_MASK, rt298_adc_src, rt298_adc_values);
+
+static const struct snd_kcontrol_new rt298_adc1_mux =
+        SOC_DAPM_ENUM("ADC 1 source", rt298_adc1_enum);
+
+static const char * const rt298_dac_src[] = {
+        "Front", "Surround"
+};
+/* HP-OUT source */
+static SOC_ENUM_SINGLE_DECL(rt298_hpo_enum, RT298_HPO_MUX,
+                                0, rt298_dac_src);
+
+static const struct snd_kcontrol_new rt298_hpo_mux =
+SOC_DAPM_ENUM("HPO source", rt298_hpo_enum);
+
+/* SPK-OUT source */
+static SOC_ENUM_SINGLE_DECL(rt298_spo_enum, RT298_SPK_MUX,
+                                0, rt298_dac_src);
+
+static const struct snd_kcontrol_new rt298_spo_mux =
+SOC_DAPM_ENUM("SPO source", rt298_spo_enum);
+
+static int rt298_spk_event(struct snd_soc_dapm_widget *w,
+                            struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_write(codec,
+                        RT298_SPK_EAPD, RT298_SET_EAPD_HIGH);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_write(codec,
+                        RT298_SPK_EAPD, RT298_SET_EAPD_LOW);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt298_set_dmic1_event(struct snd_soc_dapm_widget *w,
+                                  struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_write(codec, RT298_SET_PIN_DMIC1, 0x20);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_write(codec, RT298_SET_PIN_DMIC1, 0);
+                break;
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt298_adc_event(struct snd_soc_dapm_widget *w,
+                             struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        unsigned int nid;
+
+        nid = (w->reg >> 20) & 0xff;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec,
+                        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),
+                        0x7080, 0x7000);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec,
+                        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),
+                        0x7080, 0x7080);
+                break;
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt298_mic1_event(struct snd_soc_dapm_widget *w,
+                             struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec,
+                        RT298_A_BIAS_CTRL3, 0xc000, 0x8000);
+                snd_soc_update_bits(codec,
+                        RT298_A_BIAS_CTRL2, 0xc000, 0x8000);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(codec,
+                        RT298_A_BIAS_CTRL3, 0xc000, 0x0000);
+                snd_soc_update_bits(codec,
+                        RT298_A_BIAS_CTRL2, 0xc000, 0x0000);
+                break;
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt298_vref_event(struct snd_soc_dapm_widget *w,
+                             struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec,
+                        RT298_CBJ_CTRL1, 0x0400, 0x0000);
+                mdelay(50);
+                break;
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget rt298_dapm_widgets[] = {
+
+        SND_SOC_DAPM_SUPPLY_S("HV", 1, RT298_POWER_CTRL1,
+                12, 1, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("VREF", RT298_POWER_CTRL1,
+                0, 1, rt298_vref_event, SND_SOC_DAPM_PRE_PMU),
+        SND_SOC_DAPM_SUPPLY_S("BG_MBIAS", 1, RT298_POWER_CTRL2,
+                1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT298_POWER_CTRL2,
+                2, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("LDO2", 1, RT298_POWER_CTRL2,
+                3, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("VREF1", 1, RT298_POWER_CTRL2,
+                4, 1, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("LV", 2, RT298_POWER_CTRL1,
+                13, 1, NULL, 0),
+
+
+        SND_SOC_DAPM_SUPPLY("MCLK MODE", RT298_PLL_CTRL1,
+                5, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MIC1 Input Buffer", SND_SOC_NOPM,
+                0, 0, rt298_mic1_event, SND_SOC_DAPM_PRE_PMU |
+                SND_SOC_DAPM_POST_PMD),
+
+        /* Input Lines */
+        SND_SOC_DAPM_INPUT("DMIC1 Pin"),
+        SND_SOC_DAPM_INPUT("DMIC2 Pin"),
+        SND_SOC_DAPM_INPUT("MIC1"),
+        SND_SOC_DAPM_INPUT("LINE1"),
+        SND_SOC_DAPM_INPUT("Beep"),
+
+        /* DMIC */
+        SND_SOC_DAPM_PGA_E("DMIC1", RT298_SET_POWER(RT298_DMIC1), 0, 1,
+                NULL, 0, rt298_set_dmic1_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA("DMIC2", RT298_SET_POWER(RT298_DMIC2), 0, 1,
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DMIC Receiver", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+
+        /* REC Mixer */
+        SND_SOC_DAPM_MIXER("RECMIX", SND_SOC_NOPM, 0, 0,
+                rt298_rec_mix, ARRAY_SIZE(rt298_rec_mix)),
+
+        /* ADCs */
+        SND_SOC_DAPM_ADC("ADC 0", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC 1", NULL, SND_SOC_NOPM, 0, 0),
+
+        /* ADC Mux */
+        SND_SOC_DAPM_MUX_E("ADC 0 Mux", RT298_SET_POWER(RT298_ADC_IN1), 0, 1,
+                &rt298_adc0_mux, rt298_adc_event, SND_SOC_DAPM_PRE_PMD |
+                SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_MUX_E("ADC 1 Mux", RT298_SET_POWER(RT298_ADC_IN2), 0, 1,
+                &rt298_adc1_mux, rt298_adc_event, SND_SOC_DAPM_PRE_PMD |
+                SND_SOC_DAPM_POST_PMU),
+
+        /* Audio Interface */
+        SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF2RX", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF2TX", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),
+
+        /* Output Side */
+        /* DACs */
+        SND_SOC_DAPM_DAC("DAC 0", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC 1", NULL, SND_SOC_NOPM, 0, 0),
+
+        /* Output Mux */
+        SND_SOC_DAPM_MUX("SPK Mux", SND_SOC_NOPM, 0, 0, &rt298_spo_mux),
+        SND_SOC_DAPM_MUX("HPO Mux", SND_SOC_NOPM, 0, 0, &rt298_hpo_mux),
+
+        SND_SOC_DAPM_SUPPLY("HP Power", RT298_SET_PIN_HPO,
+                RT298_SET_PIN_SFT, 0, NULL, 0),
+
+        /* Output Mixer */
+        SND_SOC_DAPM_MIXER("Front", RT298_SET_POWER(RT298_DAC_OUT1), 0, 1,
+                        rt298_front_mix, ARRAY_SIZE(rt298_front_mix)),
+        SND_SOC_DAPM_PGA("Surround", RT298_SET_POWER(RT298_DAC_OUT2), 0, 1,
+                        NULL, 0),
+
+        /* Output Pga */
+        SND_SOC_DAPM_SWITCH_E("SPO", SND_SOC_NOPM, 0, 0,
+                &spo_enable_control, rt298_spk_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SWITCH("HPO L", SND_SOC_NOPM, 0, 0,
+                &hpol_enable_control),
+        SND_SOC_DAPM_SWITCH("HPO R", SND_SOC_NOPM, 0, 0,
+                &hpor_enable_control),
+
+        /* Output Lines */
+        SND_SOC_DAPM_OUTPUT("SPOL"),
+        SND_SOC_DAPM_OUTPUT("SPOR"),
+        SND_SOC_DAPM_OUTPUT("HPO Pin"),
+        SND_SOC_DAPM_OUTPUT("SPDIF"),
+};
+
+static const struct snd_soc_dapm_route rt298_dapm_routes[] = {
+
+        {"ADC 0", NULL, "MCLK MODE", is_mclk_mode},
+        {"ADC 1", NULL, "MCLK MODE", is_mclk_mode},
+        {"Front", NULL, "MCLK MODE", is_mclk_mode},
+        {"Surround", NULL, "MCLK MODE", is_mclk_mode},
+
+        {"HP Power", NULL, "LDO1"},
+        {"HP Power", NULL, "LDO2"},
+        {"HP Power", NULL, "LV"},
+        {"HP Power", NULL, "VREF1"},
+        {"HP Power", NULL, "BG_MBIAS"},
+
+        {"MIC1", NULL, "LDO1"},
+        {"MIC1", NULL, "LDO2"},
+        {"MIC1", NULL, "HV"},
+        {"MIC1", NULL, "LV"},
+        {"MIC1", NULL, "VREF"},
+        {"MIC1", NULL, "VREF1"},
+        {"MIC1", NULL, "BG_MBIAS"},
+        {"MIC1", NULL, "MIC1 Input Buffer"},
+
+        {"SPO", NULL, "LDO1"},
+        {"SPO", NULL, "LDO2"},
+        {"SPO", NULL, "HV"},
+        {"SPO", NULL, "LV"},
+        {"SPO", NULL, "VREF"},
+        {"SPO", NULL, "VREF1"},
+        {"SPO", NULL, "BG_MBIAS"},
+
+        {"DMIC1", NULL, "DMIC1 Pin"},
+        {"DMIC2", NULL, "DMIC2 Pin"},
+        {"DMIC1", NULL, "DMIC Receiver"},
+        {"DMIC2", NULL, "DMIC Receiver"},
+
+        {"RECMIX", "Beep Switch", "Beep"},
+        {"RECMIX", "Line1 Switch", "LINE1"},
+        {"RECMIX", "Mic1 Switch", "MIC1"},
+
+        {"ADC 0 Mux", "Dmic", "DMIC1"},
+        {"ADC 0 Mux", "RECMIX", "RECMIX"},
+        {"ADC 0 Mux", "Mic", "MIC1"},
+        {"ADC 1 Mux", "Dmic", "DMIC2"},
+        {"ADC 1 Mux", "RECMIX", "RECMIX"},
+        {"ADC 1 Mux", "Mic", "MIC1"},
+
+        {"ADC 0", NULL, "ADC 0 Mux"},
+        {"ADC 1", NULL, "ADC 1 Mux"},
+
+        {"AIF1TX", NULL, "ADC 0"},
+        {"AIF2TX", NULL, "ADC 1"},
+
+        {"DAC 0", NULL, "AIF1RX"},
+        {"DAC 1", NULL, "AIF2RX"},
+
+        {"Front", "DAC Switch", "DAC 0"},
+        {"Front", "RECMIX Switch", "RECMIX"},
+
+        {"Surround", NULL, "DAC 1"},
+
+        {"SPK Mux", "Front", "Front"},
+        {"SPK Mux", "Surround", "Surround"},
+
+        {"HPO Mux", "Front", "Front"},
+        {"HPO Mux", "Surround", "Surround"},
+
+        {"SPO", "Switch", "SPK Mux"},
+        {"HPO L", "Switch", "HPO Mux"},
+        {"HPO R", "Switch", "HPO Mux"},
+        {"HPO L", NULL, "HP Power"},
+        {"HPO R", NULL, "HP Power"},
+
+        {"SPOL", NULL, "SPO"},
+        {"SPOR", NULL, "SPO"},
+        {"HPO Pin", NULL, "HPO L"},
+        {"HPO Pin", NULL, "HPO R"},
+};
+
+static int rt298_hw_params(struct snd_pcm_substream *substream,
+                            struct snd_pcm_hw_params *params,
+                            struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val = 0;
+        int d_len_code;
+
+        switch (params_rate(params)) {
+        /* bit 14 0:48K 1:44.1K */
+        case 44100:
+        case 48000:
+                break;
+        default:
+                dev_err(codec->dev, "Unsupported sample rate %d\n",
+                                        params_rate(params));
+                return -EINVAL;
+        }
+        switch (rt298->sys_clk) {
+        case 12288000:
+        case 24576000:
+                if (params_rate(params) != 48000) {
+                        dev_err(codec->dev, "Sys_clk is not matched (%d %d)\n",
+                                        params_rate(params), rt298->sys_clk);
+                        return -EINVAL;
+                }
+                break;
+        case 11289600:
+        case 22579200:
+                if (params_rate(params) != 44100) {
+                        dev_err(codec->dev, "Sys_clk is not matched (%d %d)\n",
+                                        params_rate(params), rt298->sys_clk);
+                        return -EINVAL;
+                }
+                break;
+        }
+
+        if (params_channels(params) <= 16) {
+                /* bit 3:0 Number of Channel */
+                val |= (params_channels(params) - 1);
+        } else {
+                dev_err(codec->dev, "Unsupported channels %d\n",
+                                        params_channels(params));
+                return -EINVAL;
+        }
+
+        d_len_code = 0;
+        switch (params_width(params)) {
+        /* bit 6:4 Bits per Sample */
+        case 16:
+                d_len_code = 0;
+                val |= (0x1 << 4);
+                break;
+        case 32:
+                d_len_code = 2;
+                val |= (0x4 << 4);
+                break;
+        case 20:
+                d_len_code = 1;
+                val |= (0x2 << 4);
+                break;
+        case 24:
+                d_len_code = 2;
+                val |= (0x3 << 4);
+                break;
+        case 8:
+                d_len_code = 3;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec,
+                RT298_I2S_CTRL1, 0x0018, d_len_code << 3);
+        dev_dbg(codec->dev, "format val = 0x%x\n", val);
+
+        snd_soc_update_bits(codec, RT298_DAC_FORMAT, 0x407f, val);
+        snd_soc_update_bits(codec, RT298_ADC_FORMAT, 0x407f, val);
+
+        return 0;
+}
+
+static int rt298_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x800, 0x800);
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x800, 0x0);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x300, 0x0);
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x300, 0x1 << 8);
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x300, 0x2 << 8);
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x300, 0x3 << 8);
+                break;
+        default:
+                return -EINVAL;
+        }
+        /* bit 15 Stream Type 0:PCM 1:Non-PCM */
+        snd_soc_update_bits(codec, RT298_DAC_FORMAT, 0x8000, 0);
+        snd_soc_update_bits(codec, RT298_ADC_FORMAT, 0x8000, 0);
+
+        return 0;
+}
+
+static int rt298_set_dai_sysclk(struct snd_soc_dai *dai,
+                                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        dev_dbg(codec->dev, "%s freq=%d\n", __func__, freq);
+
+        if (RT298_SCLK_S_MCLK == clk_id) {
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x0100, 0x0);
+                snd_soc_update_bits(codec,
+                        RT298_PLL_CTRL1, 0x20, 0x20);
+        } else {
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x0100, 0x0100);
+                snd_soc_update_bits(codec,
+                        RT298_PLL_CTRL, 0x4, 0x4);
+                snd_soc_update_bits(codec,
+                        RT298_PLL_CTRL1, 0x20, 0x0);
+        }
+
+        switch (freq) {
+        case 19200000:
+                if (RT298_SCLK_S_MCLK == clk_id) {
+                        dev_err(codec->dev, "Should not use MCLK\n");
+                        return -EINVAL;
+                }
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x40, 0x40);
+                break;
+        case 24000000:
+                if (RT298_SCLK_S_MCLK == clk_id) {
+                        dev_err(codec->dev, "Should not use MCLK\n");
+                        return -EINVAL;
+                }
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x40, 0x0);
+                break;
+        case 12288000:
+        case 11289600:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x8, 0x0);
+                snd_soc_update_bits(codec,
+                        RT298_CLK_DIV, 0xfc1e, 0x0004);
+                break;
+        case 24576000:
+        case 22579200:
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL2, 0x8, 0x8);
+                snd_soc_update_bits(codec,
+                        RT298_CLK_DIV, 0xfc1e, 0x5406);
+                break;
+        default:
+                dev_err(codec->dev, "Unsupported system clock\n");
+                return -EINVAL;
+        }
+
+        rt298->sys_clk = freq;
+        rt298->clk_id = clk_id;
+
+        return 0;
+}
+
+static int rt298_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
+{
+        struct snd_soc_codec *codec = dai->codec;
+
+        dev_dbg(codec->dev, "%s ratio=%d\n", __func__, ratio);
+        if (50 == ratio)
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x1000, 0x1000);
+        else
+                snd_soc_update_bits(codec,
+                        RT298_I2S_CTRL1, 0x1000, 0x0);
+
+
+        return 0;
+}
+
+static int rt298_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+        switch (level) {
+        case SND_SOC_BIAS_PREPARE:
+                if (SND_SOC_BIAS_STANDBY ==
+                        snd_soc_codec_get_bias_level(codec)) {
+                        snd_soc_write(codec,
+                                RT298_SET_AUDIO_POWER, AC_PWRST_D0);
+                        snd_soc_update_bits(codec, 0x0d, 0x200, 0x200);
+                        snd_soc_update_bits(codec, 0x52, 0x80, 0x0);
+                        mdelay(20);
+                        snd_soc_update_bits(codec, 0x0d, 0x200, 0x0);
+                        snd_soc_update_bits(codec, 0x52, 0x80, 0x80);
+                }
+                break;
+
+        case SND_SOC_BIAS_ON:
+                mdelay(30);
+                snd_soc_update_bits(codec,
+                        RT298_CBJ_CTRL1, 0x0400, 0x0400);
+
+                break;
+
+        case SND_SOC_BIAS_STANDBY:
+                snd_soc_write(codec,
+                        RT298_SET_AUDIO_POWER, AC_PWRST_D3);
+                snd_soc_update_bits(codec,
+                        RT298_CBJ_CTRL1, 0x0400, 0x0000);
+                break;
+
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static irqreturn_t rt298_irq(int irq, void *data)
+{
+        struct rt298_priv *rt298 = data;
+        bool hp = false;
+        bool mic = false;
+        int ret, status = 0;
+
+        ret = rt298_jack_detect(rt298, &hp, &mic);
+
+        /* Clear IRQ */
+        regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x1, 0x1);
+
+        if (ret == 0) {
+                if (hp == true)
+                        status |= SND_JACK_HEADPHONE;
+
+                if (mic == true)
+                        status |= SND_JACK_MICROPHONE;
+
+                snd_soc_jack_report(rt298->jack, status,
+                        SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
+
+                pm_wakeup_event(&rt298->i2c->dev, 300);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int rt298_probe(struct snd_soc_codec *codec)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        rt298->codec = codec;
+
+        if (rt298->i2c->irq) {
+                regmap_update_bits(rt298->regmap,
+                                        RT298_IRQ_CTRL, 0x2, 0x2);
+
+                INIT_DELAYED_WORK(&rt298->jack_detect_work,
+                                        rt298_jack_detect_work);
+                schedule_delayed_work(&rt298->jack_detect_work,
+                                        msecs_to_jiffies(1250));
+        }
+
+        return 0;
+}
+
+static int rt298_remove(struct snd_soc_codec *codec)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        cancel_delayed_work_sync(&rt298->jack_detect_work);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int rt298_suspend(struct snd_soc_codec *codec)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        rt298->is_hp_in = -1;
+        regcache_cache_only(rt298->regmap, true);
+        regcache_mark_dirty(rt298->regmap);
+
+        return 0;
+}
+
+static int rt298_resume(struct snd_soc_codec *codec)
+{
+        struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt298->regmap, false);
+        rt298_index_sync(codec);
+        regcache_sync(rt298->regmap);
+
+        return 0;
+}
+#else
+#define rt298_suspend NULL
+#define rt298_resume NULL
+#endif
+
+#define RT298_STEREO_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
+#define RT298_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
+
+static const struct snd_soc_dai_ops rt298_aif_dai_ops = {
+        .hw_params = rt298_hw_params,
+        .set_fmt = rt298_set_dai_fmt,
+        .set_sysclk = rt298_set_dai_sysclk,
+        .set_bclk_ratio = rt298_set_bclk_ratio,
+};
+
+static struct snd_soc_dai_driver rt298_dai[] = {
+        {
+                .name = "rt298-aif1",
+                .id = RT298_AIF1,
+                .playback = {
+                        .stream_name = "AIF1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT298_STEREO_RATES,
+                        .formats = RT298_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT298_STEREO_RATES,
+                        .formats = RT298_FORMATS,
+                },
+                .ops = &rt298_aif_dai_ops,
+                .symmetric_rates = 1,
+        },
+        {
+                .name = "rt298-aif2",
+                .id = RT298_AIF2,
+                .playback = {
+                        .stream_name = "AIF2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT298_STEREO_RATES,
+                        .formats = RT298_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT298_STEREO_RATES,
+                        .formats = RT298_FORMATS,
+                },
+                .ops = &rt298_aif_dai_ops,
+                .symmetric_rates = 1,
+        },
+
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_rt298 = {
+        .probe = rt298_probe,
+        .remove = rt298_remove,
+        .suspend = rt298_suspend,
+        .resume = rt298_resume,
+        .set_bias_level = rt298_set_bias_level,
+        .idle_bias_off = true,
+        .controls = rt298_snd_controls,
+        .num_controls = ARRAY_SIZE(rt298_snd_controls),
+        .dapm_widgets = rt298_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(rt298_dapm_widgets),
+        .dapm_routes = rt298_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(rt298_dapm_routes),
+};
+
+static const struct regmap_config rt298_regmap = {
+        .reg_bits = 32,
+        .val_bits = 32,
+        .max_register = 0x02370100,
+        .volatile_reg = rt298_volatile_register,
+        .readable_reg = rt298_readable_register,
+        .reg_write = rl6347a_hw_write,
+        .reg_read = rl6347a_hw_read,
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = rt298_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt298_reg),
+};
+
+static const struct i2c_device_id rt298_i2c_id[] = {
+        {"rt298", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, rt298_i2c_id);
+
+static const struct acpi_device_id rt298_acpi_match[] = {
+        { "INT343A", 0 },
+        {},
+};
+MODULE_DEVICE_TABLE(acpi, rt298_acpi_match);
+
+static int rt298_i2c_probe(struct i2c_client *i2c,
+                           const struct i2c_device_id *id)
+{
+        struct rt298_platform_data *pdata = dev_get_platdata(&i2c->dev);
+        struct rt298_priv *rt298;
+        struct device *dev = &i2c->dev;
+        const struct acpi_device_id *acpiid;
+        int i, ret;
+
+        pr_info("%s\n", __func__);
+
+        rt298 = devm_kzalloc(&i2c->dev, sizeof(*rt298),
+                                GFP_KERNEL);
+        if (NULL == rt298)
+                return -ENOMEM;
+
+        rt298->regmap = devm_regmap_init(&i2c->dev, NULL, i2c, &rt298_regmap);
+        if (IS_ERR(rt298->regmap)) {
+                ret = PTR_ERR(rt298->regmap);
+                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+
+        regmap_read(rt298->regmap,
+                RT298_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &ret);
+        if (ret != RT298_VENDOR_ID) {
+                dev_err(&i2c->dev,
+                        "Device with ID register %#x is not rt298\n", ret);
+                return -ENODEV;
+        }
+
+        rt298->index_cache = rt298_index_def;
+        rt298->index_cache_size = INDEX_CACHE_SIZE;
+        rt298->i2c = i2c;
+        i2c_set_clientdata(i2c, rt298);
+
+        /* restore codec default */
+        for (i = 0; i < INDEX_CACHE_SIZE; i++)
+                regmap_write(rt298->regmap, rt298->index_cache[i].reg,
+                                rt298->index_cache[i].def);
+        for (i = 0; i < ARRAY_SIZE(rt298_reg); i++)
+                regmap_write(rt298->regmap, rt298_reg[i].reg,
+                                rt298_reg[i].def);
+
+        if (pdata)
+                rt298->pdata = *pdata;
+
+        /* enable jack combo mode on supported devices */
+        acpiid = acpi_match_device(dev->driver->acpi_match_table, dev);
+        if (acpiid) {
+                rt298->pdata = *(struct rt298_platform_data *)
+                                acpiid->driver_data;
+        }
+
+        /* VREF Charging */
+        regmap_update_bits(rt298->regmap, 0x04, 0x80, 0x80);
+        regmap_update_bits(rt298->regmap, 0x1b, 0x860, 0x860);
+        /* Vref2 */
+        regmap_update_bits(rt298->regmap, 0x08, 0x20, 0x20);
+
+        regmap_write(rt298->regmap, RT298_SET_AUDIO_POWER, AC_PWRST_D3);
+
+        for (i = 0; i < RT298_POWER_REG_LEN; i++)
+                regmap_write(rt298->regmap,
+                        RT298_SET_POWER(rt298_support_power_controls[i]),
+                        AC_PWRST_D1);
+
+        if (!rt298->pdata.cbj_en) {
+                regmap_write(rt298->regmap, RT298_CBJ_CTRL2, 0x0000);
+                regmap_write(rt298->regmap, RT298_MIC1_DET_CTRL, 0x0816);
+                regmap_update_bits(rt298->regmap,
+                                        RT298_CBJ_CTRL1, 0xf000, 0xb000);
+        } else {
+                regmap_update_bits(rt298->regmap,
+                                        RT298_CBJ_CTRL1, 0xf000, 0x5000);
+        }
+
+        mdelay(10);
+
+        if (!rt298->pdata.gpio2_en)
+                regmap_write(rt298->regmap, RT298_SET_DMIC2_DEFAULT, 0x4000);
+        else
+                regmap_write(rt298->regmap, RT298_SET_DMIC2_DEFAULT, 0);
+
+        mdelay(10);
+
+        regmap_write(rt298->regmap, RT298_MISC_CTRL1, 0x0000);
+        regmap_update_bits(rt298->regmap,
+                                RT298_WIND_FILTER_CTRL, 0x0082, 0x0082);
+        regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2);
+        rt298->is_hp_in = -1;
+
+        if (rt298->i2c->irq) {
+                ret = request_threaded_irq(rt298->i2c->irq, NULL, rt298_irq,
+                        IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "rt298", rt298);
+                if (ret != 0) {
+                        dev_err(&i2c->dev,
+                                "Failed to reguest IRQ: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt298,
+                                     rt298_dai, ARRAY_SIZE(rt298_dai));
+
+        return ret;
+}
+
+static int rt298_i2c_remove(struct i2c_client *i2c)
+{
+        struct rt298_priv *rt298 = i2c_get_clientdata(i2c);
+
+        if (i2c->irq)
+                free_irq(i2c->irq, rt298);
+        snd_soc_unregister_codec(&i2c->dev);
+
+        return 0;
+}
+
+
+static struct i2c_driver rt298_i2c_driver = {
+        .driver = {
+                   .name = "rt298",
+                   .acpi_match_table = ACPI_PTR(rt298_acpi_match),
+                   },
+        .probe = rt298_i2c_probe,
+        .remove = rt298_i2c_remove,
+        .id_table = rt298_i2c_id,
+};
+
+module_i2c_driver(rt298_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC RT298 driver");
+MODULE_AUTHOR("Bard Liao <bardliao@realtek.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h
new file mode 100644
index 000000000000..31da16265f2b
--- /dev/null
+++ b/sound/soc/codecs/rt298.h
@@ -0,0 +1,206 @@
+/*
+ * rt298.h  --  RT298 ALSA SoC audio driver
+ *
+ * Copyright 2011 Realtek Microelectronics
+ * Author: Johnny Hsu <johnnyhsu@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __RT298_H__
+#define __RT298_H__
+
+#define VERB_CMD(V, N, D) ((N << 20) | (V << 8) | D)
+
+#define RT298_AUDIO_FUNCTION_GROUP                      0x01
+#define RT298_DAC_OUT1                                  0x02
+#define RT298_DAC_OUT2                                  0x03
+#define RT298_DIG_CVT                                   0x06
+#define RT298_ADC_IN1                                   0x09
+#define RT298_ADC_IN2                                   0x08
+#define RT298_MIXER_IN                                  0x0b
+#define RT298_MIXER_OUT1                                0x0c
+#define RT298_MIXER_OUT2                                0x0d
+#define RT298_DMIC1                                     0x12
+#define RT298_DMIC2                                     0x13
+#define RT298_SPK_OUT                                   0x14
+#define RT298_MIC1                                      0x18
+#define RT298_LINE1                                     0x1a
+#define RT298_BEEP                                      0x1d
+#define RT298_SPDIF                                     0x1e
+#define RT298_VENDOR_REGISTERS                          0x20
+#define RT298_HP_OUT                                    0x21
+#define RT298_MIXER_IN1                                 0x22
+#define RT298_MIXER_IN2                                 0x23
+
+#define RT298_SET_PIN_SFT                               6
+#define RT298_SET_PIN_ENABLE                            0x40
+#define RT298_SET_PIN_DISABLE                           0
+#define RT298_SET_EAPD_HIGH                             0x2
+#define RT298_SET_EAPD_LOW                              0
+
+#define RT298_MUTE_SFT                                  7
+
+/* Verb commands */
+#define RT298_GET_PARAM(NID, PARAM) VERB_CMD(AC_VERB_PARAMETERS, NID, PARAM)
+#define RT298_SET_POWER(NID) VERB_CMD(AC_VERB_SET_POWER_STATE, NID, 0)
+#define RT298_SET_AUDIO_POWER RT298_SET_POWER(RT298_AUDIO_FUNCTION_GROUP)
+#define RT298_SET_HPO_POWER RT298_SET_POWER(RT298_HP_OUT)
+#define RT298_SET_SPK_POWER RT298_SET_POWER(RT298_SPK_OUT)
+#define RT298_SET_DMIC1_POWER RT298_SET_POWER(RT298_DMIC1)
+#define RT298_SPK_MUX\
+        VERB_CMD(AC_VERB_SET_CONNECT_SEL, RT298_SPK_OUT, 0)
+#define RT298_HPO_MUX\
+        VERB_CMD(AC_VERB_SET_CONNECT_SEL, RT298_HP_OUT, 0)
+#define RT298_ADC0_MUX\
+        VERB_CMD(AC_VERB_SET_CONNECT_SEL, RT298_MIXER_IN1, 0)
+#define RT298_ADC1_MUX\
+        VERB_CMD(AC_VERB_SET_CONNECT_SEL, RT298_MIXER_IN2, 0)
+#define RT298_SET_MIC1\
+        VERB_CMD(AC_VERB_SET_PIN_WIDGET_CONTROL, RT298_MIC1, 0)
+#define RT298_SET_PIN_HPO\
+        VERB_CMD(AC_VERB_SET_PIN_WIDGET_CONTROL, RT298_HP_OUT, 0)
+#define RT298_SET_PIN_SPK\
+        VERB_CMD(AC_VERB_SET_PIN_WIDGET_CONTROL, RT298_SPK_OUT, 0)
+#define RT298_SET_PIN_DMIC1\
+        VERB_CMD(AC_VERB_SET_PIN_WIDGET_CONTROL, RT298_DMIC1, 0)
+#define RT298_SET_PIN_SPDIF\
+        VERB_CMD(AC_VERB_SET_PIN_WIDGET_CONTROL, RT298_SPDIF, 0)
+#define RT298_SET_PIN_DIG_CVT\
+        VERB_CMD(AC_VERB_SET_DIGI_CONVERT_1, RT298_DIG_CVT, 0)
+#define RT298_SPK_EAPD\
+        VERB_CMD(AC_VERB_SET_EAPD_BTLENABLE, RT298_SPK_OUT, 0)
+#define RT298_SET_AMP_GAIN_HPO\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_HP_OUT, 0)
+#define RT298_SET_AMP_GAIN_ADC_IN1\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_ADC_IN1, 0)
+#define RT298_SET_AMP_GAIN_ADC_IN2\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_ADC_IN2, 0)
+#define RT298_GET_HP_SENSE\
+        VERB_CMD(AC_VERB_GET_PIN_SENSE, RT298_HP_OUT, 0)
+#define RT298_GET_MIC1_SENSE\
+        VERB_CMD(AC_VERB_GET_PIN_SENSE, RT298_MIC1, 0)
+#define RT298_SET_DMIC2_DEFAULT\
+        VERB_CMD(AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, RT298_DMIC2, 0)
+#define RT298_SET_SPDIF_DEFAULT\
+        VERB_CMD(AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, RT298_SPDIF, 0)
+#define RT298_DACL_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_DAC_OUT1, 0xa000)
+#define RT298_DACR_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_DAC_OUT1, 0x9000)
+#define RT298_ADCL_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_ADC_IN1, 0x6000)
+#define RT298_ADCR_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_ADC_IN1, 0x5000)
+#define RT298_MIC_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIC1, 0x7000)
+#define RT298_SPOL_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_SPK_OUT, 0xa000)
+#define RT298_SPOR_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_SPK_OUT, 0x9000)
+#define RT298_HPOL_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_HP_OUT, 0xa000)
+#define RT298_HPOR_GAIN\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_HP_OUT, 0x9000)
+#define RT298_F_DAC_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_OUT1, 0x7000)
+#define RT298_F_RECMIX_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_OUT1, 0x7100)
+#define RT298_REC_MIC_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_IN, 0x7000)
+#define RT298_REC_I2S_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_IN, 0x7100)
+#define RT298_REC_LINE_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_IN, 0x7200)
+#define RT298_REC_BEEP_SWITCH\
+        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, RT298_MIXER_IN, 0x7300)
+#define RT298_DAC_FORMAT\
+        VERB_CMD(AC_VERB_SET_STREAM_FORMAT, RT298_DAC_OUT1, 0)
+#define RT298_ADC_FORMAT\
+        VERB_CMD(AC_VERB_SET_STREAM_FORMAT, RT298_ADC_IN1, 0)
+#define RT298_COEF_INDEX\
+        VERB_CMD(AC_VERB_SET_COEF_INDEX, RT298_VENDOR_REGISTERS, 0)
+#define RT298_PROC_COEF\
+        VERB_CMD(AC_VERB_SET_PROC_COEF, RT298_VENDOR_REGISTERS, 0)
+
+/* Index registers */
+#define RT298_A_BIAS_CTRL1      0x01
+#define RT298_A_BIAS_CTRL2      0x02
+#define RT298_POWER_CTRL1       0x03
+#define RT298_A_BIAS_CTRL3      0x04
+#define RT298_POWER_CTRL2       0x08
+#define RT298_I2S_CTRL1         0x09
+#define RT298_I2S_CTRL2         0x0a
+#define RT298_CLK_DIV           0x0b
+#define RT298_DC_GAIN           0x0d
+#define RT298_POWER_CTRL3       0x0f
+#define RT298_MIC1_DET_CTRL     0x19
+#define RT298_MISC_CTRL1        0x20
+#define RT298_IRQ_CTRL          0x33
+#define RT298_WIND_FILTER_CTRL  0x46
+#define RT298_PLL_CTRL1         0x49
+#define RT298_CBJ_CTRL1         0x4f
+#define RT298_CBJ_CTRL2         0x50
+#define RT298_PLL_CTRL          0x63
+#define RT298_DEPOP_CTRL1       0x66
+#define RT298_DEPOP_CTRL2       0x67
+#define RT298_DEPOP_CTRL3       0x68
+#define RT298_DEPOP_CTRL4       0x69
+
+/* SPDIF (0x06) */
+#define RT298_SPDIF_SEL_SFT     0
+#define RT298_SPDIF_SEL_PCM0    0
+#define RT298_SPDIF_SEL_PCM1    1
+#define RT298_SPDIF_SEL_SPOUT   2
+#define RT298_SPDIF_SEL_PP      3
+
+/* RECMIX (0x0b) */
+#define RT298_M_REC_BEEP_SFT    0
+#define RT298_M_REC_LINE1_SFT   1
+#define RT298_M_REC_MIC1_SFT    2
+#define RT298_M_REC_I2S_SFT     3
+
+/* Front (0x0c) */
+#define RT298_M_FRONT_DAC_SFT   0
+#define RT298_M_FRONT_REC_SFT   1
+
+/* SPK-OUT (0x14) */
+#define RT298_M_SPK_MUX_SFT     14
+#define RT298_SPK_SEL_MASK      0x1
+#define RT298_SPK_SEL_SFT       0
+#define RT298_SPK_SEL_F         0
+#define RT298_SPK_SEL_S         1
+
+/* HP-OUT (0x21) */
+#define RT298_M_HP_MUX_SFT      14
+#define RT298_HP_SEL_MASK       0x1
+#define RT298_HP_SEL_SFT        0
+#define RT298_HP_SEL_F          0
+#define RT298_HP_SEL_S          1
+
+/* ADC (0x22) (0x23) */
+#define RT298_ADC_SEL_MASK      0x7
+#define RT298_ADC_SEL_SFT       0
+#define RT298_ADC_SEL_SURR      0
+#define RT298_ADC_SEL_FRONT     1
+#define RT298_ADC_SEL_DMIC      2
+#define RT298_ADC_SEL_BEEP      4
+#define RT298_ADC_SEL_LINE1     5
+#define RT298_ADC_SEL_I2S       6
+#define RT298_ADC_SEL_MIC1      7
+
+#define RT298_SCLK_S_MCLK       0
+#define RT298_SCLK_S_PLL        1
+
+enum {
+        RT298_AIF1,
+        RT298_AIF2,
+        RT298_AIFS,
+};
+
+int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
+
+#endif /* __RT298_H__ */
+
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 058167c80d71..d8771020299d 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1725,7 +1725,6 @@ static int rt5631_i2c_remove(struct i2c_client *client)
 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,
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index ff72cd8c236e..e6691a12ca3d 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2276,7 +2276,6 @@ static int rt5640_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt5640_i2c_driver = {
         .driver = {
                 .name = "rt5640",
-                .owner = THIS_MODULE,
                 .acpi_match_table = ACPI_PTR(rt5640_acpi_match),
                 .of_match_table = of_match_ptr(rt5640_of_match),
         },
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 1fd21cae7a65..e0954fa2d69b 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3473,7 +3473,6 @@ static void rt5645_i2c_shutdown(struct i2c_client *i2c)
 static struct i2c_driver rt5645_i2c_driver = {
         .driver = {
                 .name = "rt5645",
-                .owner = THIS_MODULE,
                 .acpi_match_table = ACPI_PTR(rt5645_acpi_match),
         },
         .probe = rt5645_i2c_probe,
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index a3506e193abc..872121015dfc 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1806,7 +1806,6 @@ static int rt5651_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt5651_i2c_driver = {
         .driver = {
                 .name = "rt5651",
-                .owner = THIS_MODULE,
         },
         .probe = rt5651_i2c_probe,
         .remove   = rt5651_i2c_remove,
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index a9123d414178..8f9ab2b493ec 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -3043,7 +3043,6 @@ static int rt5670_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt5670_i2c_driver = {
         .driver = {
                 .name = "rt5670",
-                .owner = THIS_MODULE,
                 .acpi_match_table = ACPI_PTR(rt5670_acpi_match),
         },
         .probe = rt5670_i2c_probe,
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 31d969ac1192..03afec78a170 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -5273,7 +5273,6 @@ static int rt5677_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt5677_i2c_driver = {
         .driver = {
                 .name = "rt5677",
-                .owner = THIS_MODULE,
         },
         .probe = rt5677_i2c_probe,
         .remove   = rt5677_i2c_remove,
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index e673f6ceb521..f3e646757215 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1601,7 +1601,6 @@ MODULE_DEVICE_TABLE(of, sgtl5000_dt_ids);
 static struct i2c_driver sgtl5000_i2c_driver = {
         .driver = {
                    .name = "sgtl5000",
-                   .owner = THIS_MODULE,
                    .of_match_table = sgtl5000_dt_ids,
                    },
         .probe = sgtl5000_i2c_probe,
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
index f30de7639bb9..5d94d6c7ad33 100644
--- a/sound/soc/codecs/ssm2518.c
+++ b/sound/soc/codecs/ssm2518.c
@@ -815,7 +815,6 @@ MODULE_DEVICE_TABLE(i2c, ssm2518_i2c_ids);
 static struct i2c_driver ssm2518_driver = {
         .driver = {
                 .name = "ssm2518",
-                .owner = THIS_MODULE,
         },
         .probe = ssm2518_i2c_probe,
         .remove = ssm2518_i2c_remove,
diff --git a/sound/soc/codecs/ssm2602-i2c.c b/sound/soc/codecs/ssm2602-i2c.c
index 0d9779d6bfda..173ba85ff59e 100644
--- a/sound/soc/codecs/ssm2602-i2c.c
+++ b/sound/soc/codecs/ssm2602-i2c.c
@@ -52,7 +52,6 @@ MODULE_DEVICE_TABLE(of, ssm2602_of_match);
 static struct i2c_driver ssm2602_i2c_driver = {
         .driver = {
                 .name = "ssm2602",
-                .owner = THIS_MODULE,
                 .of_match_table = ssm2602_of_match,
         },
         .probe = ssm2602_i2c_probe,
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
index 84a4f5ad8064..e619d5651b09 100644
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -10,6 +10,7 @@
  * Licensed under the GPL-2.
  */
 
+#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
@@ -173,6 +174,12 @@ static const struct snd_soc_dapm_widget ssm4567_dapm_widgets[] = {
         SND_SOC_DAPM_SWITCH("Amplifier Boost", SSM4567_REG_POWER_CTRL, 3, 1,
                 &ssm4567_amplifier_boost_control),
 
+        SND_SOC_DAPM_SIGGEN("Sense"),
+
+        SND_SOC_DAPM_PGA("Current Sense", SSM4567_REG_POWER_CTRL, 4, 1, NULL, 0),
+        SND_SOC_DAPM_PGA("Voltage Sense", SSM4567_REG_POWER_CTRL, 5, 1, NULL, 0),
+        SND_SOC_DAPM_PGA("VBAT Sense", SSM4567_REG_POWER_CTRL, 6, 1, NULL, 0),
+
         SND_SOC_DAPM_OUTPUT("OUT"),
 };
 
@@ -180,6 +187,13 @@ static const struct snd_soc_dapm_route ssm4567_routes[] = {
         { "OUT", NULL, "Amplifier Boost" },
         { "Amplifier Boost", "Switch", "DAC" },
         { "OUT", NULL, "DAC" },
+
+        { "Current Sense", NULL, "Sense" },
+        { "Voltage Sense", NULL, "Sense" },
+        { "VBAT Sense", NULL, "Sense" },
+        { "Capture Sense", NULL, "Current Sense" },
+        { "Capture Sense", NULL, "Voltage Sense" },
+        { "Capture Sense", NULL, "VBAT Sense" },
 };
 
 static int ssm4567_hw_params(struct snd_pcm_substream *substream,
@@ -387,6 +401,14 @@ static struct snd_soc_dai_driver ssm4567_dai = {
                 .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
                         SNDRV_PCM_FMTBIT_S32,
         },
+        .capture = {
+                .stream_name = "Capture Sense",
+                .channels_min = 1,
+                .channels_max = 1,
+                .rates = SNDRV_PCM_RATE_8000_192000,
+                .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
+                        SNDRV_PCM_FMTBIT_S32,
+        },
         .ops = &ssm4567_dai_ops,
 };
 
@@ -456,10 +478,20 @@ static const struct i2c_device_id ssm4567_i2c_ids[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids);
 
+#ifdef CONFIG_ACPI
+
+static const struct acpi_device_id ssm4567_acpi_match[] = {
+        { "INT343B", 0 },
+        {},
+};
+MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_match);
+
+#endif
+
 static struct i2c_driver ssm4567_driver = {
         .driver = {
                 .name = "ssm4567",
-                .owner = THIS_MODULE,
+                .acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
         },
         .probe = ssm4567_i2c_probe,
         .remove = ssm4567_i2c_remove,
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 60eff36260cb..a9844b2ac829 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -1144,7 +1144,6 @@ MODULE_DEVICE_TABLE(i2c, sta32x_i2c_id);
 static struct i2c_driver sta32x_i2c_driver = {
         .driver = {
                 .name = "sta32x",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(st32x_dt_ids),
         },
         .probe =    sta32x_i2c_probe,
diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c
index bd819a3f205a..33a4612f0a07 100644
--- a/sound/soc/codecs/sta350.c
+++ b/sound/soc/codecs/sta350.c
@@ -1264,7 +1264,6 @@ MODULE_DEVICE_TABLE(i2c, sta350_i2c_id);
 static struct i2c_driver sta350_i2c_driver = {
         .driver = {
                 .name = "sta350",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(st350_dt_ids),
         },
         .probe =    sta350_i2c_probe,
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 4f70378b2cfb..3430f444c1ae 100644
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -379,7 +379,6 @@ MODULE_DEVICE_TABLE(i2c, sta529_i2c_id);
 static struct i2c_driver sta529_i2c_driver = {
         .driver = {
                 .name = "sta529",
-                .owner = THIS_MODULE,
         },
         .probe          = sta529_i2c_probe,
         .remove         = sta529_i2c_remove,
diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index 4f25a7d0efa2..083b6b3e6cd2 100644
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -769,7 +769,6 @@ MODULE_DEVICE_TABLE(of, tas2552_of_match);
 static struct i2c_driver tas2552_i2c_driver = {
         .driver = {
                 .name = "tas2552",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(tas2552_of_match),
                 .pm = &tas2552_pm,
         },
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 32942bed34b1..0a49fc851577 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -994,7 +994,6 @@ static int tas5086_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver tas5086_i2c_driver = {
         .driver = {
                 .name   = "tas5086",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(tas5086_dt_ids),
         },
         .id_table       = tas5086_i2c_id,
diff --git a/sound/soc/codecs/tfa9879.c b/sound/soc/codecs/tfa9879.c
index aab0af681e8c..86d05f01e5f9 100644
--- a/sound/soc/codecs/tfa9879.c
+++ b/sound/soc/codecs/tfa9879.c
@@ -314,7 +314,6 @@ MODULE_DEVICE_TABLE(i2c, tfa9879_i2c_id);
 static struct i2c_driver tfa9879_i2c_driver = {
         .driver = {
                 .name = "tfa9879",
-                .owner = THIS_MODULE,
         },
         .probe = tfa9879_i2c_probe,
         .remove = tfa9879_i2c_remove,
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index c4c960f592a1..48dd9b2cd0fa 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1283,7 +1283,6 @@ MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id);
 static struct i2c_driver aic31xx_i2c_driver = {
         .driver = {
                 .name   = "tlv320aic31xx-codec",
-                .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(tlv320aic31xx_of_match),
         },
         .probe          = aic31xx_i2c_probe,
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index ad6cb90e5f9b..f2d3191961e1 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -871,7 +871,6 @@ MODULE_DEVICE_TABLE(of, aic32x4_of_id);
 static struct i2c_driver aic32x4_i2c_driver = {
         .driver = {
                 .name = "tlv320aic32x4",
-                .owner = THIS_MODULE,
                 .of_match_table = aic32x4_of_id,
         },
         .probe =    aic32x4_i2c_probe,
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a7cf19b53fb2..125a93517cdb 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1825,7 +1825,6 @@ MODULE_DEVICE_TABLE(of, tlv320aic3x_of_match);
 static struct i2c_driver aic3x_i2c_driver = {
         .driver = {
                 .name = "tlv320aic3x-codec",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(tlv320aic3x_of_match),
         },
         .probe  = aic3x_i2c_probe,
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index d67a311f0e75..781398fb2841 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1585,7 +1585,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320dac33_i2c_id);
 static struct i2c_driver tlv320dac33_i2c_driver = {
         .driver = {
                 .name = "tlv320dac33-codec",
-                .owner = THIS_MODULE,
         },
         .probe          = dac33_i2c_probe,
         .remove         = dac33_i2c_remove,
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 6fac9e034c48..265c4c38804d 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -488,7 +488,6 @@ MODULE_DEVICE_TABLE(of, tpa6130a2_of_match);
 static struct i2c_driver tpa6130a2_i2c_driver = {
         .driver = {
                 .name = "tpa6130a2",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(tpa6130a2_of_match),
         },
         .probe = tpa6130a2_probe,
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 12232d7db4c5..43568435c208 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -23,11 +23,13 @@
 #include "ts3a227e.h"
 
 struct ts3a227e {
+        struct device *dev;
         struct regmap *regmap;
         struct snd_soc_jack *jack;
         bool plugged;
         bool mic_present;
         unsigned int buttons_held;
+        int irq;
 };
 
 /* Button values to be reported on the jack */
@@ -189,16 +191,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)
         struct ts3a227e *ts3a227e = (struct ts3a227e *)data;
         struct regmap *regmap = ts3a227e->regmap;
         unsigned int int_reg, kp_int_reg, acc_reg, i;
+        struct device *dev = ts3a227e->dev;
+        int ret;
 
         /* Check for plug/unplug. */
-        regmap_read(regmap, TS3A227E_REG_INTERRUPT, &int_reg);
+        ret = regmap_read(regmap, TS3A227E_REG_INTERRUPT, &int_reg);
+        if (ret) {
+                dev_err(dev, "failed to clear interrupt ret=%d\n", ret);
+                return IRQ_NONE;
+        }
+
         if (int_reg & (DETECTION_COMPLETE_EVENT | INS_REM_EVENT)) {
                 regmap_read(regmap, TS3A227E_REG_ACCESSORY_STATUS, &acc_reg);
                 ts3a227e_new_jack_state(ts3a227e, acc_reg);
         }
 
         /* Report any key events. */
-        regmap_read(regmap, TS3A227E_REG_KP_INTERRUPT, &kp_int_reg);
+        ret = regmap_read(regmap, TS3A227E_REG_KP_INTERRUPT, &kp_int_reg);
+        if (ret) {
+                dev_err(dev, "failed to clear key interrupt ret=%d\n", ret);
+                return IRQ_NONE;
+        }
+
         for (i = 0; i < TS3A227E_NUM_BUTTONS; i++) {
                 if (kp_int_reg & PRESS_MASK(i))
                         ts3a227e->buttons_held |= (1 << i);
@@ -283,6 +297,8 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
                 return -ENOMEM;
 
         i2c_set_clientdata(i2c, ts3a227e);
+        ts3a227e->dev = dev;
+        ts3a227e->irq = i2c->irq;
 
         ts3a227e->regmap = devm_regmap_init_i2c(i2c, &ts3a227e_regmap_config);
         if (IS_ERR(ts3a227e->regmap))
@@ -320,6 +336,32 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int ts3a227e_suspend(struct device *dev)
+{
+        struct ts3a227e *ts3a227e = dev_get_drvdata(dev);
+
+        dev_dbg(ts3a227e->dev, "suspend disable irq\n");
+        disable_irq(ts3a227e->irq);
+
+        return 0;
+}
+
+static int ts3a227e_resume(struct device *dev)
+{
+        struct ts3a227e *ts3a227e = dev_get_drvdata(dev);
+
+        dev_dbg(ts3a227e->dev, "resume enable irq\n");
+        enable_irq(ts3a227e->irq);
+
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops ts3a227e_pm = {
+        SET_SYSTEM_SLEEP_PM_OPS(ts3a227e_suspend, ts3a227e_resume)
+};
+
 static const struct i2c_device_id ts3a227e_i2c_ids[] = {
         { "ts3a227e", 0 },
         { }
@@ -335,7 +377,7 @@ MODULE_DEVICE_TABLE(of, ts3a227e_of_match);
 static struct i2c_driver ts3a227e_driver = {
         .driver = {
                 .name = "ts3a227e",
-                .owner = THIS_MODULE,
+                .pm = &ts3a227e_pm,
                 .of_match_table = of_match_ptr(ts3a227e_of_match),
         },
         .probe = ts3a227e_i2c_probe,
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 6e159f59d219..5cafb16ccf1a 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -810,7 +810,6 @@ MODULE_DEVICE_TABLE(i2c, uda1380_i2c_id);
 static struct i2c_driver uda1380_i2c_driver = {
         .driver = {
                 .name =  "uda1380-codec",
-                .owner = THIS_MODULE,
         },
         .probe =    uda1380_i2c_probe,
         .remove =   uda1380_i2c_remove,
diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c
index 048f00568260..ec45c5b220b1 100644
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
@@ -251,7 +251,6 @@ MODULE_DEVICE_TABLE(i2c, wm1250_ev1_i2c_id);
 static struct i2c_driver wm1250_ev1_i2c_driver = {
         .driver = {
                 .name = "wm1250-ev1",
-                .owner = THIS_MODULE,
         },
         .probe =    wm1250_ev1_probe,
         .remove =   wm1250_ev1_remove,
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 21d5402e343f..786abd02b140 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -942,7 +942,6 @@ MODULE_DEVICE_TABLE(i2c, wm2000_i2c_id);
 static struct i2c_driver wm2000_i2c_driver = {
         .driver = {
                 .name = "wm2000",
-                .owner = THIS_MODULE,
         },
         .probe = wm2000_i2c_probe,
         .remove = wm2000_i2c_remove,
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index c83083285e53..d4fa224d68b1 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -2495,7 +2495,6 @@ MODULE_DEVICE_TABLE(i2c, wm2200_i2c_id);
 static struct i2c_driver wm2200_i2c_driver = {
         .driver = {
                 .name = "wm2200",
-                .owner = THIS_MODULE,
                 .pm = &wm2200_pm,
         },
         .probe =    wm2200_i2c_probe,
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 4c10cd88c1af..b9594d6feb71 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2722,7 +2722,6 @@ MODULE_DEVICE_TABLE(i2c, wm5100_i2c_id);
 static struct i2c_driver wm5100_i2c_driver = {
         .driver = {
                 .name = "wm5100",
-                .owner = THIS_MODULE,
                 .pm = &wm5100_pm,
         },
         .probe =    wm5100_i2c_probe,
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index dac5beb4d023..3cff5a699e57 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -690,7 +690,6 @@ MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);
 static struct i2c_driver wm8510_i2c_driver = {
         .driver = {
                 .name = "wm8510",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8510_of_match,
         },
         .probe =    wm8510_i2c_probe,
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 43ea8ae5f871..5f8fde56e68b 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -534,7 +534,6 @@ MODULE_DEVICE_TABLE(i2c, wm8523_i2c_id);
 static struct i2c_driver wm8523_i2c_driver = {
         .driver = {
                 .name = "wm8523",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8523_of_match,
         },
         .probe =    wm8523_i2c_probe,
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 759a7928ac3e..abf60355f7f7 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -978,7 +978,6 @@ MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id);
 static struct i2c_driver wm8580_i2c_driver = {
         .driver = {
                 .name = "wm8580",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8580_of_match,
         },
         .probe =    wm8580_i2c_probe,
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index cc8251f09f8a..44b9e0ae7451 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -478,7 +478,6 @@ MODULE_DEVICE_TABLE(i2c, wm8711_i2c_id);
 static struct i2c_driver wm8711_i2c_driver = {
         .driver = {
                 .name = "wm8711",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8711_of_match,
         },
         .probe =    wm8711_i2c_probe,
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index f1a173e6ec33..cd7b02413ccf 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -319,7 +319,6 @@ MODULE_DEVICE_TABLE(i2c, wm8728_i2c_id);
 static struct i2c_driver wm8728_i2c_driver = {
         .driver = {
                 .name = "wm8728",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8728_of_match,
         },
         .probe =    wm8728_i2c_probe,
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 915ea11ad4b6..4846842522f3 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -789,7 +789,6 @@ MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
 static struct i2c_driver wm8731_i2c_driver = {
         .driver = {
                 .name = "wm8731",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8731_of_match,
         },
         .probe =    wm8731_i2c_probe,
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index 6ad606fd8b69..b54a7b78f562 100644
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -657,7 +657,6 @@ MODULE_DEVICE_TABLE(i2c, wm8737_i2c_id);
 static struct i2c_driver wm8737_i2c_driver = {
         .driver = {
                 .name = "wm8737",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8737_of_match,
         },
         .probe =    wm8737_i2c_probe,
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index b34623786e35..430fa7ded713 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -633,7 +633,6 @@ MODULE_DEVICE_TABLE(i2c, wm8741_i2c_id);
 static struct i2c_driver wm8741_i2c_driver = {
         .driver = {
                 .name = "wm8741",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8741_of_match,
         },
         .probe =    wm8741_i2c_probe,
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 56d89b0865fa..873933a7966f 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -826,7 +826,6 @@ MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id);
 static struct i2c_driver wm8750_i2c_driver = {
         .driver = {
                 .name = "wm8750",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8750_of_match,
         },
         .probe =    wm8750_i2c_probe,
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index feb2997a377a..b5e50ffbf99f 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1609,7 +1609,6 @@ MODULE_DEVICE_TABLE(i2c, wm8753_i2c_id);
 static struct i2c_driver wm8753_i2c_driver = {
         .driver = {
                 .name = "wm8753",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8753_of_match,
         },
         .probe =    wm8753_i2c_probe,
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index ece9b4456767..592866dd60c7 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -536,7 +536,6 @@ MODULE_DEVICE_TABLE(i2c, wm8776_i2c_id);
 static struct i2c_driver wm8776_i2c_driver = {
         .driver = {
                 .name = "wm8776",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8776_of_match,
         },
         .probe =    wm8776_i2c_probe,
diff --git a/sound/soc/codecs/wm8804-i2c.c b/sound/soc/codecs/wm8804-i2c.c
index 6596f5f3a0c3..f27464c2c5ba 100644
--- a/sound/soc/codecs/wm8804-i2c.c
+++ b/sound/soc/codecs/wm8804-i2c.c
@@ -49,7 +49,6 @@ MODULE_DEVICE_TABLE(of, wm8804_of_match);
 static struct i2c_driver wm8804_i2c_driver = {
         .driver = {
                 .name = "wm8804",
-                .owner = THIS_MODULE,
                 .pm = &wm8804_pm,
                 .of_match_table = wm8804_of_match,
         },
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index f3759ec5a863..98900aa66dc3 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1312,7 +1312,6 @@ MODULE_DEVICE_TABLE(i2c, wm8900_i2c_id);
 static struct i2c_driver wm8900_i2c_driver = {
         .driver = {
                 .name = "wm8900",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8900_i2c_probe,
         .remove =   wm8900_i2c_remove,
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index b5322c1544fb..b011253459af 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2193,7 +2193,6 @@ MODULE_DEVICE_TABLE(i2c, wm8903_i2c_id);
 static struct i2c_driver wm8903_i2c_driver = {
         .driver = {
                 .name = "wm8903",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8903_of_match,
         },
         .probe =    wm8903_i2c_probe,
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 265a4a58a2d1..145f5f9d581b 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2292,7 +2292,6 @@ MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);
 static struct i2c_driver wm8904_i2c_driver = {
         .driver = {
                 .name = "wm8904",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(wm8904_of_match),
         },
         .probe =    wm8904_i2c_probe,
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 98ef0ba5c2a4..f6f9395ea38e 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -787,7 +787,6 @@ MODULE_DEVICE_TABLE(i2c, wm8940_i2c_id);
 static struct i2c_driver wm8940_i2c_driver = {
         .driver = {
                 .name = "wm8940",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8940_i2c_probe,
         .remove =   wm8940_i2c_remove,
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 2d591c24704b..12e4435f00f8 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -1009,7 +1009,6 @@ MODULE_DEVICE_TABLE(i2c, wm8955_i2c_id);
 static struct i2c_driver wm8955_i2c_driver = {
         .driver = {
                 .name = "wm8955",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8955_i2c_probe,
         .remove =   wm8955_i2c_remove,
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 94c5c4681ce5..1ed0720b41f0 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -1216,7 +1216,6 @@ MODULE_DEVICE_TABLE(of, wm8960_of_match);
 static struct i2c_driver wm8960_i2c_driver = {
         .driver = {
                 .name = "wm8960",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8960_of_match,
         },
         .probe =    wm8960_i2c_probe,
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index a057662632ff..20a010344fd5 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -982,7 +982,6 @@ MODULE_DEVICE_TABLE(i2c, wm8961_i2c_id);
 static struct i2c_driver wm8961_i2c_driver = {
         .driver = {
                 .name = "wm8961",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8961_i2c_probe,
         .remove =   wm8961_i2c_remove,
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index c5748fd4f296..40c4617e3ef1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3878,7 +3878,6 @@ MODULE_DEVICE_TABLE(of, wm8962_of_match);
 static struct i2c_driver wm8962_i2c_driver = {
         .driver = {
                 .name = "wm8962",
-                .owner = THIS_MODULE,
                 .of_match_table = wm8962_of_match,
                 .pm = &wm8962_pm,
         },
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index b51184c4e816..2cdde32c43c6 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -710,7 +710,6 @@ MODULE_DEVICE_TABLE(i2c, wm8971_i2c_id);
 static struct i2c_driver wm8971_i2c_driver = {
         .driver = {
                 .name = "wm8971",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8971_i2c_probe,
         .remove =   wm8971_i2c_remove,
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 33b16a7ba82e..0a60677397b3 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -634,7 +634,6 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id);
 static struct i2c_driver wm8974_i2c_driver = {
         .driver = {
                 .name = "wm8974",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8974_i2c_probe,
         .remove =   wm8974_i2c_remove,
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index cfc8cdf49970..d36d6001fbb7 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -1072,7 +1072,6 @@ MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
 static struct i2c_driver wm8978_i2c_driver = {
         .driver = {
                 .name = "wm8978",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8978_i2c_probe,
         .remove =   wm8978_i2c_remove,
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 2fdd2c6cc09d..f6861cc4c321 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1133,7 +1133,6 @@ MODULE_DEVICE_TABLE(i2c, wm8983_i2c_id);
 static struct i2c_driver wm8983_i2c_driver = {
         .driver = {
                 .name = "wm8983",
-                .owner = THIS_MODULE,
         },
         .probe = wm8983_i2c_probe,
         .remove = wm8983_i2c_remove,
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 8a85f5004d41..9c3c1517a4f3 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -1144,7 +1144,6 @@ MODULE_DEVICE_TABLE(i2c, wm8985_i2c_id);
 static struct i2c_driver wm8985_i2c_driver = {
         .driver = {
                 .name = "wm8985",
-                .owner = THIS_MODULE,
         },
         .probe = wm8985_i2c_probe,
         .remove = wm8985_i2c_remove,
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index f13a995af277..c88ce99ce9e1 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -919,7 +919,6 @@ MODULE_DEVICE_TABLE(i2c, wm8988_i2c_id);
 static struct i2c_driver wm8988_i2c_driver = {
         .driver = {
                 .name = "wm8988",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8988_i2c_probe,
         .remove =   wm8988_i2c_remove,
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 1993fd2a6f15..83d72d8bc51b 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1356,7 +1356,6 @@ MODULE_DEVICE_TABLE(i2c, wm8990_i2c_id);
 static struct i2c_driver wm8990_i2c_driver = {
         .driver = {
                 .name = "wm8990",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8990_i2c_probe,
         .remove =   wm8990_i2c_remove,
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 44a677720828..709d16e338d9 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -1363,7 +1363,6 @@ MODULE_DEVICE_TABLE(i2c, wm8991_i2c_id);
 static struct i2c_driver wm8991_i2c_driver = {
         .driver = {
                 .name = "wm8991",
-                .owner = THIS_MODULE,
         },
         .probe = wm8991_i2c_probe,
         .remove = wm8991_i2c_remove,
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 8a8db8605dc2..3f4dfb95d2d7 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1742,7 +1742,6 @@ MODULE_DEVICE_TABLE(i2c, wm8993_i2c_id);
 static struct i2c_driver wm8993_i2c_driver = {
         .driver = {
                 .name = "wm8993",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8993_i2c_probe,
         .remove =   wm8993_i2c_remove,
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 505b65f5734f..eda52a96c1fa 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2298,7 +2298,6 @@ MODULE_DEVICE_TABLE(i2c, wm8995_i2c_id);
 static struct i2c_driver wm8995_i2c_driver = {
         .driver = {
                 .name = "wm8995",
-                .owner = THIS_MODULE,
         },
         .probe = wm8995_i2c_probe,
         .remove = wm8995_i2c_remove,
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 3dd063f682b2..29b6688fb6ee 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -3100,7 +3100,6 @@ MODULE_DEVICE_TABLE(i2c, wm8996_i2c_id);
 static struct i2c_driver wm8996_i2c_driver = {
         .driver = {
                 .name = "wm8996",
-                .owner = THIS_MODULE,
         },
         .probe =    wm8996_i2c_probe,
         .remove =   wm8996_i2c_remove,
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 8a8b1c0f9142..011516eec4b5 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1378,7 +1378,6 @@ MODULE_DEVICE_TABLE(i2c, wm9081_i2c_id);
 static struct i2c_driver wm9081_i2c_driver = {
         .driver = {
                 .name = "wm9081",
-                .owner = THIS_MODULE,
         },
         .probe =    wm9081_i2c_probe,
         .remove =   wm9081_i2c_remove,
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index 13d23fc797db..12baf725d4a5 100644
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -636,7 +636,6 @@ MODULE_DEVICE_TABLE(i2c, wm9090_id);
 static struct i2c_driver wm9090_i2c_driver = {
         .driver = {
                 .name = "wm9090",
-                .owner = THIS_MODULE,
         },
         .probe = wm9090_i2c_probe,
         .remove = wm9090_i2c_remove,