Merge tag 'asoc-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Final updates for v3.16 A few more updates from the last week of development, nothing too exciting. Highlights include: - GPIO descriptor support for jacks - More updates and fixes to the Freescale SSI, Intel and rsnd drivers. - New drivers for Analog Devices ADAU1361, ADAU1381, ADAU1761 and ADAU1781, and Realtek RT5677.
author: Takashi Iwai <tiwai@suse.de> 2014-06-03 05:51:14 -0400
committer: Takashi Iwai <tiwai@suse.de> 2014-06-03 05:51:14 -0400
commit: 8743dcd6639c28204ac03fb3e9db7932e3d85418 (patch)
tree: 53b80846cf6731ddb196d522ed2bbf0f76da8344
parent: efd4b76ef789541e7046e873b3546209352cdb59 (diff)
parent: e1d4d3c854f25cff6c6c139588570e124d5e8fa4 (diff)
94 files changed, 9610 insertions, 904 deletions
diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt
index e4c8b36dcf89..a5e63fa47dc5 100644
--- a/Documentation/devicetree/bindings/sound/max98090.txt
+++ b/Documentation/devicetree/bindings/sound/max98090.txt
@@ -10,6 +10,12 @@ Required properties:
 - interrupts : The CODEC's interrupt output.
+Optional properties:
+- clocks: The phandle of the master clock to the CODEC
+- clock-names: Should be "mclk"
 Pins on the device (for linking into audio routes):
  * MIC1
diff --git a/Documentation/devicetree/bindings/sound/max98095.txt b/Documentation/devicetree/bindings/sound/max98095.txt
index bacbeaac72b5..318a4c82f17f 100644
--- a/Documentation/devicetree/bindings/sound/max98095.txt
+++ b/Documentation/devicetree/bindings/sound/max98095.txt
@@ -8,6 +8,12 @@ Required properties:
 - reg : The I2C address of the device.
+Optional properties:
+- clocks: The phandle of the master clock to the CODEC
+- clock-names: Should be "mclk"
 Example:
 max98095: codec@11 {
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index a44e9179faf5..8346cab046cd 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -20,6 +20,7 @@ Required properties:
 SSI subnode properties:
 - interrupts                    : Should contain SSI interrupt for PIO transfer
 - shared-pin                    : if shared clock pin
+- pio-transfer                  : use PIO transfer mode
 SRC subnode properties:
 no properties at this point
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 9b9df146fd1a..c2e9841dfce4 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -15,6 +15,9 @@ Optional properties:
                                          Each entry is a pair of strings, the first being the
                                          connection's sink, the second being the connection's
                                          source.
+- simple-audio-card,mclk-fs             : Multiplication factor between stream rate and codec
+                                          mclk.
 Optional subnodes:
 - simple-audio-card,dai-link            : Container for dai-link level
diff --git a/include/linux/platform_data/adau17x1.h b/include/linux/platform_data/adau17x1.h
new file mode 100644
index 000000000000..a81766cae230
--- /dev/null
+++ b/include/linux/platform_data/adau17x1.h
@@ -0,0 +1,109 @@
+/*
+ * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961/ADAU1781/ADAU1781 codecs
+ *
+ * Copyright 2011-2014 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef __LINUX_PLATFORM_DATA_ADAU17X1_H__
+#define __LINUX_PLATFORM_DATA_ADAU17X1_H__
+/**
+ * enum adau17x1_micbias_voltage - Microphone bias voltage
+ * @ADAU17X1_MICBIAS_0_90_AVDD: 0.9 * AVDD
+ * @ADAU17X1_MICBIAS_0_65_AVDD: 0.65 * AVDD
+ */
+enum adau17x1_micbias_voltage {
+        ADAU17X1_MICBIAS_0_90_AVDD = 0,
+        ADAU17X1_MICBIAS_0_65_AVDD = 1,
+};
+/**
+ * enum adau1761_digmic_jackdet_pin_mode - Configuration of the JACKDET/MICIN pin
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: Disable the pin
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC: Configure the pin for usage as
+ *   digital microphone input.
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT: Configure the pin for jack
+ *  insertion detection.
+ */
+enum adau1761_digmic_jackdet_pin_mode {
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE,
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC,
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT,
+};
+/**
+ * adau1761_jackdetect_debounce_time - Jack insertion detection debounce time
+ * @ADAU1761_JACKDETECT_DEBOUNCE_5MS: 5 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_10MS: 10 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_20MS: 20 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_40MS: 40 milliseconds
+ */
+enum adau1761_jackdetect_debounce_time {
+        ADAU1761_JACKDETECT_DEBOUNCE_5MS = 0,
+        ADAU1761_JACKDETECT_DEBOUNCE_10MS = 1,
+        ADAU1761_JACKDETECT_DEBOUNCE_20MS = 2,
+        ADAU1761_JACKDETECT_DEBOUNCE_40MS = 3,
+};
+/**
+ * enum adau1761_output_mode - Output mode configuration
+ * @ADAU1761_OUTPUT_MODE_HEADPHONE: Headphone output
+ * @ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS: Capless headphone output
+ * @ADAU1761_OUTPUT_MODE_LINE: Line output
+ */
+enum adau1761_output_mode {
+        ADAU1761_OUTPUT_MODE_HEADPHONE,
+        ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS,
+        ADAU1761_OUTPUT_MODE_LINE,
+};
+/**
+ * struct adau1761_platform_data - ADAU1761 Codec driver platform data
+ * @input_differential: If true the input pins will be configured in
+ *  differential mode.
+ * @lineout_mode: Output mode for the LOUT/ROUT pins
+ * @headphone_mode: Output mode for the LHP/RHP pins
+ * @digmic_jackdetect_pin_mode: JACKDET/MICIN pin configuration
+ * @jackdetect_debounce_time: Jack insertion detection debounce time.
+ *  Note: This value will only be used, if the JACKDET/MICIN pin is configured
+ *  for jack insertion detection.
+ * @jackdetect_active_low: If true the jack insertion detection is active low.
+ *  Othwise it will be active high.
+ * @micbias_voltage: Microphone voltage bias
+ */
+struct adau1761_platform_data {
+        bool input_differential;
+        enum adau1761_output_mode lineout_mode;
+        enum adau1761_output_mode headphone_mode;
+        enum adau1761_digmic_jackdet_pin_mode digmic_jackdetect_pin_mode;
+        enum adau1761_jackdetect_debounce_time jackdetect_debounce_time;
+        bool jackdetect_active_low;
+        enum adau17x1_micbias_voltage micbias_voltage;
+};
+/**
+ * struct adau1781_platform_data - ADAU1781 Codec driver platform data
+ * @left_input_differential: If true configure the left input as
+ * differential input.
+ * @right_input_differential: If true configure the right input as differntial
+ *  input.
+ * @use_dmic: If true configure the MIC pins as digital microphone pins instead
+ *  of analog microphone pins.
+ * @micbias_voltage: Microphone voltage bias
+ */
+struct adau1781_platform_data {
+        bool left_input_differential;
+        bool right_input_differential;
+        bool use_dmic;
+        enum adau17x1_micbias_voltage micbias_voltage;
+};
+#endif
diff --git a/sound/soc/omap/omap-pcm.h b/include/sound/omap-pcm.h
index c1d2f31d71e9..c1d2f31d71e9 100644
--- a/sound/soc/omap/omap-pcm.h
+++ b/include/sound/omap-pcm.h
diff --git a/include/sound/rt5677.h b/include/sound/rt5677.h
new file mode 100644
index 000000000000..3da14313bcfc
--- /dev/null
+++ b/include/sound/rt5677.h
@@ -0,0 +1,21 @@
+/*
+ * linux/sound/rt5677.h -- Platform data for RT5677
+ *
+ * Copyright 2013 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@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 __LINUX_SND_RT5677_H
+#define __LINUX_SND_RT5677_H
+struct rt5677_platform_data {
+        /* IN1 IN2 can optionally be differential */
+        bool in1_diff;
+        bool in2_diff;
+};
+#endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index dcdcc95efd1d..ed9e2d7e5fdc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -452,6 +452,9 @@ int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage);
 #ifdef CONFIG_GPIOLIB
 int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                        struct snd_soc_jack_gpio *gpios);
+int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
+                            struct snd_soc_jack *jack,
+                            int count, struct snd_soc_jack_gpio *gpios);
 void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
                        struct snd_soc_jack_gpio *gpios);
 #else
@@ -461,6 +464,14 @@ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
        return 0;
 }
+static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
+                                          struct snd_soc_jack *jack,
+                                          int count,
+                                          struct snd_soc_jack_gpio *gpios)
+{
+        return 0;
+}
 static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
                                           struct snd_soc_jack_gpio *gpios)
 {
@@ -587,8 +598,12 @@ struct snd_soc_jack_zone {
 /**
 * struct snd_soc_jack_gpio - Describes a gpio pin for jack detection
 *
- * @gpio:         gpio number
+ * @gpio:         legacy gpio number
- * @name:         gpio name
+ * @idx:          gpio descriptor index within the function of the GPIO
+ *                consumer device
+ * @gpiod_dev     GPIO consumer device
+ * @name:         gpio name. Also as connection ID for the GPIO consumer
+ *                device function name lookup
 * @report:       value to report when jack detected
 * @invert:       report presence in low state
 * @debouce_time: debouce time in ms
@@ -599,6 +614,8 @@ struct snd_soc_jack_zone {
 */
 struct snd_soc_jack_gpio {
        unsigned int gpio;
+        unsigned int idx;
+        struct device *gpiod_dev;
        const char *name;
        int report;
        int invert;
@@ -607,6 +624,7 @@ struct snd_soc_jack_gpio {
        struct snd_soc_jack *jack;
        struct delayed_work work;
+        struct gpio_desc *desc;
        void *data;
        int (*jack_status_check)(void *data);
@@ -1146,6 +1164,33 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform(
        return container_of(component, struct snd_soc_platform, component);
 }
+/**
+ * snd_soc_dapm_to_codec() - Casts a DAPM context to the CODEC it is embedded in
+ * @dapm: The DAPM context to cast to the CODEC
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
+        struct snd_soc_dapm_context *dapm)
+{
+        return container_of(dapm, struct snd_soc_codec, dapm);
+}
+/**
+ * snd_soc_dapm_to_platform() - Casts a DAPM context to the platform it is
+ *  embedded in
+ * @dapm: The DAPM context to cast to the platform.
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a platform (e.g. in a platform driver). Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
+        struct snd_soc_dapm_context *dapm)
+{
+        return container_of(dapm, struct snd_soc_platform, dapm);
+}
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
 int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
index 6347d5910138..6410aa2cc2cf 100644
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@ -43,6 +43,32 @@ config SND_SOC_BFIN_EVAL_ADAU1373
          Note: This driver assumes that first ADAU1373 DAI is connected to the
          first SPORT port on the BF5XX board.
+config SND_SOC_BFIN_EVAL_ADAU1X61
+        tristate "Support for the EVAL-ADAU1X61 board on Blackfin eval boards"
+        depends on SND_BF5XX_I2S && I2C
+        select SND_BF5XX_SOC_I2S
+        select SND_SOC_ADAU1761_I2C
+        help
+          Say Y if you want to add support for the Analog Devices EVAL-ADAU1X61
+          board connected to one of the Blackfin evaluation boards like the
+          BF5XX-STAMP or BF5XX-EZKIT.
+          Note: This driver assumes that the ADAU1X61 is connected to the
+          first SPORT port on the BF5XX board.
+config SND_SOC_BFIN_EVAL_ADAU1X81
+        tristate "Support for the EVAL-ADAU1X81 boards on Blackfin eval boards"
+        depends on SND_BF5XX_I2S && I2C
+        select SND_BF5XX_SOC_I2S
+        select SND_SOC_ADAU1781_I2C
+        help
+          Say Y if you want to add support for the Analog Devices EVAL-ADAU1X81
+          board connected to one of the Blackfin evaluation boards like the
+          BF5XX-STAMP or BF5XX-EZKIT.
+          Note: This driver assumes that the ADAU1X81 is connected to the
+          first SPORT port on the BF5XX board.
 config SND_SOC_BFIN_EVAL_ADAV80X
        tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards"
        depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI
diff --git a/sound/soc/blackfin/Makefile b/sound/soc/blackfin/Makefile
index ad0a6e99bc5d..f21e948b2e9b 100644
--- a/sound/soc/blackfin/Makefile
+++ b/sound/soc/blackfin/Makefile
@@ -22,6 +22,8 @@ snd-ssm2602-objs := bf5xx-ssm2602.o
 snd-ad73311-objs := bf5xx-ad73311.o
 snd-ad193x-objs := bf5xx-ad193x.o
 snd-soc-bfin-eval-adau1373-objs := bfin-eval-adau1373.o
+snd-soc-bfin-eval-adau1x61-objs := bfin-eval-adau1x61.o
+snd-soc-bfin-eval-adau1x81-objs := bfin-eval-adau1x81.o
 snd-soc-bfin-eval-adau1701-objs := bfin-eval-adau1701.o
 snd-soc-bfin-eval-adav80x-objs := bfin-eval-adav80x.o
@@ -31,5 +33,7 @@ obj-$(CONFIG_SND_BF5XX_SOC_SSM2602) += snd-ssm2602.o
 obj-$(CONFIG_SND_BF5XX_SOC_AD73311) += snd-ad73311.o
 obj-$(CONFIG_SND_BF5XX_SOC_AD193X) += snd-ad193x.o
 obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373) += snd-soc-bfin-eval-adau1373.o
+obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61) += snd-soc-bfin-eval-adau1x61.o
+obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X81) += snd-soc-bfin-eval-adau1x81.o
 obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) += snd-soc-bfin-eval-adau1701.o
 obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) += snd-soc-bfin-eval-adav80x.o
diff --git a/sound/soc/blackfin/bfin-eval-adau1x61.c b/sound/soc/blackfin/bfin-eval-adau1x61.c
new file mode 100644
index 000000000000..3011906f9d3b
--- /dev/null
+++ b/sound/soc/blackfin/bfin-eval-adau1x61.c
@@ -0,0 +1,142 @@
+/*
+ * Machine driver for EVAL-ADAU1x61MINIZ on Analog Devices bfin
+ * evaluation boards.
+ *
+ * Copyright 2011-2014 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include "../codecs/adau17x1.h"
+static const struct snd_soc_dapm_widget bfin_eval_adau1x61_dapm_widgets[] = {
+        SND_SOC_DAPM_LINE("In 1", NULL),
+        SND_SOC_DAPM_LINE("In 2", NULL),
+        SND_SOC_DAPM_LINE("In 3-4", NULL),
+        SND_SOC_DAPM_LINE("Diff Out L", NULL),
+        SND_SOC_DAPM_LINE("Diff Out R", NULL),
+        SND_SOC_DAPM_LINE("Stereo Out", NULL),
+        SND_SOC_DAPM_HP("Capless HP Out", NULL),
+};
+static const struct snd_soc_dapm_route bfin_eval_adau1x61_dapm_routes[] = {
+        { "LAUX", NULL, "In 3-4" },
+        { "RAUX", NULL, "In 3-4" },
+        { "LINP", NULL, "In 1" },
+        { "LINN", NULL, "In 1"},
+        { "RINP", NULL, "In 2" },
+        { "RINN", NULL, "In 2" },
+        { "In 1", NULL, "MICBIAS" },
+        { "In 2", NULL, "MICBIAS" },
+        { "Capless HP Out", NULL, "LHP" },
+        { "Capless HP Out", NULL, "RHP" },
+        { "Diff Out L", NULL, "LOUT" },
+        { "Diff Out R", NULL, "ROUT" },
+        { "Stereo Out", NULL, "LOUT" },
+        { "Stereo Out", NULL, "ROUT" },
+};
+static int bfin_eval_adau1x61_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int pll_rate;
+        int ret;
+        switch (params_rate(params)) {
+        case 48000:
+        case 8000:
+        case 12000:
+        case 16000:
+        case 24000:
+        case 32000:
+        case 96000:
+                pll_rate = 48000 * 1024;
+                break;
+        case 44100:
+        case 7350:
+        case 11025:
+        case 14700:
+        case 22050:
+        case 29400:
+        case 88200:
+                pll_rate = 44100 * 1024;
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = snd_soc_dai_set_pll(codec_dai, ADAU17X1_PLL,
+                        ADAU17X1_PLL_SRC_MCLK, 12288000, pll_rate);
+        if (ret)
+                return ret;
+        ret = snd_soc_dai_set_sysclk(codec_dai, ADAU17X1_CLK_SRC_PLL, pll_rate,
+                        SND_SOC_CLOCK_IN);
+        return ret;
+}
+static const struct snd_soc_ops bfin_eval_adau1x61_ops = {
+        .hw_params = bfin_eval_adau1x61_hw_params,
+};
+static struct snd_soc_dai_link bfin_eval_adau1x61_dai = {
+        .name = "adau1x61",
+        .stream_name = "adau1x61",
+        .cpu_dai_name = "bfin-i2s.0",
+        .codec_dai_name = "adau-hifi",
+        .platform_name = "bfin-i2s-pcm-audio",
+        .codec_name = "adau1761.0-0038",
+        .ops = &bfin_eval_adau1x61_ops,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                SND_SOC_DAIFMT_CBM_CFM,
+};
+static struct snd_soc_card bfin_eval_adau1x61 = {
+        .name = "bfin-eval-adau1x61",
+        .driver_name = "eval-adau1x61",
+        .dai_link = &bfin_eval_adau1x61_dai,
+        .num_links = 1,
+        .dapm_widgets = bfin_eval_adau1x61_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(bfin_eval_adau1x61_dapm_widgets),
+        .dapm_routes = bfin_eval_adau1x61_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(bfin_eval_adau1x61_dapm_routes),
+        .fully_routed = true,
+};
+static int bfin_eval_adau1x61_probe(struct platform_device *pdev)
+{
+        bfin_eval_adau1x61.dev = &pdev->dev;
+        return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1x61);
+}
+static struct platform_driver bfin_eval_adau1x61_driver = {
+        .driver = {
+                .name = "bfin-eval-adau1x61",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bfin_eval_adau1x61_probe,
+};
+module_platform_driver(bfin_eval_adau1x61_driver);
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("ALSA SoC bfin adau1x61 driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bfin-eval-adau1x61");
diff --git a/sound/soc/blackfin/bfin-eval-adau1x81.c b/sound/soc/blackfin/bfin-eval-adau1x81.c
new file mode 100644
index 000000000000..5c380f6aed1a
--- /dev/null
+++ b/sound/soc/blackfin/bfin-eval-adau1x81.c
@@ -0,0 +1,130 @@
+/*
+ * Machine driver for EVAL-ADAU1x81 on Analog Devices bfin
+ * evaluation boards.
+ *
+ * Copyright 2011-2014 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include "../codecs/adau17x1.h"
+static const struct snd_soc_dapm_widget bfin_eval_adau1x81_dapm_widgets[] = {
+        SND_SOC_DAPM_LINE("Stereo In", NULL),
+        SND_SOC_DAPM_LINE("Beep", NULL),
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_HP("Headphone", NULL),
+};
+static const struct snd_soc_dapm_route bfin_eval_adau1x81_dapm_routes[] = {
+        { "BEEP", NULL, "Beep" },
+        { "LMIC", NULL, "Stereo In" },
+        { "LMIC", NULL, "Stereo In" },
+        { "Headphone", NULL, "AOUTL" },
+        { "Headphone", NULL, "AOUTR" },
+        { "Speaker", NULL, "SP" },
+};
+static int bfin_eval_adau1x81_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int pll_rate;
+        int ret;
+        switch (params_rate(params)) {
+        case 48000:
+        case 8000:
+        case 12000:
+        case 16000:
+        case 24000:
+        case 32000:
+        case 96000:
+                pll_rate = 48000 * 1024;
+                break;
+        case 44100:
+        case 7350:
+        case 11025:
+        case 14700:
+        case 22050:
+        case 29400:
+        case 88200:
+                pll_rate = 44100 * 1024;
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = snd_soc_dai_set_pll(codec_dai, ADAU17X1_PLL,
+                        ADAU17X1_PLL_SRC_MCLK, 12288000, pll_rate);
+        if (ret)
+                return ret;
+        ret = snd_soc_dai_set_sysclk(codec_dai, ADAU17X1_CLK_SRC_PLL, pll_rate,
+                        SND_SOC_CLOCK_IN);
+        return ret;
+}
+static const struct snd_soc_ops bfin_eval_adau1x81_ops = {
+        .hw_params = bfin_eval_adau1x81_hw_params,
+};
+static struct snd_soc_dai_link bfin_eval_adau1x81_dai = {
+        .name = "adau1x81",
+        .stream_name = "adau1x81",
+        .cpu_dai_name = "bfin-i2s.0",
+        .codec_dai_name = "adau-hifi",
+        .platform_name = "bfin-i2s-pcm-audio",
+        .codec_name = "adau1781.0-0038",
+        .ops = &bfin_eval_adau1x81_ops,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                SND_SOC_DAIFMT_CBM_CFM,
+};
+static struct snd_soc_card bfin_eval_adau1x81 = {
+        .name = "bfin-eval-adau1x81",
+        .driver_name = "eval-adau1x81",
+        .dai_link = &bfin_eval_adau1x81_dai,
+        .num_links = 1,
+        .dapm_widgets = bfin_eval_adau1x81_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(bfin_eval_adau1x81_dapm_widgets),
+        .dapm_routes = bfin_eval_adau1x81_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(bfin_eval_adau1x81_dapm_routes),
+        .fully_routed = true,
+};
+static int bfin_eval_adau1x81_probe(struct platform_device *pdev)
+{
+        bfin_eval_adau1x81.dev = &pdev->dev;
+        return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1x81);
+}
+static struct platform_driver bfin_eval_adau1x81_driver = {
+        .driver = {
+                .name = "bfin-eval-adau1x81",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bfin_eval_adau1x81_probe,
+};
+module_platform_driver(bfin_eval_adau1x81_driver);
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("ALSA SoC bfin adau1x81 driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bfin-eval-adau1x81");
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c59943a19f94..cbfa1e18f651 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -23,6 +23,10 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AD1980 if SND_SOC_AC97_BUS
        select SND_SOC_AD73311
        select SND_SOC_ADAU1373 if I2C
+        select SND_SOC_ADAU1761_I2C if I2C
+        select SND_SOC_ADAU1761_SPI if SPI
+        select SND_SOC_ADAU1781_I2C if I2C
+        select SND_SOC_ADAU1781_SPI if SPI
        select SND_SOC_ADAV801 if SPI_MASTER
        select SND_SOC_ADAV803 if I2C
        select SND_SOC_ADAU1977_SPI if SPI_MASTER
@@ -74,6 +78,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_RT5640 if I2C
        select SND_SOC_RT5645 if I2C
        select SND_SOC_RT5651 if I2C
+        select SND_SOC_RT5677 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SIRF_AUDIO_CODEC
@@ -214,14 +219,46 @@ config SND_SOC_AD1980
 config SND_SOC_AD73311
        tristate
+config SND_SOC_ADAU1373
+        tristate
 config SND_SOC_ADAU1701
        tristate "Analog Devices ADAU1701 CODEC"
        depends on I2C
        select SND_SOC_SIGMADSP
-config SND_SOC_ADAU1373
+config SND_SOC_ADAU17X1
+        tristate
+        select SND_SOC_SIGMADSP
+config SND_SOC_ADAU1761
+        tristate
+        select SND_SOC_ADAU17X1
+config SND_SOC_ADAU1761_I2C
+        tristate
+        select SND_SOC_ADAU1761
+        select REGMAP_I2C
+config SND_SOC_ADAU1761_SPI
+        tristate
+        select SND_SOC_ADAU1761
+        select REGMAP_SPI
+config SND_SOC_ADAU1781
+        select SND_SOC_ADAU17X1
        tristate
+config SND_SOC_ADAU1781_I2C
+        tristate
+        select SND_SOC_ADAU1781
+        select REGMAP_I2C
+config SND_SOC_ADAU1781_SPI
+        tristate
+        select SND_SOC_ADAU1781
+        select REGMAP_SPI
 config SND_SOC_ADAU1977
        tristate
@@ -274,6 +311,7 @@ config SND_SOC_AK5386
 config SND_SOC_ALC5623
       tristate "Realtek ALC5623 CODEC"
+        depends on I2C
 config SND_SOC_ALC5632
        tristate
@@ -402,6 +440,15 @@ config SND_SOC_PCM512x_SPI
        select SND_SOC_PCM512x
        select REGMAP_SPI
+config SND_SOC_RL6231
+        tristate
+        default y if SND_SOC_RT5640=y
+        default y if SND_SOC_RT5645=y
+        default y if SND_SOC_RT5651=y
+        default m if SND_SOC_RT5640=m
+        default m if SND_SOC_RT5645=m
+        default m if SND_SOC_RT5651=m
 config SND_SOC_RT5631
        tristate
@@ -414,6 +461,9 @@ config SND_SOC_RT5645
 config SND_SOC_RT5651
        tristate
+config SND_SOC_RT5677
+        tristate
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
        tristate "Freescale SGTL5000 CODEC"
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 1ccdaf0c0e3e..be3377b8d73f 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -7,8 +7,15 @@ snd-soc-ad193x-spi-objs := ad193x-spi.o
 snd-soc-ad193x-i2c-objs := ad193x-i2c.o
 snd-soc-ad1980-objs := ad1980.o
 snd-soc-ad73311-objs := ad73311.o
-snd-soc-adau1701-objs := adau1701.o
 snd-soc-adau1373-objs := adau1373.o
+snd-soc-adau1701-objs := adau1701.o
+snd-soc-adau17x1-objs := adau17x1.o
+snd-soc-adau1761-objs := adau1761.o
+snd-soc-adau1761-i2c-objs := adau1761-i2c.o
+snd-soc-adau1761-spi-objs := adau1761-spi.o
+snd-soc-adau1781-objs := adau1781.o
+snd-soc-adau1781-i2c-objs := adau1781-i2c.o
+snd-soc-adau1781-spi-objs := adau1781-spi.o
 snd-soc-adau1977-objs := adau1977.o
 snd-soc-adau1977-spi-objs := adau1977-spi.o
 snd-soc-adau1977-i2c-objs := adau1977-i2c.o
@@ -60,10 +67,12 @@ snd-soc-pcm3008-objs := pcm3008.o
 snd-soc-pcm512x-objs := pcm512x.o
 snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
 snd-soc-pcm512x-spi-objs := pcm512x-spi.o
+snd-soc-rl6231-objs := rl6231.o
 snd-soc-rt5631-objs := rt5631.o
 snd-soc-rt5640-objs := rt5640.o
 snd-soc-rt5645-objs := rt5645.o
 snd-soc-rt5651-objs := rt5651.o
+snd-soc-rt5677-objs := rt5677.o
 snd-soc-sgtl5000-objs := sgtl5000.o
 snd-soc-alc5623-objs := alc5623.o
 snd-soc-alc5632-objs := alc5632.o
@@ -162,10 +171,17 @@ obj-$(CONFIG_SND_SOC_AD193X_I2C)	+= snd-soc-ad193x-i2c.o
 obj-$(CONFIG_SND_SOC_AD1980)    += snd-soc-ad1980.o
 obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
 obj-$(CONFIG_SND_SOC_ADAU1373)  += snd-soc-adau1373.o
+obj-$(CONFIG_SND_SOC_ADAU1701)          += snd-soc-adau1701.o
+obj-$(CONFIG_SND_SOC_ADAU17X1)          += snd-soc-adau17x1.o
+obj-$(CONFIG_SND_SOC_ADAU1761)          += snd-soc-adau1761.o
+obj-$(CONFIG_SND_SOC_ADAU1761_I2C)      += snd-soc-adau1761-i2c.o
+obj-$(CONFIG_SND_SOC_ADAU1761_SPI)      += snd-soc-adau1761-spi.o
+obj-$(CONFIG_SND_SOC_ADAU1781)          += snd-soc-adau1781.o
+obj-$(CONFIG_SND_SOC_ADAU1781_I2C)      += snd-soc-adau1781-i2c.o
+obj-$(CONFIG_SND_SOC_ADAU1781_SPI)      += snd-soc-adau1781-spi.o
 obj-$(CONFIG_SND_SOC_ADAU1977)          += snd-soc-adau1977.o
 obj-$(CONFIG_SND_SOC_ADAU1977_SPI)      += snd-soc-adau1977-spi.o
 obj-$(CONFIG_SND_SOC_ADAU1977_I2C)      += snd-soc-adau1977-i2c.o
-obj-$(CONFIG_SND_SOC_ADAU1701)  += snd-soc-adau1701.o
 obj-$(CONFIG_SND_SOC_ADAV80X)  += snd-soc-adav80x.o
 obj-$(CONFIG_SND_SOC_ADAV801)  += snd-soc-adav801.o
 obj-$(CONFIG_SND_SOC_ADAV803)  += snd-soc-adav803.o
@@ -216,10 +232,12 @@ obj-$(CONFIG_SND_SOC_PCM3008)	+= snd-soc-pcm3008.o
 obj-$(CONFIG_SND_SOC_PCM512x)   += snd-soc-pcm512x.o
 obj-$(CONFIG_SND_SOC_PCM512x_I2C)       += snd-soc-pcm512x-i2c.o
 obj-$(CONFIG_SND_SOC_PCM512x_SPI)       += snd-soc-pcm512x-spi.o
+obj-$(CONFIG_SND_SOC_RL6231)    += snd-soc-rl6231.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
 obj-$(CONFIG_SND_SOC_RT5651)    += snd-soc-rt5651.o
+obj-$(CONFIG_SND_SOC_RT5677)    += snd-soc-rt5677.o
 obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o
 obj-$(CONFIG_SND_SOC_SIGMADSP)  += snd-soc-sigmadsp.o
 obj-$(CONFIG_SND_SOC_SI476X)    += snd-soc-si476x.o
diff --git a/sound/soc/codecs/adau1761-i2c.c b/sound/soc/codecs/adau1761-i2c.c
new file mode 100644
index 000000000000..862796dec693
--- /dev/null
+++ b/sound/soc/codecs/adau1761-i2c.c
@@ -0,0 +1,60 @@
+/*
+ * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961 codec
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#include <linux/i2c.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include "adau1761.h"
+static int adau1761_i2c_probe(struct i2c_client *client,
+        const struct i2c_device_id *id)
+{
+        struct regmap_config config;
+        config = adau1761_regmap_config;
+        config.val_bits = 8;
+        config.reg_bits = 16;
+        return adau1761_probe(&client->dev,
+                devm_regmap_init_i2c(client, &config),
+                id->driver_data, NULL);
+}
+static int adau1761_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        return 0;
+}
+static const struct i2c_device_id adau1761_i2c_ids[] = {
+        { "adau1361", ADAU1361 },
+        { "adau1461", ADAU1761 },
+        { "adau1761", ADAU1761 },
+        { "adau1961", ADAU1361 },
+        { }
+};
+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,
+        .id_table = adau1761_i2c_ids,
+};
+module_i2c_driver(adau1761_i2c_driver);
+MODULE_DESCRIPTION("ASoC ADAU1361/ADAU1461/ADAU1761/ADAU1961 CODEC I2C driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1761-spi.c b/sound/soc/codecs/adau1761-spi.c
new file mode 100644
index 000000000000..cce2f11f1ffb
--- /dev/null
+++ b/sound/soc/codecs/adau1761-spi.c
@@ -0,0 +1,77 @@
+/*
+ * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961 codec
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/spi/spi.h>
+#include <sound/soc.h>
+#include "adau1761.h"
+static void adau1761_spi_switch_mode(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        /*
+         * To get the device into SPI mode CLATCH has to be pulled low three
+         * times.  Do this by issuing three dummy reads.
+         */
+        spi_w8r8(spi, 0x00);
+        spi_w8r8(spi, 0x00);
+        spi_w8r8(spi, 0x00);
+}
+static int adau1761_spi_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct regmap_config config;
+        if (!id)
+                return -EINVAL;
+        config = adau1761_regmap_config;
+        config.val_bits = 8;
+        config.reg_bits = 24;
+        config.read_flag_mask = 0x1;
+        return adau1761_probe(&spi->dev,
+                devm_regmap_init_spi(spi, &config),
+                id->driver_data, adau1761_spi_switch_mode);
+}
+static int adau1761_spi_remove(struct spi_device *spi)
+{
+        snd_soc_unregister_codec(&spi->dev);
+        return 0;
+}
+static const struct spi_device_id adau1761_spi_id[] = {
+        { "adau1361", ADAU1361 },
+        { "adau1461", ADAU1761 },
+        { "adau1761", ADAU1761 },
+        { "adau1961", ADAU1361 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, adau1761_spi_id);
+static struct spi_driver adau1761_spi_driver = {
+        .driver = {
+                .name = "adau1761",
+                .owner = THIS_MODULE,
+        },
+        .probe = adau1761_spi_probe,
+        .remove = adau1761_spi_remove,
+        .id_table = adau1761_spi_id,
+};
+module_spi_driver(adau1761_spi_driver);
+MODULE_DESCRIPTION("ASoC ADAU1361/ADAU1461/ADAU1761/ADAU1961 CODEC SPI driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c
new file mode 100644
index 000000000000..848cab839553
--- /dev/null
+++ b/sound/soc/codecs/adau1761.c
@@ -0,0 +1,803 @@
+/*
+ * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961 codec
+ *
+ * Copyright 2011-2013 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include <linux/platform_data/adau17x1.h>
+#include "adau17x1.h"
+#include "adau1761.h"
+#define ADAU1761_DIGMIC_JACKDETECT      0x4008
+#define ADAU1761_REC_MIXER_LEFT0        0x400a
+#define ADAU1761_REC_MIXER_LEFT1        0x400b
+#define ADAU1761_REC_MIXER_RIGHT0       0x400c
+#define ADAU1761_REC_MIXER_RIGHT1       0x400d
+#define ADAU1761_LEFT_DIFF_INPUT_VOL    0x400e
+#define ADAU1761_RIGHT_DIFF_INPUT_VOL   0x400f
+#define ADAU1761_PLAY_LR_MIXER_LEFT     0x4020
+#define ADAU1761_PLAY_MIXER_LEFT0       0x401c
+#define ADAU1761_PLAY_MIXER_LEFT1       0x401d
+#define ADAU1761_PLAY_MIXER_RIGHT0      0x401e
+#define ADAU1761_PLAY_MIXER_RIGHT1      0x401f
+#define ADAU1761_PLAY_LR_MIXER_RIGHT    0x4021
+#define ADAU1761_PLAY_MIXER_MONO        0x4022
+#define ADAU1761_PLAY_HP_LEFT_VOL       0x4023
+#define ADAU1761_PLAY_HP_RIGHT_VOL      0x4024
+#define ADAU1761_PLAY_LINE_LEFT_VOL     0x4025
+#define ADAU1761_PLAY_LINE_RIGHT_VOL    0x4026
+#define ADAU1761_PLAY_MONO_OUTPUT_VOL   0x4027
+#define ADAU1761_POP_CLICK_SUPPRESS     0x4028
+#define ADAU1761_JACK_DETECT_PIN        0x4031
+#define ADAU1761_DEJITTER               0x4036
+#define ADAU1761_CLK_ENABLE0            0x40f9
+#define ADAU1761_CLK_ENABLE1            0x40fa
+#define ADAU1761_DIGMIC_JACKDETECT_ACTIVE_LOW   BIT(0)
+#define ADAU1761_DIGMIC_JACKDETECT_DIGMIC       BIT(5)
+#define ADAU1761_DIFF_INPUT_VOL_LDEN            BIT(0)
+#define ADAU1761_PLAY_MONO_OUTPUT_VOL_MODE_HP   BIT(0)
+#define ADAU1761_PLAY_MONO_OUTPUT_VOL_UNMUTE    BIT(1)
+#define ADAU1761_PLAY_HP_RIGHT_VOL_MODE_HP      BIT(0)
+#define ADAU1761_PLAY_LINE_LEFT_VOL_MODE_HP     BIT(0)
+#define ADAU1761_PLAY_LINE_RIGHT_VOL_MODE_HP    BIT(0)
+#define ADAU1761_FIRMWARE "adau1761.bin"
+static const struct reg_default adau1761_reg_defaults[] = {
+        { ADAU1761_DEJITTER,                    0x03 },
+        { ADAU1761_DIGMIC_JACKDETECT,           0x00 },
+        { ADAU1761_REC_MIXER_LEFT0,             0x00 },
+        { ADAU1761_REC_MIXER_LEFT1,             0x00 },
+        { ADAU1761_REC_MIXER_RIGHT0,            0x00 },
+        { ADAU1761_REC_MIXER_RIGHT1,            0x00 },
+        { ADAU1761_LEFT_DIFF_INPUT_VOL,         0x00 },
+        { ADAU1761_RIGHT_DIFF_INPUT_VOL,        0x00 },
+        { ADAU1761_PLAY_LR_MIXER_LEFT,          0x00 },
+        { ADAU1761_PLAY_MIXER_LEFT0,            0x00 },
+        { ADAU1761_PLAY_MIXER_LEFT1,            0x00 },
+        { ADAU1761_PLAY_MIXER_RIGHT0,           0x00 },
+        { ADAU1761_PLAY_MIXER_RIGHT1,           0x00 },
+        { ADAU1761_PLAY_LR_MIXER_RIGHT,         0x00 },
+        { ADAU1761_PLAY_MIXER_MONO,             0x00 },
+        { ADAU1761_PLAY_HP_LEFT_VOL,            0x00 },
+        { ADAU1761_PLAY_HP_RIGHT_VOL,           0x00 },
+        { ADAU1761_PLAY_LINE_LEFT_VOL,          0x00 },
+        { ADAU1761_PLAY_LINE_RIGHT_VOL,         0x00 },
+        { ADAU1761_PLAY_MONO_OUTPUT_VOL,        0x00 },
+        { ADAU1761_POP_CLICK_SUPPRESS,          0x00 },
+        { ADAU1761_JACK_DETECT_PIN,             0x00 },
+        { ADAU1761_CLK_ENABLE0,                 0x00 },
+        { ADAU1761_CLK_ENABLE1,                 0x00 },
+        { ADAU17X1_CLOCK_CONTROL,               0x00 },
+        { ADAU17X1_PLL_CONTROL,                 0x00 },
+        { ADAU17X1_REC_POWER_MGMT,              0x00 },
+        { ADAU17X1_MICBIAS,                     0x00 },
+        { ADAU17X1_SERIAL_PORT0,                0x00 },
+        { ADAU17X1_SERIAL_PORT1,                0x00 },
+        { ADAU17X1_CONVERTER0,                  0x00 },
+        { ADAU17X1_CONVERTER1,                  0x00 },
+        { ADAU17X1_LEFT_INPUT_DIGITAL_VOL,      0x00 },
+        { ADAU17X1_RIGHT_INPUT_DIGITAL_VOL,     0x00 },
+        { ADAU17X1_ADC_CONTROL,                 0x00 },
+        { ADAU17X1_PLAY_POWER_MGMT,             0x00 },
+        { ADAU17X1_DAC_CONTROL0,                0x00 },
+        { ADAU17X1_DAC_CONTROL1,                0x00 },
+        { ADAU17X1_DAC_CONTROL2,                0x00 },
+        { ADAU17X1_SERIAL_PORT_PAD,             0xaa },
+        { ADAU17X1_CONTROL_PORT_PAD0,           0xaa },
+        { ADAU17X1_CONTROL_PORT_PAD1,           0x00 },
+        { ADAU17X1_DSP_SAMPLING_RATE,           0x01 },
+        { ADAU17X1_SERIAL_INPUT_ROUTE,          0x00 },
+        { ADAU17X1_SERIAL_OUTPUT_ROUTE,         0x00 },
+        { ADAU17X1_DSP_ENABLE,                  0x00 },
+        { ADAU17X1_DSP_RUN,                     0x00 },
+        { ADAU17X1_SERIAL_SAMPLING_RATE,        0x00 },
+};
+static const DECLARE_TLV_DB_SCALE(adau1761_sing_in_tlv, -1500, 300, 1);
+static const DECLARE_TLV_DB_SCALE(adau1761_diff_in_tlv, -1200, 75, 0);
+static const DECLARE_TLV_DB_SCALE(adau1761_out_tlv, -5700, 100, 0);
+static const DECLARE_TLV_DB_SCALE(adau1761_sidetone_tlv, -1800, 300, 1);
+static const DECLARE_TLV_DB_SCALE(adau1761_boost_tlv, -600, 600, 1);
+static const DECLARE_TLV_DB_SCALE(adau1761_pga_boost_tlv, -2000, 2000, 1);
+static const unsigned int adau1761_bias_select_values[] = {
+        0, 2, 3,
+};
+static const char * const adau1761_bias_select_text[] = {
+        "Normal operation", "Enhanced performance", "Power saving",
+};
+static const char * const adau1761_bias_select_extreme_text[] = {
+        "Normal operation", "Extreme power saving", "Enhanced performance",
+        "Power saving",
+};
+static SOC_ENUM_SINGLE_DECL(adau1761_adc_bias_enum,
+                ADAU17X1_REC_POWER_MGMT, 3, adau1761_bias_select_extreme_text);
+static SOC_ENUM_SINGLE_DECL(adau1761_hp_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 6, adau1761_bias_select_extreme_text);
+static SOC_ENUM_SINGLE_DECL(adau1761_dac_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 4, adau1761_bias_select_extreme_text);
+static SOC_VALUE_ENUM_SINGLE_DECL(adau1761_playback_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 2, 0x3, adau1761_bias_select_text,
+                adau1761_bias_select_values);
+static SOC_VALUE_ENUM_SINGLE_DECL(adau1761_capture_bias_enum,
+                ADAU17X1_REC_POWER_MGMT, 1, 0x3, adau1761_bias_select_text,
+                adau1761_bias_select_values);
+static const struct snd_kcontrol_new adau1761_jack_detect_controls[] = {
+        SOC_SINGLE("Speaker Auto-mute Switch", ADAU1761_DIGMIC_JACKDETECT,
+                4, 1, 0),
+};
+static const struct snd_kcontrol_new adau1761_differential_mode_controls[] = {
+        SOC_DOUBLE_R_TLV("Capture Volume", ADAU1761_LEFT_DIFF_INPUT_VOL,
+                ADAU1761_RIGHT_DIFF_INPUT_VOL, 2, 0x3f, 0,
+                adau1761_diff_in_tlv),
+        SOC_DOUBLE_R("Capture Switch", ADAU1761_LEFT_DIFF_INPUT_VOL,
+                ADAU1761_RIGHT_DIFF_INPUT_VOL, 1, 1, 0),
+        SOC_DOUBLE_R_TLV("PGA Boost Capture Volume", ADAU1761_REC_MIXER_LEFT1,
+                ADAU1761_REC_MIXER_RIGHT1, 3, 2, 0, adau1761_pga_boost_tlv),
+};
+static const struct snd_kcontrol_new adau1761_single_mode_controls[] = {
+        SOC_SINGLE_TLV("Input 1 Capture Volume", ADAU1761_REC_MIXER_LEFT0,
+                4, 7, 0, adau1761_sing_in_tlv),
+        SOC_SINGLE_TLV("Input 2 Capture Volume", ADAU1761_REC_MIXER_LEFT0,
+                1, 7, 0, adau1761_sing_in_tlv),
+        SOC_SINGLE_TLV("Input 3 Capture Volume", ADAU1761_REC_MIXER_RIGHT0,
+                4, 7, 0, adau1761_sing_in_tlv),
+        SOC_SINGLE_TLV("Input 4 Capture Volume", ADAU1761_REC_MIXER_RIGHT0,
+                1, 7, 0, adau1761_sing_in_tlv),
+};
+static const struct snd_kcontrol_new adau1761_controls[] = {
+        SOC_DOUBLE_R_TLV("Aux Capture Volume", ADAU1761_REC_MIXER_LEFT1,
+                ADAU1761_REC_MIXER_RIGHT1, 0, 7, 0, adau1761_sing_in_tlv),
+        SOC_DOUBLE_R_TLV("Headphone Playback Volume", ADAU1761_PLAY_HP_LEFT_VOL,
+                ADAU1761_PLAY_HP_RIGHT_VOL, 2, 0x3f, 0, adau1761_out_tlv),
+        SOC_DOUBLE_R("Headphone Playback Switch", ADAU1761_PLAY_HP_LEFT_VOL,
+                ADAU1761_PLAY_HP_RIGHT_VOL, 1, 1, 0),
+        SOC_DOUBLE_R_TLV("Lineout Playback Volume", ADAU1761_PLAY_LINE_LEFT_VOL,
+                ADAU1761_PLAY_LINE_RIGHT_VOL, 2, 0x3f, 0, adau1761_out_tlv),
+        SOC_DOUBLE_R("Lineout Playback Switch", ADAU1761_PLAY_LINE_LEFT_VOL,
+                ADAU1761_PLAY_LINE_RIGHT_VOL, 1, 1, 0),
+        SOC_ENUM("ADC Bias", adau1761_adc_bias_enum),
+        SOC_ENUM("DAC Bias", adau1761_dac_bias_enum),
+        SOC_ENUM("Capture Bias", adau1761_capture_bias_enum),
+        SOC_ENUM("Playback Bias", adau1761_playback_bias_enum),
+        SOC_ENUM("Headphone Bias", adau1761_hp_bias_enum),
+};
+static const struct snd_kcontrol_new adau1761_mono_controls[] = {
+        SOC_SINGLE_TLV("Mono Playback Volume", ADAU1761_PLAY_MONO_OUTPUT_VOL,
+                2, 0x3f, 0, adau1761_out_tlv),
+        SOC_SINGLE("Mono Playback Switch", ADAU1761_PLAY_MONO_OUTPUT_VOL,
+                1, 1, 0),
+};
+static const struct snd_kcontrol_new adau1761_left_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("Left DAC Switch",
+                ADAU1761_PLAY_MIXER_LEFT0, 5, 1, 0),
+        SOC_DAPM_SINGLE_AUTODISABLE("Right DAC Switch",
+                ADAU1761_PLAY_MIXER_LEFT0, 6, 1, 0),
+        SOC_DAPM_SINGLE_TLV("Aux Bypass Volume",
+                ADAU1761_PLAY_MIXER_LEFT0, 1, 8, 0, adau1761_sidetone_tlv),
+        SOC_DAPM_SINGLE_TLV("Right Bypass Volume",
+                ADAU1761_PLAY_MIXER_LEFT1, 4, 8, 0, adau1761_sidetone_tlv),
+        SOC_DAPM_SINGLE_TLV("Left Bypass Volume",
+                ADAU1761_PLAY_MIXER_LEFT1, 0, 8, 0, adau1761_sidetone_tlv),
+};
+static const struct snd_kcontrol_new adau1761_right_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("Left DAC Switch",
+                ADAU1761_PLAY_MIXER_RIGHT0, 5, 1, 0),
+        SOC_DAPM_SINGLE_AUTODISABLE("Right DAC Switch",
+                ADAU1761_PLAY_MIXER_RIGHT0, 6, 1, 0),
+        SOC_DAPM_SINGLE_TLV("Aux Bypass Volume",
+                ADAU1761_PLAY_MIXER_RIGHT0, 1, 8, 0, adau1761_sidetone_tlv),
+        SOC_DAPM_SINGLE_TLV("Right Bypass Volume",
+                ADAU1761_PLAY_MIXER_RIGHT1, 4, 8, 0, adau1761_sidetone_tlv),
+        SOC_DAPM_SINGLE_TLV("Left Bypass Volume",
+                ADAU1761_PLAY_MIXER_RIGHT1, 0, 8, 0, adau1761_sidetone_tlv),
+};
+static const struct snd_kcontrol_new adau1761_left_lr_mixer_controls[] = {
+        SOC_DAPM_SINGLE_TLV("Left Volume",
+                ADAU1761_PLAY_LR_MIXER_LEFT, 1, 2, 0, adau1761_boost_tlv),
+        SOC_DAPM_SINGLE_TLV("Right Volume",
+                ADAU1761_PLAY_LR_MIXER_LEFT, 3, 2, 0, adau1761_boost_tlv),
+};
+static const struct snd_kcontrol_new adau1761_right_lr_mixer_controls[] = {
+        SOC_DAPM_SINGLE_TLV("Left Volume",
+                ADAU1761_PLAY_LR_MIXER_RIGHT, 1, 2, 0, adau1761_boost_tlv),
+        SOC_DAPM_SINGLE_TLV("Right Volume",
+                ADAU1761_PLAY_LR_MIXER_RIGHT, 3, 2, 0, adau1761_boost_tlv),
+};
+static const char * const adau1761_input_mux_text[] = {
+        "ADC", "DMIC",
+};
+static SOC_ENUM_SINGLE_DECL(adau1761_input_mux_enum,
+        ADAU17X1_ADC_CONTROL, 2, adau1761_input_mux_text);
+static const struct snd_kcontrol_new adau1761_input_mux_control =
+        SOC_DAPM_ENUM("Input Select", adau1761_input_mux_enum);
+static int adau1761_dejitter_fixup(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(w->codec);
+        /* After any power changes have been made the dejitter circuit
+         * has to be reinitialized. */
+        regmap_write(adau->regmap, ADAU1761_DEJITTER, 0);
+        if (!adau->master)
+                regmap_write(adau->regmap, ADAU1761_DEJITTER, 3);
+        return 0;
+}
+static const struct snd_soc_dapm_widget adau1x61_dapm_widgets[] = {
+        SND_SOC_DAPM_MIXER("Left Input Mixer", ADAU1761_REC_MIXER_LEFT0, 0, 0,
+                NULL, 0),
+        SND_SOC_DAPM_MIXER("Right Input Mixer", ADAU1761_REC_MIXER_RIGHT0, 0, 0,
+                NULL, 0),
+        SOC_MIXER_ARRAY("Left Playback Mixer", ADAU1761_PLAY_MIXER_LEFT0,
+                0, 0, adau1761_left_mixer_controls),
+        SOC_MIXER_ARRAY("Right Playback Mixer", ADAU1761_PLAY_MIXER_RIGHT0,
+                0, 0, adau1761_right_mixer_controls),
+        SOC_MIXER_ARRAY("Left LR Playback Mixer", ADAU1761_PLAY_LR_MIXER_LEFT,
+                0, 0, adau1761_left_lr_mixer_controls),
+        SOC_MIXER_ARRAY("Right LR Playback Mixer", ADAU1761_PLAY_LR_MIXER_RIGHT,
+                0, 0, adau1761_right_lr_mixer_controls),
+        SND_SOC_DAPM_SUPPLY("Headphone", ADAU1761_PLAY_HP_LEFT_VOL,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("SYSCLK", 2, SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_POST("Dejitter fixup", adau1761_dejitter_fixup),
+        SND_SOC_DAPM_INPUT("LAUX"),
+        SND_SOC_DAPM_INPUT("RAUX"),
+        SND_SOC_DAPM_INPUT("LINP"),
+        SND_SOC_DAPM_INPUT("LINN"),
+        SND_SOC_DAPM_INPUT("RINP"),
+        SND_SOC_DAPM_INPUT("RINN"),
+        SND_SOC_DAPM_OUTPUT("LOUT"),
+        SND_SOC_DAPM_OUTPUT("ROUT"),
+        SND_SOC_DAPM_OUTPUT("LHP"),
+        SND_SOC_DAPM_OUTPUT("RHP"),
+};
+static const struct snd_soc_dapm_widget adau1761_mono_dapm_widgets[] = {
+        SND_SOC_DAPM_MIXER("Mono Playback Mixer", ADAU1761_PLAY_MIXER_MONO,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_OUTPUT("MONOOUT"),
+};
+static const struct snd_soc_dapm_widget adau1761_capless_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY_S("Headphone VGND", 1, ADAU1761_PLAY_MIXER_MONO,
+                0, 0, NULL, 0),
+};
+static const struct snd_soc_dapm_route adau1x61_dapm_routes[] = {
+        { "Left Input Mixer", NULL, "LINP" },
+        { "Left Input Mixer", NULL, "LINN" },
+        { "Left Input Mixer", NULL, "LAUX" },
+        { "Right Input Mixer", NULL, "RINP" },
+        { "Right Input Mixer", NULL, "RINN" },
+        { "Right Input Mixer", NULL, "RAUX" },
+        { "Left Playback Mixer", NULL, "Left Playback Enable"},
+        { "Right Playback Mixer", NULL, "Right Playback Enable"},
+        { "Left LR Playback Mixer", NULL, "Left Playback Enable"},
+        { "Right LR Playback Mixer", NULL, "Right Playback Enable"},
+        { "Left Playback Mixer", "Left DAC Switch", "Left DAC" },
+        { "Left Playback Mixer", "Right DAC Switch", "Right DAC" },
+        { "Right Playback Mixer", "Left DAC Switch", "Left DAC" },
+        { "Right Playback Mixer", "Right DAC Switch", "Right DAC" },
+        { "Left LR Playback Mixer", "Left Volume", "Left Playback Mixer" },
+        { "Left LR Playback Mixer", "Right Volume", "Right Playback Mixer" },
+        { "Right LR Playback Mixer", "Left Volume", "Left Playback Mixer" },
+        { "Right LR Playback Mixer", "Right Volume", "Right Playback Mixer" },
+        { "LHP", NULL, "Left Playback Mixer" },
+        { "RHP", NULL, "Right Playback Mixer" },
+        { "LHP", NULL, "Headphone" },
+        { "RHP", NULL, "Headphone" },
+        { "LOUT", NULL, "Left LR Playback Mixer" },
+        { "ROUT", NULL, "Right LR Playback Mixer" },
+        { "Left Playback Mixer", "Aux Bypass Volume", "LAUX" },
+        { "Left Playback Mixer", "Left Bypass Volume", "Left Input Mixer" },
+        { "Left Playback Mixer", "Right Bypass Volume", "Right Input Mixer" },
+        { "Right Playback Mixer", "Aux Bypass Volume", "RAUX" },
+        { "Right Playback Mixer", "Left Bypass Volume", "Left Input Mixer" },
+        { "Right Playback Mixer", "Right Bypass Volume", "Right Input Mixer" },
+};
+static const struct snd_soc_dapm_route adau1761_mono_dapm_routes[] = {
+        { "Mono Playback Mixer", NULL, "Left Playback Mixer" },
+        { "Mono Playback Mixer", NULL, "Right Playback Mixer" },
+        { "MONOOUT", NULL, "Mono Playback Mixer" },
+};
+static const struct snd_soc_dapm_route adau1761_capless_dapm_routes[] = {
+        { "Headphone", NULL, "Headphone VGND" },
+};
+static const struct snd_soc_dapm_widget adau1761_dmic_widgets[] = {
+        SND_SOC_DAPM_MUX("Left Decimator Mux", SND_SOC_NOPM, 0, 0,
+                &adau1761_input_mux_control),
+        SND_SOC_DAPM_MUX("Right Decimator Mux", SND_SOC_NOPM, 0, 0,
+                &adau1761_input_mux_control),
+        SND_SOC_DAPM_INPUT("DMIC"),
+};
+static const struct snd_soc_dapm_route adau1761_dmic_routes[] = {
+        { "Left Decimator Mux", "ADC", "Left Input Mixer" },
+        { "Left Decimator Mux", "DMIC", "DMIC" },
+        { "Right Decimator Mux", "ADC", "Right Input Mixer" },
+        { "Right Decimator Mux", "DMIC", "DMIC" },
+        { "Left Decimator", NULL, "Left Decimator Mux" },
+        { "Right Decimator", NULL, "Right Decimator Mux" },
+};
+static const struct snd_soc_dapm_route adau1761_no_dmic_routes[] = {
+        { "Left Decimator", NULL, "Left Input Mixer" },
+        { "Right Decimator", NULL, "Right Input Mixer" },
+};
+static const struct snd_soc_dapm_widget adau1761_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY("Serial Port Clock", ADAU1761_CLK_ENABLE0,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Serial Input Routing Clock", ADAU1761_CLK_ENABLE0,
+                1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Serial Output Routing Clock", ADAU1761_CLK_ENABLE0,
+                3, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Decimator Resync Clock", ADAU1761_CLK_ENABLE0,
+                4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Interpolator Resync Clock", ADAU1761_CLK_ENABLE0,
+                2, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Slew Clock", ADAU1761_CLK_ENABLE0, 6, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("Digital Clock 0", 1, ADAU1761_CLK_ENABLE1,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("Digital Clock 1", 1, ADAU1761_CLK_ENABLE1,
+                1, 0, NULL, 0),
+};
+static const struct snd_soc_dapm_route adau1761_dapm_routes[] = {
+        { "Left Decimator", NULL, "Digital Clock 0", },
+        { "Right Decimator", NULL, "Digital Clock 0", },
+        { "Left DAC", NULL, "Digital Clock 0", },
+        { "Right DAC", NULL, "Digital Clock 0", },
+        { "AIFCLK", NULL, "Digital Clock 1" },
+        { "Playback", NULL, "Serial Port Clock" },
+        { "Capture", NULL, "Serial Port Clock" },
+        { "Playback", NULL, "Serial Input Routing Clock" },
+        { "Capture", NULL, "Serial Output Routing Clock" },
+        { "Left Decimator", NULL, "Decimator Resync Clock" },
+        { "Right Decimator", NULL, "Decimator Resync Clock" },
+        { "Left DAC", NULL, "Interpolator Resync Clock" },
+        { "Right DAC", NULL, "Interpolator Resync Clock" },
+        { "DSP", NULL, "Digital Clock 0" },
+        { "Slew Clock", NULL, "Digital Clock 0" },
+        { "Right Playback Mixer", NULL, "Slew Clock" },
+        { "Left Playback Mixer", NULL, "Slew Clock" },
+        { "Digital Clock 0", NULL, "SYSCLK" },
+        { "Digital Clock 1", NULL, "SYSCLK" },
+};
+static int adau1761_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN);
+                break;
+        case SND_SOC_BIAS_OFF:
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN, 0);
+                break;
+        }
+        codec->dapm.bias_level = level;
+        return 0;
+}
+static enum adau1761_output_mode adau1761_get_lineout_mode(
+        struct snd_soc_codec *codec)
+{
+        struct adau1761_platform_data *pdata = codec->dev->platform_data;
+        if (pdata)
+                return pdata->lineout_mode;
+        return ADAU1761_OUTPUT_MODE_LINE;
+}
+static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)
+{
+        struct adau1761_platform_data *pdata = codec->dev->platform_data;
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        enum adau1761_digmic_jackdet_pin_mode mode;
+        unsigned int val = 0;
+        int ret;
+        if (pdata)
+                mode = pdata->digmic_jackdetect_pin_mode;
+        else
+                mode = ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE;
+        switch (mode) {
+        case ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT:
+                switch (pdata->jackdetect_debounce_time) {
+                case ADAU1761_JACKDETECT_DEBOUNCE_5MS:
+                case ADAU1761_JACKDETECT_DEBOUNCE_10MS:
+                case ADAU1761_JACKDETECT_DEBOUNCE_20MS:
+                case ADAU1761_JACKDETECT_DEBOUNCE_40MS:
+                        val |= pdata->jackdetect_debounce_time << 6;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                if (pdata->jackdetect_active_low)
+                        val |= ADAU1761_DIGMIC_JACKDETECT_ACTIVE_LOW;
+                ret = snd_soc_add_codec_controls(codec,
+                        adau1761_jack_detect_controls,
+                        ARRAY_SIZE(adau1761_jack_detect_controls));
+                if (ret)
+                        return ret;
+        case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: /* fallthrough */
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1761_no_dmic_routes,
+                        ARRAY_SIZE(adau1761_no_dmic_routes));
+                if (ret)
+                        return ret;
+                break;
+        case ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC:
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau1761_dmic_widgets,
+                        ARRAY_SIZE(adau1761_dmic_widgets));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1761_dmic_routes,
+                        ARRAY_SIZE(adau1761_dmic_routes));
+                if (ret)
+                        return ret;
+                val |= ADAU1761_DIGMIC_JACKDETECT_DIGMIC;
+                break;
+        default:
+                return -EINVAL;
+        }
+        regmap_write(adau->regmap, ADAU1761_DIGMIC_JACKDETECT, val);
+        return 0;
+}
+static int adau1761_setup_headphone_mode(struct snd_soc_codec *codec)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        struct adau1761_platform_data *pdata = codec->dev->platform_data;
+        enum adau1761_output_mode mode;
+        int ret;
+        if (pdata)
+                mode = pdata->headphone_mode;
+        else
+                mode = ADAU1761_OUTPUT_MODE_HEADPHONE;
+        switch (mode) {
+        case ADAU1761_OUTPUT_MODE_LINE:
+                break;
+        case ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS:
+                regmap_update_bits(adau->regmap, ADAU1761_PLAY_MONO_OUTPUT_VOL,
+                        ADAU1761_PLAY_MONO_OUTPUT_VOL_MODE_HP |
+                        ADAU1761_PLAY_MONO_OUTPUT_VOL_UNMUTE,
+                        ADAU1761_PLAY_MONO_OUTPUT_VOL_MODE_HP |
+                        ADAU1761_PLAY_MONO_OUTPUT_VOL_UNMUTE);
+                /* fallthrough */
+        case ADAU1761_OUTPUT_MODE_HEADPHONE:
+                regmap_update_bits(adau->regmap, ADAU1761_PLAY_HP_RIGHT_VOL,
+                        ADAU1761_PLAY_HP_RIGHT_VOL_MODE_HP,
+                        ADAU1761_PLAY_HP_RIGHT_VOL_MODE_HP);
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (mode == ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS) {
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau1761_capless_dapm_widgets,
+                        ARRAY_SIZE(adau1761_capless_dapm_widgets));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1761_capless_dapm_routes,
+                        ARRAY_SIZE(adau1761_capless_dapm_routes));
+        } else {
+                ret = snd_soc_add_codec_controls(codec, adau1761_mono_controls,
+                        ARRAY_SIZE(adau1761_mono_controls));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau1761_mono_dapm_widgets,
+                        ARRAY_SIZE(adau1761_mono_dapm_widgets));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1761_mono_dapm_routes,
+                        ARRAY_SIZE(adau1761_mono_dapm_routes));
+        }
+        return ret;
+}
+static bool adau1761_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case ADAU1761_DIGMIC_JACKDETECT:
+        case ADAU1761_REC_MIXER_LEFT0:
+        case ADAU1761_REC_MIXER_LEFT1:
+        case ADAU1761_REC_MIXER_RIGHT0:
+        case ADAU1761_REC_MIXER_RIGHT1:
+        case ADAU1761_LEFT_DIFF_INPUT_VOL:
+        case ADAU1761_RIGHT_DIFF_INPUT_VOL:
+        case ADAU1761_PLAY_LR_MIXER_LEFT:
+        case ADAU1761_PLAY_MIXER_LEFT0:
+        case ADAU1761_PLAY_MIXER_LEFT1:
+        case ADAU1761_PLAY_MIXER_RIGHT0:
+        case ADAU1761_PLAY_MIXER_RIGHT1:
+        case ADAU1761_PLAY_LR_MIXER_RIGHT:
+        case ADAU1761_PLAY_MIXER_MONO:
+        case ADAU1761_PLAY_HP_LEFT_VOL:
+        case ADAU1761_PLAY_HP_RIGHT_VOL:
+        case ADAU1761_PLAY_LINE_LEFT_VOL:
+        case ADAU1761_PLAY_LINE_RIGHT_VOL:
+        case ADAU1761_PLAY_MONO_OUTPUT_VOL:
+        case ADAU1761_POP_CLICK_SUPPRESS:
+        case ADAU1761_JACK_DETECT_PIN:
+        case ADAU1761_DEJITTER:
+        case ADAU1761_CLK_ENABLE0:
+        case ADAU1761_CLK_ENABLE1:
+                return true;
+        default:
+                break;
+        }
+        return adau17x1_readable_register(dev, reg);
+}
+static int adau1761_codec_probe(struct snd_soc_codec *codec)
+{
+        struct adau1761_platform_data *pdata = codec->dev->platform_data;
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        ret = adau17x1_add_widgets(codec);
+        if (ret < 0)
+                return ret;
+        if (pdata && pdata->input_differential) {
+                regmap_update_bits(adau->regmap, ADAU1761_LEFT_DIFF_INPUT_VOL,
+                        ADAU1761_DIFF_INPUT_VOL_LDEN,
+                        ADAU1761_DIFF_INPUT_VOL_LDEN);
+                regmap_update_bits(adau->regmap, ADAU1761_RIGHT_DIFF_INPUT_VOL,
+                        ADAU1761_DIFF_INPUT_VOL_LDEN,
+                        ADAU1761_DIFF_INPUT_VOL_LDEN);
+                ret = snd_soc_add_codec_controls(codec,
+                        adau1761_differential_mode_controls,
+                        ARRAY_SIZE(adau1761_differential_mode_controls));
+                if (ret)
+                        return ret;
+        } else {
+                ret = snd_soc_add_codec_controls(codec,
+                        adau1761_single_mode_controls,
+                        ARRAY_SIZE(adau1761_single_mode_controls));
+                if (ret)
+                        return ret;
+        }
+        switch (adau1761_get_lineout_mode(codec)) {
+        case ADAU1761_OUTPUT_MODE_LINE:
+                break;
+        case ADAU1761_OUTPUT_MODE_HEADPHONE:
+                regmap_update_bits(adau->regmap, ADAU1761_PLAY_LINE_LEFT_VOL,
+                        ADAU1761_PLAY_LINE_LEFT_VOL_MODE_HP,
+                        ADAU1761_PLAY_LINE_LEFT_VOL_MODE_HP);
+                regmap_update_bits(adau->regmap, ADAU1761_PLAY_LINE_RIGHT_VOL,
+                        ADAU1761_PLAY_LINE_RIGHT_VOL_MODE_HP,
+                        ADAU1761_PLAY_LINE_RIGHT_VOL_MODE_HP);
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = adau1761_setup_headphone_mode(codec);
+        if (ret)
+                return ret;
+        ret = adau1761_setup_digmic_jackdetect(codec);
+        if (ret)
+                return ret;
+        if (adau->type == ADAU1761) {
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau1761_dapm_widgets,
+                        ARRAY_SIZE(adau1761_dapm_widgets));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1761_dapm_routes,
+                        ARRAY_SIZE(adau1761_dapm_routes));
+                if (ret)
+                        return ret;
+                ret = adau17x1_load_firmware(adau, codec->dev,
+                        ADAU1761_FIRMWARE);
+                if (ret)
+                        dev_warn(codec->dev, "Failed to firmware\n");
+        }
+        ret = adau17x1_add_routes(codec);
+        if (ret < 0)
+                return ret;
+        return 0;
+}
+static const struct snd_soc_codec_driver adau1761_codec_driver = {
+        .probe = adau1761_codec_probe,
+        .suspend = adau17x1_suspend,
+        .resume = adau17x1_resume,
+        .set_bias_level = adau1761_set_bias_level,
+        .controls = adau1761_controls,
+        .num_controls = ARRAY_SIZE(adau1761_controls),
+        .dapm_widgets = adau1x61_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(adau1x61_dapm_widgets),
+        .dapm_routes = adau1x61_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(adau1x61_dapm_routes),
+};
+#define ADAU1761_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
+        SNDRV_PCM_FMTBIT_S32_LE)
+static struct snd_soc_dai_driver adau1361_dai_driver = {
+        .name = "adau-hifi",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 2,
+                .channels_max = 4,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1761_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 4,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1761_FORMATS,
+        },
+        .ops = &adau17x1_dai_ops,
+};
+static struct snd_soc_dai_driver adau1761_dai_driver = {
+        .name = "adau-hifi",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1761_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1761_FORMATS,
+        },
+        .ops = &adau17x1_dai_ops,
+};
+int adau1761_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev))
+{
+        struct snd_soc_dai_driver *dai_drv;
+        int ret;
+        ret = adau17x1_probe(dev, regmap, type, switch_mode);
+        if (ret)
+                return ret;
+        if (type == ADAU1361)
+                dai_drv = &adau1361_dai_driver;
+        else
+                dai_drv = &adau1761_dai_driver;
+        return snd_soc_register_codec(dev, &adau1761_codec_driver, dai_drv, 1);
+}
+EXPORT_SYMBOL_GPL(adau1761_probe);
+const struct regmap_config adau1761_regmap_config = {
+        .val_bits = 8,
+        .reg_bits = 16,
+        .max_register = 0x40fa,
+        .reg_defaults = adau1761_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(adau1761_reg_defaults),
+        .readable_reg = adau1761_readable_register,
+        .volatile_reg = adau17x1_volatile_register,
+        .cache_type = REGCACHE_RBTREE,
+};
+EXPORT_SYMBOL_GPL(adau1761_regmap_config);
+MODULE_DESCRIPTION("ASoC ADAU1361/ADAU1461/ADAU1761/ADAU1961 CODEC driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1761.h b/sound/soc/codecs/adau1761.h
new file mode 100644
index 000000000000..a9e0d288301e
--- /dev/null
+++ b/sound/soc/codecs/adau1761.h
@@ -0,0 +1,23 @@
+/*
+ * ADAU1361/ADAU1461/ADAU1761/ADAU1961 driver
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#ifndef __SOUND_SOC_CODECS_ADAU1761_H__
+#define __SOUND_SOC_CODECS_ADAU1761_H__
+#include <linux/regmap.h>
+#include "adau17x1.h"
+struct device;
+int adau1761_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev));
+extern const struct regmap_config adau1761_regmap_config;
+#endif
diff --git a/sound/soc/codecs/adau1781-i2c.c b/sound/soc/codecs/adau1781-i2c.c
new file mode 100644
index 000000000000..2ce4362ccec1
--- /dev/null
+++ b/sound/soc/codecs/adau1781-i2c.c
@@ -0,0 +1,58 @@
+/*
+ * Driver for ADAU1381/ADAU1781 CODEC
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#include <linux/i2c.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include "adau1781.h"
+static int adau1781_i2c_probe(struct i2c_client *client,
+        const struct i2c_device_id *id)
+{
+        struct regmap_config config;
+        config = adau1781_regmap_config;
+        config.val_bits = 8;
+        config.reg_bits = 16;
+        return adau1781_probe(&client->dev,
+                devm_regmap_init_i2c(client, &config),
+                id->driver_data, NULL);
+}
+static int adau1781_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        return 0;
+}
+static const struct i2c_device_id adau1781_i2c_ids[] = {
+        { "adau1381", ADAU1381 },
+        { "adau1781", ADAU1781 },
+        { }
+};
+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,
+        .id_table = adau1781_i2c_ids,
+};
+module_i2c_driver(adau1781_i2c_driver);
+MODULE_DESCRIPTION("ASoC ADAU1381/ADAU1781 CODEC I2C driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1781-spi.c b/sound/soc/codecs/adau1781-spi.c
new file mode 100644
index 000000000000..194686716bbe
--- /dev/null
+++ b/sound/soc/codecs/adau1781-spi.c
@@ -0,0 +1,75 @@
+/*
+ * Driver for ADAU1381/ADAU1781 CODEC
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/spi/spi.h>
+#include <sound/soc.h>
+#include "adau1781.h"
+static void adau1781_spi_switch_mode(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        /*
+         * To get the device into SPI mode CLATCH has to be pulled low three
+         * times.  Do this by issuing three dummy reads.
+         */
+        spi_w8r8(spi, 0x00);
+        spi_w8r8(spi, 0x00);
+        spi_w8r8(spi, 0x00);
+}
+static int adau1781_spi_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct regmap_config config;
+        if (!id)
+                return -EINVAL;
+        config = adau1781_regmap_config;
+        config.val_bits = 8;
+        config.reg_bits = 24;
+        config.read_flag_mask = 0x1;
+        return adau1781_probe(&spi->dev,
+                devm_regmap_init_spi(spi, &config),
+                id->driver_data, adau1781_spi_switch_mode);
+}
+static int adau1781_spi_remove(struct spi_device *spi)
+{
+        snd_soc_unregister_codec(&spi->dev);
+        return 0;
+}
+static const struct spi_device_id adau1781_spi_id[] = {
+        { "adau1381", ADAU1381 },
+        { "adau1781", ADAU1781 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, adau1781_spi_id);
+static struct spi_driver adau1781_spi_driver = {
+        .driver = {
+                .name = "adau1781",
+                .owner = THIS_MODULE,
+        },
+        .probe = adau1781_spi_probe,
+        .remove = adau1781_spi_remove,
+        .id_table = adau1781_spi_id,
+};
+module_spi_driver(adau1781_spi_driver);
+MODULE_DESCRIPTION("ASoC ADAU1381/ADAU1781 CODEC SPI driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c
new file mode 100644
index 000000000000..045a61413840
--- /dev/null
+++ b/sound/soc/codecs/adau1781.c
@@ -0,0 +1,511 @@
+/*
+ * Driver for ADAU1781/ADAU1781 codec
+ *
+ * Copyright 2011-2013 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include <linux/platform_data/adau17x1.h>
+#include "adau17x1.h"
+#include "adau1781.h"
+#define ADAU1781_DMIC_BEEP_CTRL         0x4008
+#define ADAU1781_LEFT_PGA               0x400e
+#define ADAU1781_RIGHT_PGA              0x400f
+#define ADAU1781_LEFT_PLAYBACK_MIXER    0x401c
+#define ADAU1781_RIGHT_PLAYBACK_MIXER   0x401e
+#define ADAU1781_MONO_PLAYBACK_MIXER    0x401f
+#define ADAU1781_LEFT_LINEOUT           0x4025
+#define ADAU1781_RIGHT_LINEOUT          0x4026
+#define ADAU1781_SPEAKER                0x4027
+#define ADAU1781_BEEP_ZC                0x4028
+#define ADAU1781_DEJITTER               0x4032
+#define ADAU1781_DIG_PWDN0              0x4080
+#define ADAU1781_DIG_PWDN1              0x4081
+#define ADAU1781_INPUT_DIFFERNTIAL BIT(3)
+#define ADAU1381_FIRMWARE "adau1381.bin"
+#define ADAU1781_FIRMWARE "adau1781.bin"
+static const struct reg_default adau1781_reg_defaults[] = {
+        { ADAU1781_DMIC_BEEP_CTRL,              0x00 },
+        { ADAU1781_LEFT_PGA,                    0xc7 },
+        { ADAU1781_RIGHT_PGA,                   0xc7 },
+        { ADAU1781_LEFT_PLAYBACK_MIXER,         0x00 },
+        { ADAU1781_RIGHT_PLAYBACK_MIXER,        0x00 },
+        { ADAU1781_MONO_PLAYBACK_MIXER,         0x00 },
+        { ADAU1781_LEFT_LINEOUT,                0x00 },
+        { ADAU1781_RIGHT_LINEOUT,               0x00 },
+        { ADAU1781_SPEAKER,                     0x00 },
+        { ADAU1781_BEEP_ZC,                     0x19 },
+        { ADAU1781_DEJITTER,                    0x60 },
+        { ADAU1781_DIG_PWDN1,                   0x0c },
+        { ADAU1781_DIG_PWDN1,                   0x00 },
+        { ADAU17X1_CLOCK_CONTROL,               0x00 },
+        { ADAU17X1_PLL_CONTROL,                 0x00 },
+        { ADAU17X1_REC_POWER_MGMT,              0x00 },
+        { ADAU17X1_MICBIAS,                     0x04 },
+        { ADAU17X1_SERIAL_PORT0,                0x00 },
+        { ADAU17X1_SERIAL_PORT1,                0x00 },
+        { ADAU17X1_CONVERTER0,                  0x00 },
+        { ADAU17X1_CONVERTER1,                  0x00 },
+        { ADAU17X1_LEFT_INPUT_DIGITAL_VOL,      0x00 },
+        { ADAU17X1_RIGHT_INPUT_DIGITAL_VOL,     0x00 },
+        { ADAU17X1_ADC_CONTROL,                 0x00 },
+        { ADAU17X1_PLAY_POWER_MGMT,             0x00 },
+        { ADAU17X1_DAC_CONTROL0,                0x00 },
+        { ADAU17X1_DAC_CONTROL1,                0x00 },
+        { ADAU17X1_DAC_CONTROL2,                0x00 },
+        { ADAU17X1_SERIAL_PORT_PAD,             0x00 },
+        { ADAU17X1_CONTROL_PORT_PAD0,           0x00 },
+        { ADAU17X1_CONTROL_PORT_PAD1,           0x00 },
+        { ADAU17X1_DSP_SAMPLING_RATE,           0x01 },
+        { ADAU17X1_SERIAL_INPUT_ROUTE,          0x00 },
+        { ADAU17X1_SERIAL_OUTPUT_ROUTE,         0x00 },
+        { ADAU17X1_DSP_ENABLE,                  0x00 },
+        { ADAU17X1_DSP_RUN,                     0x00 },
+        { ADAU17X1_SERIAL_SAMPLING_RATE,        0x00 },
+};
+static const DECLARE_TLV_DB_SCALE(adau1781_speaker_tlv, 0, 200, 0);
+static const DECLARE_TLV_DB_RANGE(adau1781_pga_tlv,
+        0, 1, TLV_DB_SCALE_ITEM(0, 600, 0),
+        2, 3, TLV_DB_SCALE_ITEM(1000, 400, 0),
+        4, 4, TLV_DB_SCALE_ITEM(1700, 0, 0),
+        5, 7, TLV_DB_SCALE_ITEM(2000, 600, 0)
+);
+static const DECLARE_TLV_DB_RANGE(adau1781_beep_tlv,
+        0, 1, TLV_DB_SCALE_ITEM(0, 600, 0),
+        2, 3, TLV_DB_SCALE_ITEM(1000, 400, 0),
+        4, 4, TLV_DB_SCALE_ITEM(-2300, 0, 0),
+        5, 7, TLV_DB_SCALE_ITEM(2000, 600, 0)
+);
+static const DECLARE_TLV_DB_SCALE(adau1781_sidetone_tlv, -1800, 300, 1);
+static const char * const adau1781_speaker_bias_select_text[] = {
+        "Normal operation", "Power saving", "Enhanced performance",
+};
+static const char * const adau1781_bias_select_text[] = {
+        "Normal operation", "Extreme power saving", "Power saving",
+        "Enhanced performance",
+};
+static SOC_ENUM_SINGLE_DECL(adau1781_adc_bias_enum,
+                ADAU17X1_REC_POWER_MGMT, 3, adau1781_bias_select_text);
+static SOC_ENUM_SINGLE_DECL(adau1781_speaker_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 6, adau1781_speaker_bias_select_text);
+static SOC_ENUM_SINGLE_DECL(adau1781_dac_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 4, adau1781_bias_select_text);
+static SOC_ENUM_SINGLE_DECL(adau1781_playback_bias_enum,
+                ADAU17X1_PLAY_POWER_MGMT, 2, adau1781_bias_select_text);
+static SOC_ENUM_SINGLE_DECL(adau1781_capture_bias_enum,
+                ADAU17X1_REC_POWER_MGMT, 1, adau1781_bias_select_text);
+static const struct snd_kcontrol_new adau1781_controls[] = {
+        SOC_SINGLE_TLV("Beep Capture Volume", ADAU1781_DMIC_BEEP_CTRL, 0, 7, 0,
+                adau1781_beep_tlv),
+        SOC_DOUBLE_R_TLV("PGA Capture Volume", ADAU1781_LEFT_PGA,
+                ADAU1781_RIGHT_PGA, 5, 7, 0, adau1781_pga_tlv),
+        SOC_DOUBLE_R("PGA Capture Switch", ADAU1781_LEFT_PGA,
+                ADAU1781_RIGHT_PGA, 1, 1, 0),
+        SOC_DOUBLE_R("Lineout Playback Switch", ADAU1781_LEFT_LINEOUT,
+                ADAU1781_RIGHT_LINEOUT, 1, 1, 0),
+        SOC_SINGLE("Beep ZC Switch", ADAU1781_BEEP_ZC, 0, 1, 0),
+        SOC_SINGLE("Mono Playback Switch", ADAU1781_MONO_PLAYBACK_MIXER,
+                0, 1, 0),
+        SOC_SINGLE_TLV("Mono Playback Volume", ADAU1781_SPEAKER, 6, 3, 0,
+                adau1781_speaker_tlv),
+        SOC_ENUM("ADC Bias", adau1781_adc_bias_enum),
+        SOC_ENUM("DAC Bias", adau1781_dac_bias_enum),
+        SOC_ENUM("Capture Bias", adau1781_capture_bias_enum),
+        SOC_ENUM("Playback Bias", adau1781_playback_bias_enum),
+        SOC_ENUM("Speaker Bias", adau1781_speaker_bias_enum),
+};
+static const struct snd_kcontrol_new adau1781_beep_mixer_controls[] = {
+        SOC_DAPM_SINGLE("Beep Capture Switch", ADAU1781_DMIC_BEEP_CTRL,
+                3, 1, 0),
+};
+static const struct snd_kcontrol_new adau1781_left_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch",
+                ADAU1781_LEFT_PLAYBACK_MIXER, 5, 1, 0),
+        SOC_DAPM_SINGLE_TLV("Beep Playback Volume",
+                ADAU1781_LEFT_PLAYBACK_MIXER, 1, 8, 0, adau1781_sidetone_tlv),
+};
+static const struct snd_kcontrol_new adau1781_right_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch",
+                ADAU1781_RIGHT_PLAYBACK_MIXER, 6, 1, 0),
+        SOC_DAPM_SINGLE_TLV("Beep Playback Volume",
+                ADAU1781_LEFT_PLAYBACK_MIXER, 1, 8, 0, adau1781_sidetone_tlv),
+};
+static const struct snd_kcontrol_new adau1781_mono_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AUTODISABLE("Left Switch",
+                ADAU1781_MONO_PLAYBACK_MIXER, 7, 1, 0),
+        SOC_DAPM_SINGLE_AUTODISABLE("Right Switch",
+                 ADAU1781_MONO_PLAYBACK_MIXER, 6, 1, 0),
+        SOC_DAPM_SINGLE_TLV("Beep Playback Volume",
+                ADAU1781_MONO_PLAYBACK_MIXER, 2, 8, 0, adau1781_sidetone_tlv),
+};
+static int adau1781_dejitter_fixup(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        /* After any power changes have been made the dejitter circuit
+         * has to be reinitialized. */
+        regmap_write(adau->regmap, ADAU1781_DEJITTER, 0);
+        if (!adau->master)
+                regmap_write(adau->regmap, ADAU1781_DEJITTER, 5);
+        return 0;
+}
+static const struct snd_soc_dapm_widget adau1781_dapm_widgets[] = {
+        SND_SOC_DAPM_PGA("Left PGA", ADAU1781_LEFT_PGA, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Right PGA", ADAU1781_RIGHT_PGA, 0, 0, NULL, 0),
+        SND_SOC_DAPM_OUT_DRV("Speaker", ADAU1781_SPEAKER, 0, 0, NULL, 0),
+        SOC_MIXER_NAMED_CTL_ARRAY("Beep Mixer", ADAU17X1_MICBIAS, 4, 0,
+                adau1781_beep_mixer_controls),
+        SOC_MIXER_ARRAY("Left Lineout Mixer", SND_SOC_NOPM, 0, 0,
+                adau1781_left_mixer_controls),
+        SOC_MIXER_ARRAY("Right Lineout Mixer", SND_SOC_NOPM, 0, 0,
+                adau1781_right_mixer_controls),
+        SOC_MIXER_ARRAY("Mono Mixer", SND_SOC_NOPM, 0, 0,
+                adau1781_mono_mixer_controls),
+        SND_SOC_DAPM_SUPPLY("Serial Input Routing", ADAU1781_DIG_PWDN0,
+                2, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Serial Output Routing", ADAU1781_DIG_PWDN0,
+                3, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Clock Domain Transfer", ADAU1781_DIG_PWDN0,
+                5, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Serial Ports", ADAU1781_DIG_PWDN0, 4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC Engine", ADAU1781_DIG_PWDN0, 7, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC Engine", ADAU1781_DIG_PWDN1, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Digital Mic", ADAU1781_DIG_PWDN1, 1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Sound Engine", ADAU1781_DIG_PWDN0, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("SYSCLK", 1, ADAU1781_DIG_PWDN0, 1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Zero Crossing Detector", ADAU1781_DIG_PWDN1, 2, 0,
+                NULL, 0),
+        SND_SOC_DAPM_POST("Dejitter fixup", adau1781_dejitter_fixup),
+        SND_SOC_DAPM_INPUT("BEEP"),
+        SND_SOC_DAPM_OUTPUT("AOUTL"),
+        SND_SOC_DAPM_OUTPUT("AOUTR"),
+        SND_SOC_DAPM_OUTPUT("SP"),
+        SND_SOC_DAPM_INPUT("LMIC"),
+        SND_SOC_DAPM_INPUT("RMIC"),
+};
+static const struct snd_soc_dapm_route adau1781_dapm_routes[] = {
+        { "Left Lineout Mixer", NULL, "Left Playback Enable" },
+        { "Right Lineout Mixer", NULL, "Right Playback Enable" },
+        { "Left Lineout Mixer", "Beep Playback Volume", "Beep Mixer" },
+        { "Left Lineout Mixer", "Switch", "Left DAC" },
+        { "Right Lineout Mixer", "Beep Playback Volume", "Beep Mixer" },
+        { "Right Lineout Mixer", "Switch", "Right DAC" },
+        { "Mono Mixer", "Beep Playback Volume", "Beep Mixer" },
+        { "Mono Mixer", "Right Switch", "Right DAC" },
+        { "Mono Mixer", "Left Switch", "Left DAC" },
+        { "Speaker", NULL, "Mono Mixer" },
+        { "Mono Mixer", NULL, "SYSCLK" },
+        { "Left Lineout Mixer", NULL, "SYSCLK" },
+        { "Left Lineout Mixer", NULL, "SYSCLK" },
+        { "Beep Mixer", "Beep Capture Switch", "BEEP" },
+        { "Beep Mixer", NULL, "Zero Crossing Detector" },
+        { "Left DAC", NULL, "DAC Engine" },
+        { "Right DAC", NULL, "DAC Engine" },
+        { "Sound Engine", NULL, "SYSCLK" },
+        { "DSP", NULL, "Sound Engine" },
+        { "Left Decimator", NULL, "ADC Engine" },
+        { "Right Decimator", NULL, "ADC Engine" },
+        { "AIFCLK", NULL, "SYSCLK" },
+        { "Playback", NULL, "Serial Input Routing" },
+        { "Playback", NULL, "Serial Ports" },
+        { "Playback", NULL, "Clock Domain Transfer" },
+        { "Capture", NULL, "Serial Output Routing" },
+        { "Capture", NULL, "Serial Ports" },
+        { "Capture", NULL, "Clock Domain Transfer" },
+        { "AOUTL", NULL, "Left Lineout Mixer" },
+        { "AOUTR", NULL, "Right Lineout Mixer" },
+        { "SP", NULL, "Speaker" },
+};
+static const struct snd_soc_dapm_route adau1781_adc_dapm_routes[] = {
+        { "Left PGA", NULL, "LMIC" },
+        { "Right PGA", NULL, "RMIC" },
+        { "Left Decimator", NULL, "Left PGA" },
+        { "Right Decimator", NULL, "Right PGA" },
+};
+static const char * const adau1781_dmic_select_text[] = {
+        "DMIC1", "DMIC2",
+};
+static SOC_ENUM_SINGLE_VIRT_DECL(adau1781_dmic_select_enum,
+        adau1781_dmic_select_text);
+static const struct snd_kcontrol_new adau1781_dmic_mux =
+        SOC_DAPM_ENUM("DMIC Select", adau1781_dmic_select_enum);
+static const struct snd_soc_dapm_widget adau1781_dmic_dapm_widgets[] = {
+        SND_SOC_DAPM_MUX("DMIC Select", SND_SOC_NOPM, 0, 0, &adau1781_dmic_mux),
+        SND_SOC_DAPM_ADC("DMIC1", NULL, ADAU1781_DMIC_BEEP_CTRL, 4, 0),
+        SND_SOC_DAPM_ADC("DMIC2", NULL, ADAU1781_DMIC_BEEP_CTRL, 5, 0),
+};
+static const struct snd_soc_dapm_route adau1781_dmic_dapm_routes[] = {
+        { "DMIC1", NULL, "LMIC" },
+        { "DMIC2", NULL, "RMIC" },
+        { "DMIC1", NULL, "Digital Mic" },
+        { "DMIC2", NULL, "Digital Mic" },
+        { "DMIC Select", "DMIC1", "DMIC1" },
+        { "DMIC Select", "DMIC2", "DMIC2" },
+        { "Left Decimator", NULL, "DMIC Select" },
+        { "Right Decimator", NULL, "DMIC Select" },
+};
+static int adau1781_set_bias_level(struct snd_soc_codec *codec,
+                enum snd_soc_bias_level level)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN);
+                /* Precharge */
+                regmap_update_bits(adau->regmap, ADAU1781_DIG_PWDN1, 0x8, 0x8);
+                break;
+        case SND_SOC_BIAS_OFF:
+                regmap_update_bits(adau->regmap, ADAU1781_DIG_PWDN1, 0xc, 0x0);
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_SYSCLK_EN, 0);
+                break;
+        }
+        codec->dapm.bias_level = level;
+        return 0;
+}
+static bool adau1781_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case ADAU1781_DMIC_BEEP_CTRL:
+        case ADAU1781_LEFT_PGA:
+        case ADAU1781_RIGHT_PGA:
+        case ADAU1781_LEFT_PLAYBACK_MIXER:
+        case ADAU1781_RIGHT_PLAYBACK_MIXER:
+        case ADAU1781_MONO_PLAYBACK_MIXER:
+        case ADAU1781_LEFT_LINEOUT:
+        case ADAU1781_RIGHT_LINEOUT:
+        case ADAU1781_SPEAKER:
+        case ADAU1781_BEEP_ZC:
+        case ADAU1781_DEJITTER:
+        case ADAU1781_DIG_PWDN0:
+        case ADAU1781_DIG_PWDN1:
+                return true;
+        default:
+                break;
+        }
+        return adau17x1_readable_register(dev, reg);
+}
+static int adau1781_set_input_mode(struct adau *adau, unsigned int reg,
+        bool differential)
+{
+        unsigned int val;
+        if (differential)
+                val = ADAU1781_INPUT_DIFFERNTIAL;
+        else
+                val = 0;
+        return regmap_update_bits(adau->regmap, reg,
+                ADAU1781_INPUT_DIFFERNTIAL, val);
+}
+static int adau1781_codec_probe(struct snd_soc_codec *codec)
+{
+        struct adau1781_platform_data *pdata = dev_get_platdata(codec->dev);
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        const char *firmware;
+        int ret;
+        ret = adau17x1_add_widgets(codec);
+        if (ret)
+                return ret;
+        if (pdata) {
+                ret = adau1781_set_input_mode(adau, ADAU1781_LEFT_PGA,
+                        pdata->left_input_differential);
+                if (ret)
+                        return ret;
+                ret = adau1781_set_input_mode(adau, ADAU1781_RIGHT_PGA,
+                        pdata->right_input_differential);
+                if (ret)
+                        return ret;
+        }
+        if (pdata && pdata->use_dmic) {
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau1781_dmic_dapm_widgets,
+                        ARRAY_SIZE(adau1781_dmic_dapm_widgets));
+                if (ret)
+                        return ret;
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1781_dmic_dapm_routes,
+                        ARRAY_SIZE(adau1781_dmic_dapm_routes));
+                if (ret)
+                        return ret;
+        } else {
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau1781_adc_dapm_routes,
+                        ARRAY_SIZE(adau1781_adc_dapm_routes));
+                if (ret)
+                        return ret;
+        }
+        switch (adau->type) {
+        case ADAU1381:
+                firmware = ADAU1381_FIRMWARE;
+                break;
+        case ADAU1781:
+                firmware = ADAU1781_FIRMWARE;
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = adau17x1_add_routes(codec);
+        if (ret < 0)
+                return ret;
+        ret = adau17x1_load_firmware(adau, codec->dev, firmware);
+        if (ret)
+                dev_warn(codec->dev, "Failed to load firmware\n");
+        return 0;
+}
+static const struct snd_soc_codec_driver adau1781_codec_driver = {
+        .probe = adau1781_codec_probe,
+        .suspend = adau17x1_suspend,
+        .resume = adau17x1_resume,
+        .set_bias_level = adau1781_set_bias_level,
+        .controls = adau1781_controls,
+        .num_controls = ARRAY_SIZE(adau1781_controls),
+        .dapm_widgets = adau1781_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(adau1781_dapm_widgets),
+        .dapm_routes = adau1781_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(adau1781_dapm_routes),
+};
+#define ADAU1781_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \
+        SNDRV_PCM_FMTBIT_S32_LE)
+static struct snd_soc_dai_driver adau1781_dai_driver = {
+        .name = "adau-hifi",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1781_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 8,
+                .rates = SNDRV_PCM_RATE_8000_96000,
+                .formats = ADAU1781_FORMATS,
+        },
+        .ops = &adau17x1_dai_ops,
+};
+const struct regmap_config adau1781_regmap_config = {
+        .val_bits               = 8,
+        .reg_bits               = 16,
+        .max_register           = 0x40f8,
+        .reg_defaults           = adau1781_reg_defaults,
+        .num_reg_defaults       = ARRAY_SIZE(adau1781_reg_defaults),
+        .readable_reg           = adau1781_readable_register,
+        .volatile_reg           = adau17x1_volatile_register,
+        .cache_type             = REGCACHE_RBTREE,
+};
+EXPORT_SYMBOL_GPL(adau1781_regmap_config);
+int adau1781_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev))
+{
+        int ret;
+        ret = adau17x1_probe(dev, regmap, type, switch_mode);
+        if (ret)
+                return ret;
+        return snd_soc_register_codec(dev, &adau1781_codec_driver,
+                &adau1781_dai_driver, 1);
+}
+EXPORT_SYMBOL_GPL(adau1781_probe);
+MODULE_DESCRIPTION("ASoC ADAU1381/ADAU1781 driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau1781.h b/sound/soc/codecs/adau1781.h
new file mode 100644
index 000000000000..2b96e0a9ff2e
--- /dev/null
+++ b/sound/soc/codecs/adau1781.h
@@ -0,0 +1,23 @@
+/*
+ * ADAU1381/ADAU1781 driver
+ *
+ * Copyright 2014 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+#ifndef __SOUND_SOC_CODECS_ADAU1781_H__
+#define __SOUND_SOC_CODECS_ADAU1781_H__
+#include <linux/regmap.h>
+#include "adau17x1.h"
+struct device;
+int adau1781_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev));
+extern const struct regmap_config adau1781_regmap_config;
+#endif
diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c
new file mode 100644
index 000000000000..2961fae9670a
--- /dev/null
+++ b/sound/soc/codecs/adau17x1.c
@@ -0,0 +1,866 @@
+/*
+ * Common code for ADAU1X61 and ADAU1X81 codecs
+ *
+ * Copyright 2011-2014 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include <linux/gcd.h>
+#include <linux/i2c.h>
+#include <linux/spi/spi.h>
+#include <linux/regmap.h>
+#include "sigmadsp.h"
+#include "adau17x1.h"
+static const char * const adau17x1_capture_mixer_boost_text[] = {
+        "Normal operation", "Boost Level 1", "Boost Level 2", "Boost Level 3",
+};
+static SOC_ENUM_SINGLE_DECL(adau17x1_capture_boost_enum,
+        ADAU17X1_REC_POWER_MGMT, 5, adau17x1_capture_mixer_boost_text);
+static const char * const adau17x1_mic_bias_mode_text[] = {
+        "Normal operation", "High performance",
+};
+static SOC_ENUM_SINGLE_DECL(adau17x1_mic_bias_mode_enum,
+        ADAU17X1_MICBIAS, 3, adau17x1_mic_bias_mode_text);
+static const DECLARE_TLV_DB_MINMAX(adau17x1_digital_tlv, -9563, 0);
+static const struct snd_kcontrol_new adau17x1_controls[] = {
+        SOC_DOUBLE_R_TLV("Digital Capture Volume",
+                ADAU17X1_LEFT_INPUT_DIGITAL_VOL,
+                ADAU17X1_RIGHT_INPUT_DIGITAL_VOL,
+                0, 0xff, 1, adau17x1_digital_tlv),
+        SOC_DOUBLE_R_TLV("Digital Playback Volume", ADAU17X1_DAC_CONTROL1,
+                ADAU17X1_DAC_CONTROL2, 0, 0xff, 1, adau17x1_digital_tlv),
+        SOC_SINGLE("ADC High Pass Filter Switch", ADAU17X1_ADC_CONTROL,
+                5, 1, 0),
+        SOC_SINGLE("Playback De-emphasis Switch", ADAU17X1_DAC_CONTROL0,
+                2, 1, 0),
+        SOC_ENUM("Capture Boost", adau17x1_capture_boost_enum),
+        SOC_ENUM("Mic Bias Mode", adau17x1_mic_bias_mode_enum),
+};
+static int adau17x1_pll_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(w->codec);
+        int ret;
+        if (SND_SOC_DAPM_EVENT_ON(event)) {
+                adau->pll_regs[5] = 1;
+        } else {
+                adau->pll_regs[5] = 0;
+                /* Bypass the PLL when disabled, otherwise registers will become
+                 * inaccessible. */
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_CORECLK_SRC_PLL, 0);
+        }
+        /* The PLL register is 6 bytes long and can only be written at once. */
+        ret = regmap_raw_write(adau->regmap, ADAU17X1_PLL_CONTROL,
+                        adau->pll_regs, ARRAY_SIZE(adau->pll_regs));
+        if (SND_SOC_DAPM_EVENT_ON(event)) {
+                mdelay(5);
+                regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
+                        ADAU17X1_CLOCK_CONTROL_CORECLK_SRC_PLL,
+                        ADAU17X1_CLOCK_CONTROL_CORECLK_SRC_PLL);
+        }
+        return 0;
+}
+static const char * const adau17x1_mono_stereo_text[] = {
+        "Stereo",
+        "Mono Left Channel (L+R)",
+        "Mono Right Channel (L+R)",
+        "Mono (L+R)",
+};
+static SOC_ENUM_SINGLE_DECL(adau17x1_dac_mode_enum,
+        ADAU17X1_DAC_CONTROL0, 6, adau17x1_mono_stereo_text);
+static const struct snd_kcontrol_new adau17x1_dac_mode_mux =
+        SOC_DAPM_ENUM("DAC Mono-Stereo-Mode", adau17x1_dac_mode_enum);
+static const struct snd_soc_dapm_widget adau17x1_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY_S("PLL", 3, SND_SOC_NOPM, 0, 0, adau17x1_pll_event,
+                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY("AIFCLK", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MICBIAS", ADAU17X1_MICBIAS, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Left Playback Enable", ADAU17X1_PLAY_POWER_MGMT,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Right Playback Enable", ADAU17X1_PLAY_POWER_MGMT,
+                1, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("Left DAC Mode Mux", SND_SOC_NOPM, 0, 0,
+                &adau17x1_dac_mode_mux),
+        SND_SOC_DAPM_MUX("Right DAC Mode Mux", SND_SOC_NOPM, 0, 0,
+                &adau17x1_dac_mode_mux),
+        SND_SOC_DAPM_ADC("Left Decimator", NULL, ADAU17X1_ADC_CONTROL, 0, 0),
+        SND_SOC_DAPM_ADC("Right Decimator", NULL, ADAU17X1_ADC_CONTROL, 1, 0),
+        SND_SOC_DAPM_DAC("Left DAC", NULL, ADAU17X1_DAC_CONTROL0, 0, 0),
+        SND_SOC_DAPM_DAC("Right DAC", NULL, ADAU17X1_DAC_CONTROL0, 1, 0),
+};
+static const struct snd_soc_dapm_route adau17x1_dapm_routes[] = {
+        { "Left Decimator", NULL, "SYSCLK" },
+        { "Right Decimator", NULL, "SYSCLK" },
+        { "Left DAC", NULL, "SYSCLK" },
+        { "Right DAC", NULL, "SYSCLK" },
+        { "Capture", NULL, "SYSCLK" },
+        { "Playback", NULL, "SYSCLK" },
+        { "Left DAC", NULL, "Left DAC Mode Mux" },
+        { "Right DAC", NULL, "Right DAC Mode Mux" },
+        { "Capture", NULL, "AIFCLK" },
+        { "Playback", NULL, "AIFCLK" },
+};
+static const struct snd_soc_dapm_route adau17x1_dapm_pll_route = {
+        "SYSCLK", NULL, "PLL",
+};
+/*
+ * The MUX register for the Capture and Playback MUXs selects either DSP as
+ * source/destination or one of the TDM slots. The TDM slot is selected via
+ * snd_soc_dai_set_tdm_slot(), so we only expose whether to go to the DSP or
+ * directly to the DAI interface with this control.
+ */
+static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
+        struct snd_soc_dapm_update update;
+        unsigned int stream = e->shift_l;
+        unsigned int val, change;
+        int reg;
+        if (ucontrol->value.enumerated.item[0] >= e->items)
+                return -EINVAL;
+        switch (ucontrol->value.enumerated.item[0]) {
+        case 0:
+                val = 0;
+                adau->dsp_bypass[stream] = false;
+                break;
+        default:
+                val = (adau->tdm_slot[stream] * 2) + 1;
+                adau->dsp_bypass[stream] = true;
+                break;
+        }
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                reg = ADAU17X1_SERIAL_INPUT_ROUTE;
+        else
+                reg = ADAU17X1_SERIAL_OUTPUT_ROUTE;
+        change = snd_soc_test_bits(codec, reg, 0xff, val);
+        if (change) {
+                update.kcontrol = kcontrol;
+                update.mask = 0xff;
+                update.reg = reg;
+                update.val = val;
+                snd_soc_dapm_mux_update_power(&codec->dapm, kcontrol,
+                                ucontrol->value.enumerated.item[0], e, &update);
+        }
+        return change;
+}
+static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
+        unsigned int stream = e->shift_l;
+        unsigned int reg, val;
+        int ret;
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                reg = ADAU17X1_SERIAL_INPUT_ROUTE;
+        else
+                reg = ADAU17X1_SERIAL_OUTPUT_ROUTE;
+        ret = regmap_read(adau->regmap, reg, &val);
+        if (ret)
+                return ret;
+        if (val != 0)
+                val = 1;
+        ucontrol->value.enumerated.item[0] = val;
+        return 0;
+}
+#define DECLARE_ADAU17X1_DSP_MUX_CTRL(_name, _label, _stream, _text) \
+        const struct snd_kcontrol_new _name = \
+                SOC_DAPM_ENUM_EXT(_label, (const struct soc_enum)\
+                        SOC_ENUM_SINGLE(SND_SOC_NOPM, _stream, \
+                                ARRAY_SIZE(_text), _text), \
+                        adau17x1_dsp_mux_enum_get, adau17x1_dsp_mux_enum_put)
+static const char * const adau17x1_dac_mux_text[] = {
+        "DSP",
+        "AIFIN",
+};
+static const char * const adau17x1_capture_mux_text[] = {
+        "DSP",
+        "Decimator",
+};
+static DECLARE_ADAU17X1_DSP_MUX_CTRL(adau17x1_dac_mux, "DAC Playback Mux",
+        SNDRV_PCM_STREAM_PLAYBACK, adau17x1_dac_mux_text);
+static DECLARE_ADAU17X1_DSP_MUX_CTRL(adau17x1_capture_mux, "Capture Mux",
+        SNDRV_PCM_STREAM_CAPTURE, adau17x1_capture_mux_text);
+static const struct snd_soc_dapm_widget adau17x1_dsp_dapm_widgets[] = {
+        SND_SOC_DAPM_PGA("DSP", ADAU17X1_DSP_RUN, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SIGGEN("DSP Siggen"),
+        SND_SOC_DAPM_MUX("DAC Playback Mux", SND_SOC_NOPM, 0, 0,
+                &adau17x1_dac_mux),
+        SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0,
+                &adau17x1_capture_mux),
+};
+static const struct snd_soc_dapm_route adau17x1_dsp_dapm_routes[] = {
+        { "DAC Playback Mux", "DSP", "DSP" },
+        { "DAC Playback Mux", "AIFIN", "Playback" },
+        { "Left DAC Mode Mux", "Stereo", "DAC Playback Mux" },
+        { "Left DAC Mode Mux", "Mono (L+R)", "DAC Playback Mux" },
+        { "Left DAC Mode Mux", "Mono Left Channel (L+R)", "DAC Playback Mux" },
+        { "Right DAC Mode Mux", "Stereo", "DAC Playback Mux" },
+        { "Right DAC Mode Mux", "Mono (L+R)", "DAC Playback Mux" },
+        { "Right DAC Mode Mux", "Mono Right Channel (L+R)", "DAC Playback Mux" },
+        { "Capture Mux", "DSP", "DSP" },
+        { "Capture Mux", "Decimator", "Left Decimator" },
+        { "Capture Mux", "Decimator", "Right Decimator" },
+        { "Capture", NULL, "Capture Mux" },
+        { "DSP", NULL, "DSP Siggen" },
+        { "DSP", NULL, "Left Decimator" },
+        { "DSP", NULL, "Right Decimator" },
+};
+static const struct snd_soc_dapm_route adau17x1_no_dsp_dapm_routes[] = {
+        { "Left DAC Mode Mux", "Stereo", "Playback" },
+        { "Left DAC Mode Mux", "Mono (L+R)", "Playback" },
+        { "Left DAC Mode Mux", "Mono Left Channel (L+R)", "Playback" },
+        { "Right DAC Mode Mux", "Stereo", "Playback" },
+        { "Right DAC Mode Mux", "Mono (L+R)", "Playback" },
+        { "Right DAC Mode Mux", "Mono Right Channel (L+R)", "Playback" },
+        { "Capture", NULL, "Left Decimator" },
+        { "Capture", NULL, "Right Decimator" },
+};
+bool adau17x1_has_dsp(struct adau *adau)
+{
+        switch (adau->type) {
+        case ADAU1761:
+        case ADAU1381:
+        case ADAU1781:
+                return true;
+        default:
+                return false;
+        }
+}
+EXPORT_SYMBOL_GPL(adau17x1_has_dsp);
+static int adau17x1_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 adau *adau = snd_soc_codec_get_drvdata(codec);
+        unsigned int val, div, dsp_div;
+        unsigned int freq;
+        if (adau->clk_src == ADAU17X1_CLK_SRC_PLL)
+                freq = adau->pll_freq;
+        else
+                freq = adau->sysclk;
+        if (freq % params_rate(params) != 0)
+                return -EINVAL;
+        switch (freq / params_rate(params)) {
+        case 1024: /* fs */
+                div = 0;
+                dsp_div = 1;
+                break;
+        case 6144: /* fs / 6 */
+                div = 1;
+                dsp_div = 6;
+                break;
+        case 4096: /* fs / 4 */
+                div = 2;
+                dsp_div = 5;
+                break;
+        case 3072: /* fs / 3 */
+                div = 3;
+                dsp_div = 4;
+                break;
+        case 2048: /* fs / 2 */
+                div = 4;
+                dsp_div = 3;
+                break;
+        case 1536: /* fs / 1.5 */
+                div = 5;
+                dsp_div = 2;
+                break;
+        case 512: /* fs / 0.5 */
+                div = 6;
+                dsp_div = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,
+                ADAU17X1_CONVERTER0_CONVSR_MASK, div);
+        if (adau17x1_has_dsp(adau)) {
+                regmap_write(adau->regmap, ADAU17X1_SERIAL_SAMPLING_RATE, div);
+                regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dsp_div);
+        }
+        if (adau->dai_fmt != SND_SOC_DAIFMT_RIGHT_J)
+                return 0;
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                val = ADAU17X1_SERIAL_PORT1_DELAY16;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                val = ADAU17X1_SERIAL_PORT1_DELAY8;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                val = ADAU17X1_SERIAL_PORT1_DELAY0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return regmap_update_bits(adau->regmap, ADAU17X1_SERIAL_PORT1,
+                        ADAU17X1_SERIAL_PORT1_DELAY_MASK, val);
+}
+static int adau17x1_set_dai_pll(struct snd_soc_dai *dai, int pll_id,
+        int source, unsigned int freq_in, unsigned int freq_out)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        unsigned int r, n, m, i, j;
+        unsigned int div;
+        int ret;
+        if (freq_in < 8000000 || freq_in > 27000000)
+                return -EINVAL;
+        if (!freq_out) {
+                r = 0;
+                n = 0;
+                m = 0;
+                div = 0;
+        } else {
+                if (freq_out % freq_in != 0) {
+                        div = DIV_ROUND_UP(freq_in, 13500000);
+                        freq_in /= div;
+                        r = freq_out / freq_in;
+                        i = freq_out % freq_in;
+                        j = gcd(i, freq_in);
+                        n = i / j;
+                        m = freq_in / j;
+                        div--;
+                } else {
+                        r = freq_out / freq_in;
+                        n = 0;
+                        m = 0;
+                        div = 0;
+                }
+                if (n > 0xffff || m > 0xffff || div > 3 || r > 8 || r < 2)
+                        return -EINVAL;
+        }
+        adau->pll_regs[0] = m >> 8;
+        adau->pll_regs[1] = m & 0xff;
+        adau->pll_regs[2] = n >> 8;
+        adau->pll_regs[3] = n & 0xff;
+        adau->pll_regs[4] = (r << 3) | (div << 1);
+        if (m != 0)
+                adau->pll_regs[4] |= 1; /* Fractional mode */
+        /* The PLL register is 6 bytes long and can only be written at once. */
+        ret = regmap_raw_write(adau->regmap, ADAU17X1_PLL_CONTROL,
+                        adau->pll_regs, ARRAY_SIZE(adau->pll_regs));
+        if (ret)
+                return ret;
+        adau->pll_freq = freq_out;
+        return 0;
+}
+static int adau17x1_set_dai_sysclk(struct snd_soc_dai *dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(dai->codec);
+        struct snd_soc_dapm_context *dapm = &dai->codec->dapm;
+        switch (clk_id) {
+        case ADAU17X1_CLK_SRC_MCLK:
+        case ADAU17X1_CLK_SRC_PLL:
+                break;
+        default:
+                return -EINVAL;
+        }
+        adau->sysclk = freq;
+        if (adau->clk_src != clk_id) {
+                if (clk_id == ADAU17X1_CLK_SRC_PLL) {
+                        snd_soc_dapm_add_routes(dapm,
+                                &adau17x1_dapm_pll_route, 1);
+                } else {
+                        snd_soc_dapm_del_routes(dapm,
+                                &adau17x1_dapm_pll_route, 1);
+                }
+        }
+        adau->clk_src = clk_id;
+        return 0;
+}
+static int adau17x1_set_dai_fmt(struct snd_soc_dai *dai,
+                unsigned int fmt)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(dai->codec);
+        unsigned int ctrl0, ctrl1;
+        int lrclk_pol;
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                ctrl0 = ADAU17X1_SERIAL_PORT0_MASTER;
+                adau->master = true;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                ctrl0 = 0;
+                adau->master = false;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                lrclk_pol = 0;
+                ctrl1 = ADAU17X1_SERIAL_PORT1_DELAY1;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+        case SND_SOC_DAIFMT_RIGHT_J:
+                lrclk_pol = 1;
+                ctrl1 = ADAU17X1_SERIAL_PORT1_DELAY0;
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                lrclk_pol = 1;
+                ctrl0 |= ADAU17X1_SERIAL_PORT0_PULSE_MODE;
+                ctrl1 = ADAU17X1_SERIAL_PORT1_DELAY1;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                lrclk_pol = 1;
+                ctrl0 |= ADAU17X1_SERIAL_PORT0_PULSE_MODE;
+                ctrl1 = ADAU17X1_SERIAL_PORT1_DELAY0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                ctrl0 |= ADAU17X1_SERIAL_PORT0_BCLK_POL;
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
+                lrclk_pol = !lrclk_pol;
+                break;
+        case SND_SOC_DAIFMT_IB_IF:
+                ctrl0 |= ADAU17X1_SERIAL_PORT0_BCLK_POL;
+                lrclk_pol = !lrclk_pol;
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (lrclk_pol)
+                ctrl0 |= ADAU17X1_SERIAL_PORT0_LRCLK_POL;
+        regmap_write(adau->regmap, ADAU17X1_SERIAL_PORT0, ctrl0);
+        regmap_write(adau->regmap, ADAU17X1_SERIAL_PORT1, ctrl1);
+        adau->dai_fmt = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+        return 0;
+}
+static int adau17x1_set_dai_tdm_slot(struct snd_soc_dai *dai,
+        unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(dai->codec);
+        unsigned int ser_ctrl0, ser_ctrl1;
+        unsigned int conv_ctrl0, conv_ctrl1;
+        /* I2S mode */
+        if (slots == 0) {
+                slots = 2;
+                rx_mask = 3;
+                tx_mask = 3;
+                slot_width = 32;
+        }
+        switch (slots) {
+        case 2:
+                ser_ctrl0 = ADAU17X1_SERIAL_PORT0_STEREO;
+                break;
+        case 4:
+                ser_ctrl0 = ADAU17X1_SERIAL_PORT0_TDM4;
+                break;
+        case 8:
+                if (adau->type == ADAU1361)
+                        return -EINVAL;
+                ser_ctrl0 = ADAU17X1_SERIAL_PORT0_TDM8;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (slot_width * slots) {
+        case 32:
+                if (adau->type == ADAU1761)
+                        return -EINVAL;
+                ser_ctrl1 = ADAU17X1_SERIAL_PORT1_BCLK32;
+                break;
+        case 64:
+                ser_ctrl1 = ADAU17X1_SERIAL_PORT1_BCLK64;
+                break;
+        case 48:
+                ser_ctrl1 = ADAU17X1_SERIAL_PORT1_BCLK48;
+                break;
+        case 128:
+                ser_ctrl1 = ADAU17X1_SERIAL_PORT1_BCLK128;
+                break;
+        case 256:
+                if (adau->type == ADAU1361)
+                        return -EINVAL;
+                ser_ctrl1 = ADAU17X1_SERIAL_PORT1_BCLK256;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (rx_mask) {
+        case 0x03:
+                conv_ctrl1 = ADAU17X1_CONVERTER1_ADC_PAIR(1);
+                adau->tdm_slot[SNDRV_PCM_STREAM_CAPTURE] = 0;
+                break;
+        case 0x0c:
+                conv_ctrl1 = ADAU17X1_CONVERTER1_ADC_PAIR(2);
+                adau->tdm_slot[SNDRV_PCM_STREAM_CAPTURE] = 1;
+                break;
+        case 0x30:
+                conv_ctrl1 = ADAU17X1_CONVERTER1_ADC_PAIR(3);
+                adau->tdm_slot[SNDRV_PCM_STREAM_CAPTURE] = 2;
+                break;
+        case 0xc0:
+                conv_ctrl1 = ADAU17X1_CONVERTER1_ADC_PAIR(4);
+                adau->tdm_slot[SNDRV_PCM_STREAM_CAPTURE] = 3;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (tx_mask) {
+        case 0x03:
+                conv_ctrl0 = ADAU17X1_CONVERTER0_DAC_PAIR(1);
+                adau->tdm_slot[SNDRV_PCM_STREAM_PLAYBACK] = 0;
+                break;
+        case 0x0c:
+                conv_ctrl0 = ADAU17X1_CONVERTER0_DAC_PAIR(2);
+                adau->tdm_slot[SNDRV_PCM_STREAM_PLAYBACK] = 1;
+                break;
+        case 0x30:
+                conv_ctrl0 = ADAU17X1_CONVERTER0_DAC_PAIR(3);
+                adau->tdm_slot[SNDRV_PCM_STREAM_PLAYBACK] = 2;
+                break;
+        case 0xc0:
+                conv_ctrl0 = ADAU17X1_CONVERTER0_DAC_PAIR(4);
+                adau->tdm_slot[SNDRV_PCM_STREAM_PLAYBACK] = 3;
+                break;
+        default:
+                return -EINVAL;
+        }
+        regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,
+                ADAU17X1_CONVERTER0_DAC_PAIR_MASK, conv_ctrl0);
+        regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER1,
+                ADAU17X1_CONVERTER1_ADC_PAIR_MASK, conv_ctrl1);
+        regmap_update_bits(adau->regmap, ADAU17X1_SERIAL_PORT0,
+                ADAU17X1_SERIAL_PORT0_TDM_MASK, ser_ctrl0);
+        regmap_update_bits(adau->regmap, ADAU17X1_SERIAL_PORT1,
+                ADAU17X1_SERIAL_PORT1_BCLK_MASK, ser_ctrl1);
+        if (!adau17x1_has_dsp(adau))
+                return 0;
+        if (adau->dsp_bypass[SNDRV_PCM_STREAM_PLAYBACK]) {
+                regmap_write(adau->regmap, ADAU17X1_SERIAL_INPUT_ROUTE,
+                        (adau->tdm_slot[SNDRV_PCM_STREAM_PLAYBACK] * 2) + 1);
+        }
+        if (adau->dsp_bypass[SNDRV_PCM_STREAM_CAPTURE]) {
+                regmap_write(adau->regmap, ADAU17X1_SERIAL_OUTPUT_ROUTE,
+                        (adau->tdm_slot[SNDRV_PCM_STREAM_CAPTURE] * 2) + 1);
+        }
+        return 0;
+}
+const struct snd_soc_dai_ops adau17x1_dai_ops = {
+        .hw_params      = adau17x1_hw_params,
+        .set_sysclk     = adau17x1_set_dai_sysclk,
+        .set_fmt        = adau17x1_set_dai_fmt,
+        .set_pll        = adau17x1_set_dai_pll,
+        .set_tdm_slot   = adau17x1_set_dai_tdm_slot,
+};
+EXPORT_SYMBOL_GPL(adau17x1_dai_ops);
+int adau17x1_set_micbias_voltage(struct snd_soc_codec *codec,
+        enum adau17x1_micbias_voltage micbias)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        switch (micbias) {
+        case ADAU17X1_MICBIAS_0_90_AVDD:
+        case ADAU17X1_MICBIAS_0_65_AVDD:
+                break;
+        default:
+                return -EINVAL;
+        }
+        return regmap_write(adau->regmap, ADAU17X1_MICBIAS, micbias << 2);
+}
+EXPORT_SYMBOL_GPL(adau17x1_set_micbias_voltage);
+bool adau17x1_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case ADAU17X1_CLOCK_CONTROL:
+        case ADAU17X1_PLL_CONTROL:
+        case ADAU17X1_REC_POWER_MGMT:
+        case ADAU17X1_MICBIAS:
+        case ADAU17X1_SERIAL_PORT0:
+        case ADAU17X1_SERIAL_PORT1:
+        case ADAU17X1_CONVERTER0:
+        case ADAU17X1_CONVERTER1:
+        case ADAU17X1_LEFT_INPUT_DIGITAL_VOL:
+        case ADAU17X1_RIGHT_INPUT_DIGITAL_VOL:
+        case ADAU17X1_ADC_CONTROL:
+        case ADAU17X1_PLAY_POWER_MGMT:
+        case ADAU17X1_DAC_CONTROL0:
+        case ADAU17X1_DAC_CONTROL1:
+        case ADAU17X1_DAC_CONTROL2:
+        case ADAU17X1_SERIAL_PORT_PAD:
+        case ADAU17X1_CONTROL_PORT_PAD0:
+        case ADAU17X1_CONTROL_PORT_PAD1:
+        case ADAU17X1_DSP_SAMPLING_RATE:
+        case ADAU17X1_SERIAL_INPUT_ROUTE:
+        case ADAU17X1_SERIAL_OUTPUT_ROUTE:
+        case ADAU17X1_DSP_ENABLE:
+        case ADAU17X1_DSP_RUN:
+        case ADAU17X1_SERIAL_SAMPLING_RATE:
+                return true;
+        default:
+                break;
+        }
+        return false;
+}
+EXPORT_SYMBOL_GPL(adau17x1_readable_register);
+bool adau17x1_volatile_register(struct device *dev, unsigned int reg)
+{
+        /* SigmaDSP parameter and program memory */
+        if (reg < 0x4000)
+                return true;
+        switch (reg) {
+        /* The PLL register is 6 bytes long */
+        case ADAU17X1_PLL_CONTROL:
+        case ADAU17X1_PLL_CONTROL + 1:
+        case ADAU17X1_PLL_CONTROL + 2:
+        case ADAU17X1_PLL_CONTROL + 3:
+        case ADAU17X1_PLL_CONTROL + 4:
+        case ADAU17X1_PLL_CONTROL + 5:
+                return true;
+        default:
+                break;
+        }
+        return false;
+}
+EXPORT_SYMBOL_GPL(adau17x1_volatile_register);
+int adau17x1_load_firmware(struct adau *adau, struct device *dev,
+        const char *firmware)
+{
+        int ret;
+        int dspsr;
+        ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr);
+        if (ret)
+                return ret;
+        regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 1);
+        regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, 0xf);
+        ret = process_sigma_firmware_regmap(dev, adau->regmap, firmware);
+        if (ret) {
+                regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 0);
+                return ret;
+        }
+        regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dspsr);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adau17x1_load_firmware);
+int adau17x1_add_widgets(struct snd_soc_codec *codec)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        ret = snd_soc_add_codec_controls(codec, adau17x1_controls,
+                ARRAY_SIZE(adau17x1_controls));
+        if (ret)
+                return ret;
+        ret = snd_soc_dapm_new_controls(&codec->dapm, adau17x1_dapm_widgets,
+                ARRAY_SIZE(adau17x1_dapm_widgets));
+        if (ret)
+                return ret;
+        if (adau17x1_has_dsp(adau)) {
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                        adau17x1_dsp_dapm_widgets,
+                        ARRAY_SIZE(adau17x1_dsp_dapm_widgets));
+        }
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adau17x1_add_widgets);
+int adau17x1_add_routes(struct snd_soc_codec *codec)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        int ret;
+        ret = snd_soc_dapm_add_routes(&codec->dapm, adau17x1_dapm_routes,
+                ARRAY_SIZE(adau17x1_dapm_routes));
+        if (ret)
+                return ret;
+        if (adau17x1_has_dsp(adau)) {
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau17x1_dsp_dapm_routes,
+                        ARRAY_SIZE(adau17x1_dsp_dapm_routes));
+        } else {
+                ret = snd_soc_dapm_add_routes(&codec->dapm,
+                        adau17x1_no_dsp_dapm_routes,
+                        ARRAY_SIZE(adau17x1_no_dsp_dapm_routes));
+        }
+        return ret;
+}
+EXPORT_SYMBOL_GPL(adau17x1_add_routes);
+int adau17x1_suspend(struct snd_soc_codec *codec)
+{
+        codec->driver->set_bias_level(codec, SND_SOC_BIAS_OFF);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adau17x1_suspend);
+int adau17x1_resume(struct snd_soc_codec *codec)
+{
+        struct adau *adau = snd_soc_codec_get_drvdata(codec);
+        if (adau->switch_mode)
+                adau->switch_mode(codec->dev);
+        codec->driver->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        regcache_sync(adau->regmap);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adau17x1_resume);
+int adau17x1_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev))
+{
+        struct adau *adau;
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+        adau = devm_kzalloc(dev, sizeof(*adau), GFP_KERNEL);
+        if (!adau)
+                return -ENOMEM;
+        adau->regmap = regmap;
+        adau->switch_mode = switch_mode;
+        adau->type = type;
+        dev_set_drvdata(dev, adau);
+        if (switch_mode)
+                switch_mode(dev);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adau17x1_probe);
+MODULE_DESCRIPTION("ASoC ADAU1X61/ADAU1X81 common code");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/adau17x1.h b/sound/soc/codecs/adau17x1.h
new file mode 100644
index 000000000000..3ffabaf4c7a8
--- /dev/null
+++ b/sound/soc/codecs/adau17x1.h
@@ -0,0 +1,124 @@
+#ifndef __ADAU17X1_H__
+#define __ADAU17X1_H__
+#include <linux/regmap.h>
+#include <linux/platform_data/adau17x1.h>
+enum adau17x1_type {
+        ADAU1361,
+        ADAU1761,
+        ADAU1381,
+        ADAU1781,
+};
+enum adau17x1_pll {
+        ADAU17X1_PLL,
+};
+enum adau17x1_pll_src {
+        ADAU17X1_PLL_SRC_MCLK,
+};
+enum adau17x1_clk_src {
+        ADAU17X1_CLK_SRC_MCLK,
+        ADAU17X1_CLK_SRC_PLL,
+};
+struct adau {
+        unsigned int sysclk;
+        unsigned int pll_freq;
+        enum adau17x1_clk_src clk_src;
+        enum adau17x1_type type;
+        void (*switch_mode)(struct device *dev);
+        unsigned int dai_fmt;
+        uint8_t pll_regs[6];
+        bool master;
+        unsigned int tdm_slot[2];
+        bool dsp_bypass[2];
+        struct regmap *regmap;
+};
+int adau17x1_add_widgets(struct snd_soc_codec *codec);
+int adau17x1_add_routes(struct snd_soc_codec *codec);
+int adau17x1_probe(struct device *dev, struct regmap *regmap,
+        enum adau17x1_type type, void (*switch_mode)(struct device *dev));
+int adau17x1_set_micbias_voltage(struct snd_soc_codec *codec,
+        enum adau17x1_micbias_voltage micbias);
+bool adau17x1_readable_register(struct device *dev, unsigned int reg);
+bool adau17x1_volatile_register(struct device *dev, unsigned int reg);
+int adau17x1_suspend(struct snd_soc_codec *codec);
+int adau17x1_resume(struct snd_soc_codec *codec);
+extern const struct snd_soc_dai_ops adau17x1_dai_ops;
+int adau17x1_load_firmware(struct adau *adau, struct device *dev,
+        const char *firmware);
+bool adau17x1_has_dsp(struct adau *adau);
+#define ADAU17X1_CLOCK_CONTROL                  0x4000
+#define ADAU17X1_PLL_CONTROL                    0x4002
+#define ADAU17X1_REC_POWER_MGMT                 0x4009
+#define ADAU17X1_MICBIAS                        0x4010
+#define ADAU17X1_SERIAL_PORT0                   0x4015
+#define ADAU17X1_SERIAL_PORT1                   0x4016
+#define ADAU17X1_CONVERTER0                     0x4017
+#define ADAU17X1_CONVERTER1                     0x4018
+#define ADAU17X1_LEFT_INPUT_DIGITAL_VOL         0x401a
+#define ADAU17X1_RIGHT_INPUT_DIGITAL_VOL        0x401b
+#define ADAU17X1_ADC_CONTROL                    0x4019
+#define ADAU17X1_PLAY_POWER_MGMT                0x4029
+#define ADAU17X1_DAC_CONTROL0                   0x402a
+#define ADAU17X1_DAC_CONTROL1                   0x402b
+#define ADAU17X1_DAC_CONTROL2                   0x402c
+#define ADAU17X1_SERIAL_PORT_PAD                0x402d
+#define ADAU17X1_CONTROL_PORT_PAD0              0x402f
+#define ADAU17X1_CONTROL_PORT_PAD1              0x4030
+#define ADAU17X1_DSP_SAMPLING_RATE              0x40eb
+#define ADAU17X1_SERIAL_INPUT_ROUTE             0x40f2
+#define ADAU17X1_SERIAL_OUTPUT_ROUTE            0x40f3
+#define ADAU17X1_DSP_ENABLE                     0x40f5
+#define ADAU17X1_DSP_RUN                        0x40f6
+#define ADAU17X1_SERIAL_SAMPLING_RATE           0x40f8
+#define ADAU17X1_SERIAL_PORT0_BCLK_POL          BIT(4)
+#define ADAU17X1_SERIAL_PORT0_LRCLK_POL         BIT(3)
+#define ADAU17X1_SERIAL_PORT0_MASTER            BIT(0)
+#define ADAU17X1_SERIAL_PORT1_DELAY1            0x00
+#define ADAU17X1_SERIAL_PORT1_DELAY0            0x01
+#define ADAU17X1_SERIAL_PORT1_DELAY8            0x02
+#define ADAU17X1_SERIAL_PORT1_DELAY16           0x03
+#define ADAU17X1_SERIAL_PORT1_DELAY_MASK        0x03
+#define ADAU17X1_CLOCK_CONTROL_INFREQ_MASK      0x6
+#define ADAU17X1_CLOCK_CONTROL_CORECLK_SRC_PLL  BIT(3)
+#define ADAU17X1_CLOCK_CONTROL_SYSCLK_EN        BIT(0)
+#define ADAU17X1_SERIAL_PORT1_BCLK32            (0x0 << 5)
+#define ADAU17X1_SERIAL_PORT1_BCLK48            (0x1 << 5)
+#define ADAU17X1_SERIAL_PORT1_BCLK64            (0x2 << 5)
+#define ADAU17X1_SERIAL_PORT1_BCLK128           (0x3 << 5)
+#define ADAU17X1_SERIAL_PORT1_BCLK256           (0x4 << 5)
+#define ADAU17X1_SERIAL_PORT1_BCLK_MASK         (0x7 << 5)
+#define ADAU17X1_SERIAL_PORT0_STEREO            (0x0 << 1)
+#define ADAU17X1_SERIAL_PORT0_TDM4              (0x1 << 1)
+#define ADAU17X1_SERIAL_PORT0_TDM8              (0x2 << 1)
+#define ADAU17X1_SERIAL_PORT0_TDM_MASK          (0x3 << 1)
+#define ADAU17X1_SERIAL_PORT0_PULSE_MODE        BIT(5)
+#define ADAU17X1_CONVERTER0_DAC_PAIR(x)         (((x) - 1) << 5)
+#define ADAU17X1_CONVERTER0_DAC_PAIR_MASK       (0x3 << 5)
+#define ADAU17X1_CONVERTER1_ADC_PAIR(x)         ((x) - 1)
+#define ADAU17X1_CONVERTER1_ADC_PAIR_MASK       0x3
+#define ADAU17X1_CONVERTER0_CONVSR_MASK         0x7
+#endif
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index 5bb134b4ab9b..fdc4bd27b0df 100644
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -763,14 +763,14 @@ static int cs42l56_set_sysclk(struct snd_soc_dai *codec_dai,
        case CS42L56_MCLK_11P2896MHZ:
        case CS42L56_MCLK_12MHZ:
        case CS42L56_MCLK_12P288MHZ:
-                cs42l56->mclk_div2 = 1;
+                cs42l56->mclk_div2 = CS42L56_MCLK_DIV2;
                cs42l56->mclk_prediv = 0;
                break;
        case CS42L56_MCLK_22P5792MHZ:
        case CS42L56_MCLK_24MHZ:
        case CS42L56_MCLK_24P576MHZ:
-                cs42l56->mclk_div2 = 1;
+                cs42l56->mclk_div2 = CS42L56_MCLK_DIV2;
-                cs42l56->mclk_prediv = 1;
+                cs42l56->mclk_prediv = CS42L56_MCLK_PREDIV;
                break;
        default:
                return -EINVAL;
@@ -844,57 +844,49 @@ static int cs42l56_digital_mute(struct snd_soc_dai *dai, int mute)
                /* Hit the DSP Mixer first */
                snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL,
                                    CS42L56_ADCAMIX_MUTE_MASK |
-                                CS42L56_ADCBMIX_MUTE_MASK |
+                                    CS42L56_ADCBMIX_MUTE_MASK |
-                                CS42L56_PCMAMIX_MUTE_MASK |
+                                    CS42L56_PCMAMIX_MUTE_MASK |
-                                CS42L56_PCMBMIX_MUTE_MASK |
+                                    CS42L56_PCMBMIX_MUTE_MASK |
-                                CS42L56_MSTB_MUTE_MASK |
+                                    CS42L56_MSTB_MUTE_MASK |
-                                CS42L56_MSTA_MUTE_MASK,
+                                    CS42L56_MSTA_MUTE_MASK,
-                                CS42L56_MUTE);
+                                    CS42L56_MUTE_ALL);
                /* Mute ADC's */
                snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL,
-                                CS42L56_ADCA_MUTE_MASK |
+                                    CS42L56_ADCA_MUTE_MASK |
-                                CS42L56_ADCB_MUTE_MASK,
+                                    CS42L56_ADCB_MUTE_MASK,
-                                CS42L56_MUTE);
+                                    CS42L56_MUTE_ALL);
                /* HP And LO */
                snd_soc_update_bits(codec, CS42L56_HPA_VOLUME,
-                                CS42L56_HP_MUTE_MASK,
+                                    CS42L56_HP_MUTE_MASK, CS42L56_MUTE_ALL);
-                                CS42L56_MUTE);
                snd_soc_update_bits(codec, CS42L56_HPB_VOLUME,
-                                CS42L56_HP_MUTE_MASK,
+                                    CS42L56_HP_MUTE_MASK, CS42L56_MUTE_ALL);
-                                CS42L56_MUTE);
                snd_soc_update_bits(codec, CS42L56_LOA_VOLUME,
-                                CS42L56_LO_MUTE_MASK,
+                                    CS42L56_LO_MUTE_MASK, CS42L56_MUTE_ALL);
-                                CS42L56_MUTE);
                snd_soc_update_bits(codec, CS42L56_LOB_VOLUME,
-                                CS42L56_LO_MUTE_MASK,
+                                    CS42L56_LO_MUTE_MASK, CS42L56_MUTE_ALL);
-                                CS42L56_MUTE);
        } else {
                snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL,
                                    CS42L56_ADCAMIX_MUTE_MASK |
-                                CS42L56_ADCBMIX_MUTE_MASK |
+                                    CS42L56_ADCBMIX_MUTE_MASK |
-                                CS42L56_PCMAMIX_MUTE_MASK |
+                                    CS42L56_PCMAMIX_MUTE_MASK |
-                                CS42L56_PCMBMIX_MUTE_MASK |
+                                    CS42L56_PCMBMIX_MUTE_MASK |
-                                CS42L56_MSTB_MUTE_MASK |
+                                    CS42L56_MSTB_MUTE_MASK |
-                                CS42L56_MSTA_MUTE_MASK,
+                                    CS42L56_MSTA_MUTE_MASK,
-                                CS42L56_UNMUTE);
+                                    CS42L56_UNMUTE);
                snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL,
-                                CS42L56_ADCA_MUTE_MASK |
+                                    CS42L56_ADCA_MUTE_MASK |
-                                CS42L56_ADCB_MUTE_MASK,
+                                    CS42L56_ADCB_MUTE_MASK,
-                                CS42L56_UNMUTE);
+                                    CS42L56_UNMUTE);
                snd_soc_update_bits(codec, CS42L56_HPA_VOLUME,
-                                CS42L56_HP_MUTE_MASK,
+                                    CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE);
-                                CS42L56_UNMUTE);
                snd_soc_update_bits(codec, CS42L56_HPB_VOLUME,
-                                CS42L56_HP_MUTE_MASK,
+                                    CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE);
-                                CS42L56_UNMUTE);
                snd_soc_update_bits(codec, CS42L56_LOA_VOLUME,
-                                CS42L56_LO_MUTE_MASK,
+                                    CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE);
-                                CS42L56_UNMUTE);
                snd_soc_update_bits(codec, CS42L56_LOB_VOLUME,
-                                CS42L56_LO_MUTE_MASK,
+                                    CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE);
-                                CS42L56_UNMUTE);
        }
        return 0;
 }
diff --git a/sound/soc/codecs/cs42l56.h b/sound/soc/codecs/cs42l56.h
index ad2b50a90b16..5025ec9be9b2 100644
--- a/sound/soc/codecs/cs42l56.h
+++ b/sound/soc/codecs/cs42l56.h
@@ -80,19 +80,21 @@
 #define CS42L56_PDN_HPB_MASK            0xc0
 /* serial port and clk masks */
-#define CS42L56_MASTER_MODE             1
+#define CS42L56_MASTER_MODE             0x40
 #define CS42L56_SLAVE_MODE              0
 #define CS42L56_MS_MODE_MASK            0x40
-#define CS42L56_SCLK_INV                1
+#define CS42L56_SCLK_INV                0x20
 #define CS42L56_SCLK_INV_MASK           0x20
 #define CS42L56_SCLK_MCLK_MASK          0x18
+#define CS42L56_MCLK_PREDIV             0x04
 #define CS42L56_MCLK_PREDIV_MASK        0x04
+#define CS42L56_MCLK_DIV2               0x02
 #define CS42L56_MCLK_DIV2_MASK          0x02
 #define CS42L56_MCLK_DIS_MASK           0x01
 #define CS42L56_CLK_AUTO_MASK           0x20
 #define CS42L56_CLK_RATIO_MASK          0x1f
 #define CS42L56_DIG_FMT_I2S             0
-#define CS42L56_DIG_FMT_LEFT_J          1
+#define CS42L56_DIG_FMT_LEFT_J          0x08
 #define CS42L56_DIG_FMT_MASK            0x08
 /* Class H and misc ctl masks */
@@ -116,7 +118,7 @@
 #define CS42L56_DEEMPH_MASK             0x40
 #define CS42L56_PLYBCK_GANG_MASK        0x10
 #define CS42L56_PCM_INV_MASK            0x0c
-#define CS42L56_MUTE                    1
+#define CS42L56_MUTE_ALL                0xff
 #define CS42L56_UNMUTE                  0
 #define CS42L56_ADCAMIX_MUTE_MASK       0x40
 #define CS42L56_ADCBMIX_MUTE_MASK       0x80
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 9b76f5a45115..f5fccc7a8e89 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -17,6 +17,7 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
+#include <linux/clk.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -1547,19 +1548,19 @@ static const int lrclk_rates[] = {
 };
 static const int user_pclk_rates[] = {
-        13000000, 13000000
+        13000000, 13000000, 19200000, 19200000,
 };
 static const int user_lrclk_rates[] = {
-        44100, 48000
+        44100, 48000, 44100, 48000,
 };
 static const unsigned long long ni_value[] = {
-        3528, 768
+        3528, 768, 441, 8
 };
 static const unsigned long long mi_value[] = {
-        8125, 1625
+        8125, 1625, 1500, 25
 };
 static void max98090_configure_bclk(struct snd_soc_codec *codec)
@@ -1800,6 +1801,19 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec,
                break;
        case SND_SOC_BIAS_PREPARE:
+                /*
+                 * SND_SOC_BIAS_PREPARE is called while preparing for a
+                 * transition to ON or away from ON. If current bias_level
+                 * is SND_SOC_BIAS_ON, then it is preparing for a transition
+                 * away from ON. Disable the clock in that case, otherwise
+                 * enable it.
+                 */
+                if (!IS_ERR(max98090->mclk)) {
+                        if (codec->dapm.bias_level == SND_SOC_BIAS_ON)
+                                clk_disable_unprepare(max98090->mclk);
+                        else
+                                clk_prepare_enable(max98090->mclk);
+                }
                break;
        case SND_SOC_BIAS_STANDBY:
@@ -1929,6 +1943,11 @@ static int max98090_dai_set_sysclk(struct snd_soc_dai *dai,
        if (freq == max98090->sysclk)
                return 0;
+        if (!IS_ERR(max98090->mclk)) {
+                freq = clk_round_rate(max98090->mclk, freq);
+                clk_set_rate(max98090->mclk, freq);
+        }
        /* Setup clocks for slave mode, and using the PLL
         * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
         *               0x02 (when master clk is 20MHz to 40MHz)..
@@ -2213,6 +2232,10 @@ static int max98090_probe(struct snd_soc_codec *codec)
        dev_dbg(codec->dev, "max98090_probe\n");
+        max98090->mclk = devm_clk_get(codec->dev, "mclk");
+        if (PTR_ERR(max98090->mclk) == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
        max98090->codec = codec;
        /* Reset the codec, the DSP core, and disable all interrupts */
diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 5a3c8d0613cb..cf1b6062ba8c 100644
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h
@@ -1524,6 +1524,7 @@ struct max98090_priv {
        struct snd_soc_codec *codec;
        enum max98090_type devtype;
        struct max98090_pdata *pdata;
+        struct clk *mclk;
        unsigned int sysclk;
        unsigned int bclk;
        unsigned int lrclk;
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index d6c1e4c19a5a..89ec00424880 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/clk.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -42,6 +43,7 @@ struct max98095_priv {
        struct regmap *regmap;
        enum max98095_type devtype;
        struct max98095_pdata *pdata;
+        struct clk *mclk;
        unsigned int sysclk;
        struct max98095_cdata dai[3];
        const char **eq_texts;
@@ -1395,6 +1397,11 @@ static int max98095_dai_set_sysclk(struct snd_soc_dai *dai,
        if (freq == max98095->sysclk)
                return 0;
+        if (!IS_ERR(max98095->mclk)) {
+                freq = clk_round_rate(max98095->mclk, freq);
+                clk_set_rate(max98095->mclk, freq);
+        }
        /* Setup clocks for slave mode, and using the PLL
         * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
         *         0x02 (when master clk is 20MHz to 40MHz)..
@@ -1634,6 +1641,19 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
                break;
        case SND_SOC_BIAS_PREPARE:
+                /*
+                 * SND_SOC_BIAS_PREPARE is called while preparing for a
+                 * transition to ON or away from ON. If current bias_level
+                 * is SND_SOC_BIAS_ON, then it is preparing for a transition
+                 * away from ON. Disable the clock in that case, otherwise
+                 * enable it.
+                 */
+                if (!IS_ERR(max98095->mclk)) {
+                        if (codec->dapm.bias_level == SND_SOC_BIAS_ON)
+                                clk_disable_unprepare(max98095->mclk);
+                        else
+                                clk_prepare_enable(max98095->mclk);
+                }
                break;
        case SND_SOC_BIAS_STANDBY:
@@ -2238,6 +2258,10 @@ static int max98095_probe(struct snd_soc_codec *codec)
        struct i2c_client *client;
        int ret = 0;
+        max98095->mclk = devm_clk_get(codec->dev, "mclk");
+        if (PTR_ERR(max98095->mclk) == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
        /* reset the codec, the DSP core, and disable all interrupts */
        max98095_reset(codec);
diff --git a/sound/soc/codecs/rl6231.c b/sound/soc/codecs/rl6231.c
new file mode 100644
index 000000000000..7b82fbe0d14c
--- /dev/null
+++ b/sound/soc/codecs/rl6231.c
@@ -0,0 +1,152 @@
+/*
+ * rl6231.c - RL6231 class device shared support
+ *
+ * Copyright 2014 Realtek Semiconductor Corp.
+ *
+ * Author: Oder Chiou <oder_chiou@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/gpio.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+#include <linux/of.h>
+#include <linux/of_gpio.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 "rl6231.h"
+/**
+ * rl6231_calc_dmic_clk - Calculate the parameter of dmic.
+ *
+ * @rate: base clock rate.
+ *
+ * Choose dmic clock between 1MHz and 3MHz.
+ * It is better for clock to approximate 3MHz.
+ */
+int rl6231_calc_dmic_clk(int rate)
+{
+        int div[] = {2, 3, 4, 6, 8, 12}, idx = -EINVAL;
+        int i, red, bound, temp;
+        red = 3000000 * 12;
+        for (i = 0; i < ARRAY_SIZE(div); i++) {
+                bound = div[i] * 3000000;
+                if (rate > bound)
+                        continue;
+                temp = bound - rate;
+                if (temp < red) {
+                        red = temp;
+                        idx = i;
+                }
+        }
+        return idx;
+}
+EXPORT_SYMBOL_GPL(rl6231_calc_dmic_clk);
+/**
+ * rl6231_pll_calc - Calcualte PLL M/N/K code.
+ * @freq_in: external clock provided to codec.
+ * @freq_out: target clock which codec works on.
+ * @pll_code: Pointer to structure with M, N, K and bypass flag.
+ *
+ * Calcualte M/N/K code to configure PLL for codec.
+ *
+ * Returns 0 for success or negative error code.
+ */
+int rl6231_pll_calc(const unsigned int freq_in,
+        const unsigned int freq_out, struct rl6231_pll_code *pll_code)
+{
+        int max_n = RL6231_PLL_N_MAX, max_m = RL6231_PLL_M_MAX;
+        int k, red, n_t, pll_out, in_t, out_t;
+        int n = 0, m = 0, m_t = 0;
+        int red_t = abs(freq_out - freq_in);
+        bool bypass = false;
+        if (RL6231_PLL_INP_MAX < freq_in || RL6231_PLL_INP_MIN > freq_in)
+                return -EINVAL;
+        k = 100000000 / freq_out - 2;
+        if (k > RL6231_PLL_K_MAX)
+                k = RL6231_PLL_K_MAX;
+        for (n_t = 0; n_t <= max_n; n_t++) {
+                in_t = freq_in / (k + 2);
+                pll_out = freq_out / (n_t + 2);
+                if (in_t < 0)
+                        continue;
+                if (in_t == pll_out) {
+                        bypass = true;
+                        n = n_t;
+                        goto code_find;
+                }
+                red = abs(in_t - pll_out);
+                if (red < red_t) {
+                        bypass = true;
+                        n = n_t;
+                        m = m_t;
+                        if (red == 0)
+                                goto code_find;
+                        red_t = red;
+                }
+                for (m_t = 0; m_t <= max_m; m_t++) {
+                        out_t = in_t / (m_t + 2);
+                        red = abs(out_t - pll_out);
+                        if (red < red_t) {
+                                bypass = false;
+                                n = n_t;
+                                m = m_t;
+                                if (red == 0)
+                                        goto code_find;
+                                red_t = red;
+                        }
+                }
+        }
+        pr_debug("Only get approximation about PLL\n");
+code_find:
+        pll_code->m_bp = bypass;
+        pll_code->m_code = m;
+        pll_code->n_code = n;
+        pll_code->k_code = k;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rl6231_pll_calc);
+int rl6231_get_clk_info(int sclk, int rate)
+{
+        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
+        if (sclk <= 0 || rate <= 0)
+                return -EINVAL;
+        rate = rate << 8;
+        for (i = 0; i < ARRAY_SIZE(pd); i++)
+                if (sclk == rate * pd[i])
+                        return i;
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(rl6231_get_clk_info);
+MODULE_DESCRIPTION("RL6231 class device shared support");
+MODULE_AUTHOR("Oder Chiou <oder_chiou@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rl6231.h b/sound/soc/codecs/rl6231.h
new file mode 100644
index 000000000000..0f7b057ed736
--- /dev/null
+++ b/sound/soc/codecs/rl6231.h
@@ -0,0 +1,34 @@
+/*
+ * rl6231.h - RL6231 class device shared support
+ *
+ * Copyright 2014 Realtek Semiconductor Corp.
+ *
+ * Author: Oder Chiou <oder_chiou@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 __RL6231_H__
+#define __RL6231_H__
+#define RL6231_PLL_INP_MAX      40000000
+#define RL6231_PLL_INP_MIN      256000
+#define RL6231_PLL_N_MAX        0x1ff
+#define RL6231_PLL_K_MAX        0x1f
+#define RL6231_PLL_M_MAX        0xf
+struct rl6231_pll_code {
+        bool m_bp; /* Indicates bypass m code or not. */
+        int m_code;
+        int n_code;
+        int k_code;
+};
+int rl6231_calc_dmic_clk(int rate);
+int rl6231_pll_calc(const unsigned int freq_in,
+        const unsigned int freq_out, struct rl6231_pll_code *pll_code);
+int rl6231_get_clk_info(int sclk, int rate);
+#endif /* __RL6231_H__ */
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 9e0d48f98927..de80e89b5fd8 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -31,6 +31,7 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include "rl6231.h"
 #include "rt5640.h"
 #define RT5640_DEVICE_ID 0x6231
@@ -453,30 +454,16 @@ static const struct snd_kcontrol_new rt5640_specific_snd_controls[] = {
 * @kcontrol: The kcontrol of this widget.
 * @event: Event id.
 *
- * Choose dmic clock between 1MHz and 3MHz.
- * It is better for clock to approximate 3MHz.
 */
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
        struct snd_soc_codec *codec = w->codec;
        struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
-        int div[] = {2, 3, 4, 6, 8, 12};
+        int idx = -EINVAL;
-        int idx = -EINVAL, i;
-        int rate, red, bound, temp;
+        idx = rl6231_calc_dmic_clk(rt5640->sysclk);
-        rate = rt5640->sysclk;
-        red = 3000000 * 12;
-        for (i = 0; i < ARRAY_SIZE(div); i++) {
-                bound = div[i] * 3000000;
-                if (rate > bound)
-                        continue;
-                temp = bound - rate;
-                if (temp < red) {
-                        red = temp;
-                        idx = i;
-                }
-        }
        if (idx < 0)
                dev_err(codec->dev, "Failed to set DMIC clock\n");
        else
@@ -1639,21 +1626,6 @@ static int get_sdp_info(struct snd_soc_codec *codec, int dai_id)
        return ret;
 }
-static int get_clk_info(int sclk, int rate)
-{
-        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
-        if (sclk <= 0 || rate <= 0)
-                return -EINVAL;
-        rate = rate << 8;
-        for (i = 0; i < ARRAY_SIZE(pd); i++)
-                if (sclk == rate * pd[i])
-                        return i;
-        return -EINVAL;
-}
 static int rt5640_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
@@ -1663,7 +1635,7 @@ static int rt5640_hw_params(struct snd_pcm_substream *substream,
        int dai_sel, pre_div, bclk_ms, frame_size;
        rt5640->lrck[dai->id] = params_rate(params);
-        pre_div = get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]);
+        pre_div = rl6231_get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]);
        if (pre_div < 0) {
                dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n",
                        rt5640->lrck[dai->id], dai->id);
@@ -1820,65 +1792,12 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai,
        return 0;
 }
-/**
- * rt5640_pll_calc - Calculate PLL M/N/K code.
- * @freq_in: external clock provided to codec.
- * @freq_out: target clock which codec works on.
- * @pll_code: Pointer to structure with M, N, K and bypass flag.
- *
- * Calculate M/N/K code to configure PLL for codec. And K is assigned to 2
- * which make calculation more efficiently.
- *
- * Returns 0 for success or negative error code.
- */
-static int rt5640_pll_calc(const unsigned int freq_in,
-        const unsigned int freq_out, struct rt5640_pll_code *pll_code)
-{
-        int max_n = RT5640_PLL_N_MAX, max_m = RT5640_PLL_M_MAX;
-        int n = 0, m = 0, red, n_t, m_t, in_t, out_t;
-        int red_t = abs(freq_out - freq_in);
-        bool bypass = false;
-        if (RT5640_PLL_INP_MAX < freq_in || RT5640_PLL_INP_MIN > freq_in)
-                return -EINVAL;
-        for (n_t = 0; n_t <= max_n; n_t++) {
-                in_t = (freq_in >> 1) + (freq_in >> 2) * n_t;
-                if (in_t < 0)
-                        continue;
-                if (in_t == freq_out) {
-                        bypass = true;
-                        n = n_t;
-                        goto code_find;
-                }
-                for (m_t = 0; m_t <= max_m; m_t++) {
-                        out_t = in_t / (m_t + 2);
-                        red = abs(out_t - freq_out);
-                        if (red < red_t) {
-                                n = n_t;
-                                m = m_t;
-                                if (red == 0)
-                                        goto code_find;
-                                red_t = red;
-                        }
-                }
-        }
-        pr_debug("Only get approximation about PLL\n");
-code_find:
-        pll_code->m_bp = bypass;
-        pll_code->m_code = m;
-        pll_code->n_code = n;
-        pll_code->k_code = 2;
-        return 0;
-}
 static int rt5640_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                        unsigned int freq_in, unsigned int freq_out)
 {
        struct snd_soc_codec *codec = dai->codec;
        struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
-        struct rt5640_pll_code *pll_code = &rt5640->pll_code;
+        struct rl6231_pll_code pll_code;
        int ret, dai_sel;
        if (source == rt5640->pll_src && freq_in == rt5640->pll_in &&
@@ -1922,20 +1841,21 @@ static int rt5640_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                return -EINVAL;
        }
-        ret = rt5640_pll_calc(freq_in, freq_out, pll_code);
+        ret = rl6231_pll_calc(freq_in, freq_out, &pll_code);
        if (ret < 0) {
                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
                return ret;
        }
-        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=2\n", pll_code->m_bp,
+        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=%d\n",
-                (pll_code->m_bp ? 0 : pll_code->m_code), pll_code->n_code);
+                pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code),
+                pll_code.n_code, pll_code.k_code);
        snd_soc_write(codec, RT5640_PLL_CTRL1,
-                pll_code->n_code << RT5640_PLL_N_SFT | pll_code->k_code);
+                pll_code.n_code << RT5640_PLL_N_SFT | pll_code.k_code);
        snd_soc_write(codec, RT5640_PLL_CTRL2,
-                (pll_code->m_bp ? 0 : pll_code->m_code) << RT5640_PLL_M_SFT |
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5640_PLL_M_SFT |
-                pll_code->m_bp << RT5640_PLL_M_BP_SFT);
+                pll_code.m_bp << RT5640_PLL_M_BP_SFT);
        rt5640->pll_in = freq_in;
        rt5640->pll_out = freq_out;
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 895ca149db2e..58ebe96b86da 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -2079,13 +2079,6 @@ enum {
        RT5640_DMIC2,
 };
-struct rt5640_pll_code {
-        bool m_bp; /* Indicates bypass m code or not. */
-        int m_code;
-        int n_code;
-        int k_code;
-};
 struct rt5640_priv {
        struct snd_soc_codec *codec;
        struct rt5640_platform_data pdata;
@@ -2097,7 +2090,6 @@ struct rt5640_priv {
        int bclk[RT5640_AIFS];
        int master[RT5640_AIFS];
-        struct rt5640_pll_code pll_code;
        int pll_src;
        int pll_in;
        int pll_out;
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index ab97d722e15d..02147be2b302 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -26,6 +26,7 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include "rl6231.h"
 #include "rt5645.h"
 #define RT5645_DEVICE_ID 0x6308
@@ -519,30 +520,15 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = {
 * @kcontrol: The kcontrol of this widget.
 * @event: Event id.
 *
- * Choose dmic clock between 1MHz and 3MHz.
- * It is better for clock to approximate 3MHz.
 */
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
        struct snd_soc_codec *codec = w->codec;
        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
-        int div[] = {2, 3, 4, 6, 8, 12};
+        int idx = -EINVAL;
-        int idx = -EINVAL, i;
-        int rate, red, bound, temp;
+        idx = rl6231_calc_dmic_clk(rt5645->sysclk);
-        rate = rt5645->sysclk;
-        red = 3000000 * 12;
-        for (i = 0; i < ARRAY_SIZE(div); i++) {
-                bound = div[i] * 3000000;
-                if (rate > bound)
-                        continue;
-                temp = bound - rate;
-                if (temp < red) {
-                        red = temp;
-                        idx = i;
-                }
-        }
        if (idx < 0)
                dev_err(codec->dev, "Failed to set DMIC clock\n");
@@ -1800,21 +1786,6 @@ static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
        { "SPOR", NULL, "SPK amp" },
 };
-static int get_clk_info(int sclk, int rate)
-{
-        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
-        if (sclk <= 0 || rate <= 0)
-                return -EINVAL;
-        rate = rate << 8;
-        for (i = 0; i < ARRAY_SIZE(pd); i++)
-                if (sclk == rate * pd[i])
-                        return i;
-        return -EINVAL;
-}
 static int rt5645_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
@@ -1824,7 +1795,7 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
        int pre_div, bclk_ms, frame_size;
        rt5645->lrck[dai->id] = params_rate(params);
-        pre_div = get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);
+        pre_div = rl6231_get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);
        if (pre_div < 0) {
                dev_err(codec->dev, "Unsupported clock setting\n");
                return -EINVAL;
@@ -1978,80 +1949,12 @@ static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai,
        return 0;
 }
-/**
- * rt5645_pll_calc - Calcualte PLL M/N/K code.
- * @freq_in: external clock provided to codec.
- * @freq_out: target clock which codec works on.
- * @pll_code: Pointer to structure with M, N, K and bypass flag.
- *
- * Calcualte M/N/K code to configure PLL for codec. And K is assigned to 2
- * which make calculation more efficiently.
- *
- * Returns 0 for success or negative error code.
- */
-static int rt5645_pll_calc(const unsigned int freq_in,
-        const unsigned int freq_out, struct rt5645_pll_code *pll_code)
-{
-        int max_n = RT5645_PLL_N_MAX, max_m = RT5645_PLL_M_MAX;
-        int k, n = 0, m = 0, red, n_t, m_t, pll_out, in_t, out_t;
-        int red_t = abs(freq_out - freq_in);
-        bool bypass = false;
-        if (RT5645_PLL_INP_MAX < freq_in || RT5645_PLL_INP_MIN > freq_in)
-                return -EINVAL;
-        k = 100000000 / freq_out - 2;
-        if (k > RT5645_PLL_K_MAX)
-                k = RT5645_PLL_K_MAX;
-        for (n_t = 0; n_t <= max_n; n_t++) {
-                in_t = freq_in / (k + 2);
-                pll_out = freq_out / (n_t + 2);
-                if (in_t < 0)
-                        continue;
-                if (in_t == pll_out) {
-                        bypass = true;
-                        n = n_t;
-                        goto code_find;
-                }
-                red = abs(in_t - pll_out);
-                if (red < red_t) {
-                        bypass = true;
-                        n = n_t;
-                        m = m_t;
-                        if (red == 0)
-                                goto code_find;
-                        red_t = red;
-                }
-                for (m_t = 0; m_t <= max_m; m_t++) {
-                        out_t = in_t / (m_t + 2);
-                        red = abs(out_t - pll_out);
-                        if (red < red_t) {
-                                bypass = false;
-                                n = n_t;
-                                m = m_t;
-                                if (red == 0)
-                                        goto code_find;
-                                red_t = red;
-                        }
-                }
-        }
-        pr_debug("Only get approximation about PLL\n");
-code_find:
-        pll_code->m_bp = bypass;
-        pll_code->m_code = m;
-        pll_code->n_code = n;
-        pll_code->k_code = k;
-        return 0;
-}
 static int rt5645_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                        unsigned int freq_in, unsigned int freq_out)
 {
        struct snd_soc_codec *codec = dai->codec;
        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
-        struct rt5645_pll_code pll_code;
+        struct rl6231_pll_code pll_code;
        int ret;
        if (source == rt5645->pll_src && freq_in == rt5645->pll_in &&
@@ -2094,7 +1997,7 @@ static int rt5645_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                return -EINVAL;
        }
-        ret = rt5645_pll_calc(freq_in, freq_out, &pll_code);
+        ret = rl6231_pll_calc(freq_in, freq_out, &pll_code);
        if (ret < 0) {
                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
                return ret;
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index 345aa3f5d14f..355b7e9eefab 100644
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -2162,13 +2162,6 @@ enum {
        RT5645_DMIC_DATA_GPIO11,
 };
-struct rt5645_pll_code {
-        bool m_bp; /* Indicates bypass m code or not. */
-        int m_code;
-        int n_code;
-        int k_code;
-};
 struct rt5645_priv {
        struct snd_soc_codec *codec;
        struct rt5645_platform_data pdata;
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 9c88d89f41f0..ea4b1c652a26 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -26,6 +26,7 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include "rl6231.h"
 #include "rt5651.h"
 #define RT5651_DEVICE_ID_VALUE 0x6281
@@ -371,29 +372,16 @@ static const struct snd_kcontrol_new rt5651_snd_controls[] = {
 * @kcontrol: The kcontrol of this widget.
 * @event: Event id.
 *
- * Choose dmic clock between 1MHz and 3MHz.
- * It is better for clock to approximate 3MHz.
 */
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
        struct snd_soc_codec *codec = w->codec;
        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
-        int div[] = {2, 3, 4, 6, 8, 12}, idx = -EINVAL;
+        int idx = -EINVAL;
-        int i, rate, red, bound, temp;
+        idx = rl6231_calc_dmic_clk(rt5651->sysclk);
-        rate = rt5651->sysclk;
-        red = 3000000 * 12;
-        for (i = 0; i < ARRAY_SIZE(div); i++) {
-                bound = div[i] * 3000000;
-                if (rate > bound)
-                        continue;
-                temp = bound - rate;
-                if (temp < red) {
-                        red = temp;
-                        idx = i;
-                }
-        }
        if (idx < 0)
                dev_err(codec->dev, "Failed to set DMIC clock\n");
        else
@@ -1350,21 +1338,6 @@ static const struct snd_soc_dapm_route rt5651_dapm_routes[] = {
        {"PDMR", NULL, "PDM R Mux"},
 };
-static int get_clk_info(int sclk, int rate)
-{
-        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
-        if (sclk <= 0 || rate <= 0)
-                return -EINVAL;
-        rate = rate << 8;
-        for (i = 0; i < ARRAY_SIZE(pd); i++)
-                if (sclk == rate * pd[i])
-                        return i;
-        return -EINVAL;
-}
 static int rt5651_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
@@ -1374,7 +1347,7 @@ static int rt5651_hw_params(struct snd_pcm_substream *substream,
        int pre_div, bclk_ms, frame_size;
        rt5651->lrck[dai->id] = params_rate(params);
-        pre_div = get_clk_info(rt5651->sysclk, rt5651->lrck[dai->id]);
+        pre_div = rl6231_get_clk_info(rt5651->sysclk, rt5651->lrck[dai->id]);
        if (pre_div < 0) {
                dev_err(codec->dev, "Unsupported clock setting\n");
@@ -1528,65 +1501,12 @@ static int rt5651_set_dai_sysclk(struct snd_soc_dai *dai,
        return 0;
 }
-/**
- * rt5651_pll_calc - Calcualte PLL M/N/K code.
- * @freq_in: external clock provided to codec.
- * @freq_out: target clock which codec works on.
- * @pll_code: Pointer to structure with M, N, K and bypass flag.
- *
- * Calcualte M/N/K code to configure PLL for codec. And K is assigned to 2
- * which make calculation more efficiently.
- *
- * Returns 0 for success or negative error code.
- */
-static int rt5651_pll_calc(const unsigned int freq_in,
-        const unsigned int freq_out, struct rt5651_pll_code *pll_code)
-{
-        int max_n = RT5651_PLL_N_MAX, max_m = RT5651_PLL_M_MAX;
-        int n = 0, m = 0, red, n_t, m_t, in_t, out_t;
-        int red_t = abs(freq_out - freq_in);
-        bool bypass = false;
-        if (RT5651_PLL_INP_MAX < freq_in || RT5651_PLL_INP_MIN > freq_in)
-                return -EINVAL;
-        for (n_t = 0; n_t <= max_n; n_t++) {
-                in_t = (freq_in >> 1) + (freq_in >> 2) * n_t;
-                if (in_t < 0)
-                        continue;
-                if (in_t == freq_out) {
-                        bypass = true;
-                        n = n_t;
-                        goto code_find;
-                }
-                for (m_t = 0; m_t <= max_m; m_t++) {
-                        out_t = in_t / (m_t + 2);
-                        red = abs(out_t - freq_out);
-                        if (red < red_t) {
-                                n = n_t;
-                                m = m_t;
-                                if (red == 0)
-                                        goto code_find;
-                                red_t = red;
-                        }
-                }
-        }
-        pr_debug("Only get approximation about PLL\n");
-code_find:
-        pll_code->m_bp = bypass;
-        pll_code->m_code = m;
-        pll_code->n_code = n;
-        pll_code->k_code = 2;
-        return 0;
-}
 static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                        unsigned int freq_in, unsigned int freq_out)
 {
        struct snd_soc_codec *codec = dai->codec;
        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
-        struct rt5651_pll_code *pll_code = &rt5651->pll_code;
+        struct rl6231_pll_code pll_code;
        int ret;
        if (source == rt5651->pll_src && freq_in == rt5651->pll_in &&
@@ -1621,20 +1541,21 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                return -EINVAL;
        }
-        ret = rt5651_pll_calc(freq_in, freq_out, pll_code);
+        ret = rl6231_pll_calc(freq_in, freq_out, &pll_code);
        if (ret < 0) {
                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
                return ret;
        }
-        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=2\n", pll_code->m_bp,
+        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=%d\n",
-                (pll_code->m_bp ? 0 : pll_code->m_code), pll_code->n_code);
+                pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code),
+                pll_code.n_code, pll_code.k_code);
        snd_soc_write(codec, RT5651_PLL_CTRL1,
-                pll_code->n_code << RT5651_PLL_N_SFT | pll_code->k_code);
+                pll_code.n_code << RT5651_PLL_N_SFT | pll_code.k_code);
        snd_soc_write(codec, RT5651_PLL_CTRL2,
-                (pll_code->m_bp ? 0 : pll_code->m_code) << RT5651_PLL_M_SFT |
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5651_PLL_M_SFT |
-                pll_code->m_bp << RT5651_PLL_M_BP_SFT);
+                pll_code.m_bp << RT5651_PLL_M_BP_SFT);
        rt5651->pll_in = freq_in;
        rt5651->pll_out = freq_out;
diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h
index a28bd0c3d613..1bd33cfa6411 100644
--- a/sound/soc/codecs/rt5651.h
+++ b/sound/soc/codecs/rt5651.h
@@ -2069,7 +2069,6 @@ struct rt5651_priv {
        int bclk[RT5651_AIFS];
        int master[RT5651_AIFS];
-        struct rt5651_pll_code pll_code;
        int pll_src;
        int pll_in;
        int pll_out;
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
new file mode 100644
index 000000000000..833231e27340
--- /dev/null
+++ b/sound/soc/codecs/rt5677.c
@@ -0,0 +1,3498 @@
+/*
+ * rt5677.c  --  RT5677 ALSA SoC audio codec driver
+ *
+ * Copyright 2013 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@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/fs.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/regmap.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.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 "rt5677.h"
+#define RT5677_DEVICE_ID 0x6327
+#define RT5677_PR_RANGE_BASE (0xff + 1)
+#define RT5677_PR_SPACING 0x100
+#define RT5677_PR_BASE (RT5677_PR_RANGE_BASE + (0 * RT5677_PR_SPACING))
+static const struct regmap_range_cfg rt5677_ranges[] = {
+        {
+                .name = "PR",
+                .range_min = RT5677_PR_BASE,
+                .range_max = RT5677_PR_BASE + 0xfd,
+                .selector_reg = RT5677_PRIV_INDEX,
+                .selector_mask = 0xff,
+                .selector_shift = 0x0,
+                .window_start = RT5677_PRIV_DATA,
+                .window_len = 0x1,
+        },
+};
+static const struct reg_default init_list[] = {
+        {RT5677_PR_BASE + 0x3d, 0x364d},
+        {RT5677_PR_BASE + 0x17, 0x4fc0},
+        {RT5677_PR_BASE + 0x13, 0x0312},
+        {RT5677_PR_BASE + 0x1e, 0x0000},
+        {RT5677_PR_BASE + 0x12, 0x0eaa},
+        {RT5677_PR_BASE + 0x14, 0x018a},
+};
+#define RT5677_INIT_REG_LEN ARRAY_SIZE(init_list)
+static const struct reg_default rt5677_reg[] = {
+        {RT5677_RESET                   , 0x0000},
+        {RT5677_LOUT1                   , 0xa800},
+        {RT5677_IN1                     , 0x0000},
+        {RT5677_MICBIAS                 , 0x0000},
+        {RT5677_SLIMBUS_PARAM           , 0x0000},
+        {RT5677_SLIMBUS_RX              , 0x0000},
+        {RT5677_SLIMBUS_CTRL            , 0x0000},
+        {RT5677_SIDETONE_CTRL           , 0x000b},
+        {RT5677_ANA_DAC1_2_3_SRC        , 0x0000},
+        {RT5677_IF_DSP_DAC3_4_MIXER     , 0x1111},
+        {RT5677_DAC4_DIG_VOL            , 0xafaf},
+        {RT5677_DAC3_DIG_VOL            , 0xafaf},
+        {RT5677_DAC1_DIG_VOL            , 0xafaf},
+        {RT5677_DAC2_DIG_VOL            , 0xafaf},
+        {RT5677_IF_DSP_DAC2_MIXER       , 0x0011},
+        {RT5677_STO1_ADC_DIG_VOL        , 0x2f2f},
+        {RT5677_MONO_ADC_DIG_VOL        , 0x2f2f},
+        {RT5677_STO1_2_ADC_BST          , 0x0000},
+        {RT5677_STO2_ADC_DIG_VOL        , 0x2f2f},
+        {RT5677_ADC_BST_CTRL2           , 0x0000},
+        {RT5677_STO3_4_ADC_BST          , 0x0000},
+        {RT5677_STO3_ADC_DIG_VOL        , 0x2f2f},
+        {RT5677_STO4_ADC_DIG_VOL        , 0x2f2f},
+        {RT5677_STO4_ADC_MIXER          , 0xd4c0},
+        {RT5677_STO3_ADC_MIXER          , 0xd4c0},
+        {RT5677_STO2_ADC_MIXER          , 0xd4c0},
+        {RT5677_STO1_ADC_MIXER          , 0xd4c0},
+        {RT5677_MONO_ADC_MIXER          , 0xd4d1},
+        {RT5677_ADC_IF_DSP_DAC1_MIXER   , 0x8080},
+        {RT5677_STO1_DAC_MIXER          , 0xaaaa},
+        {RT5677_MONO_DAC_MIXER          , 0xaaaa},
+        {RT5677_DD1_MIXER               , 0xaaaa},
+        {RT5677_DD2_MIXER               , 0xaaaa},
+        {RT5677_IF3_DATA                , 0x0000},
+        {RT5677_IF4_DATA                , 0x0000},
+        {RT5677_PDM_OUT_CTRL            , 0x8888},
+        {RT5677_PDM_DATA_CTRL1          , 0x0000},
+        {RT5677_PDM_DATA_CTRL2          , 0x0000},
+        {RT5677_PDM1_DATA_CTRL2         , 0x0000},
+        {RT5677_PDM1_DATA_CTRL3         , 0x0000},
+        {RT5677_PDM1_DATA_CTRL4         , 0x0000},
+        {RT5677_PDM2_DATA_CTRL2         , 0x0000},
+        {RT5677_PDM2_DATA_CTRL3         , 0x0000},
+        {RT5677_PDM2_DATA_CTRL4         , 0x0000},
+        {RT5677_TDM1_CTRL1              , 0x0300},
+        {RT5677_TDM1_CTRL2              , 0x0000},
+        {RT5677_TDM1_CTRL3              , 0x4000},
+        {RT5677_TDM1_CTRL4              , 0x0123},
+        {RT5677_TDM1_CTRL5              , 0x4567},
+        {RT5677_TDM2_CTRL1              , 0x0300},
+        {RT5677_TDM2_CTRL2              , 0x0000},
+        {RT5677_TDM2_CTRL3              , 0x4000},
+        {RT5677_TDM2_CTRL4              , 0x0123},
+        {RT5677_TDM2_CTRL5              , 0x4567},
+        {RT5677_I2C_MASTER_CTRL1        , 0x0001},
+        {RT5677_I2C_MASTER_CTRL2        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL3        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL4        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL5        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL6        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL7        , 0x0000},
+        {RT5677_I2C_MASTER_CTRL8        , 0x0000},
+        {RT5677_DMIC_CTRL1              , 0x1505},
+        {RT5677_DMIC_CTRL2              , 0x0055},
+        {RT5677_HAP_GENE_CTRL1          , 0x0111},
+        {RT5677_HAP_GENE_CTRL2          , 0x0064},
+        {RT5677_HAP_GENE_CTRL3          , 0xef0e},
+        {RT5677_HAP_GENE_CTRL4          , 0xf0f0},
+        {RT5677_HAP_GENE_CTRL5          , 0xef0e},
+        {RT5677_HAP_GENE_CTRL6          , 0xf0f0},
+        {RT5677_HAP_GENE_CTRL7          , 0xef0e},
+        {RT5677_HAP_GENE_CTRL8          , 0xf0f0},
+        {RT5677_HAP_GENE_CTRL9          , 0xf000},
+        {RT5677_HAP_GENE_CTRL10         , 0x0000},
+        {RT5677_PWR_DIG1                , 0x0000},
+        {RT5677_PWR_DIG2                , 0x0000},
+        {RT5677_PWR_ANLG1               , 0x0055},
+        {RT5677_PWR_ANLG2               , 0x0000},
+        {RT5677_PWR_DSP1                , 0x0001},
+        {RT5677_PWR_DSP_ST              , 0x0000},
+        {RT5677_PWR_DSP2                , 0x0000},
+        {RT5677_ADC_DAC_HPF_CTRL1       , 0x0e00},
+        {RT5677_PRIV_INDEX              , 0x0000},
+        {RT5677_PRIV_DATA               , 0x0000},
+        {RT5677_I2S4_SDP                , 0x8000},
+        {RT5677_I2S1_SDP                , 0x8000},
+        {RT5677_I2S2_SDP                , 0x8000},
+        {RT5677_I2S3_SDP                , 0x8000},
+        {RT5677_CLK_TREE_CTRL1          , 0x1111},
+        {RT5677_CLK_TREE_CTRL2          , 0x1111},
+        {RT5677_CLK_TREE_CTRL3          , 0x0000},
+        {RT5677_PLL1_CTRL1              , 0x0000},
+        {RT5677_PLL1_CTRL2              , 0x0000},
+        {RT5677_PLL2_CTRL1              , 0x0c60},
+        {RT5677_PLL2_CTRL2              , 0x2000},
+        {RT5677_GLB_CLK1                , 0x0000},
+        {RT5677_GLB_CLK2                , 0x0000},
+        {RT5677_ASRC_1                  , 0x0000},
+        {RT5677_ASRC_2                  , 0x0000},
+        {RT5677_ASRC_3                  , 0x0000},
+        {RT5677_ASRC_4                  , 0x0000},
+        {RT5677_ASRC_5                  , 0x0000},
+        {RT5677_ASRC_6                  , 0x0000},
+        {RT5677_ASRC_7                  , 0x0000},
+        {RT5677_ASRC_8                  , 0x0000},
+        {RT5677_ASRC_9                  , 0x0000},
+        {RT5677_ASRC_10                 , 0x0000},
+        {RT5677_ASRC_11                 , 0x0000},
+        {RT5677_ASRC_12                 , 0x0008},
+        {RT5677_ASRC_13                 , 0x0000},
+        {RT5677_ASRC_14                 , 0x0000},
+        {RT5677_ASRC_15                 , 0x0000},
+        {RT5677_ASRC_16                 , 0x0000},
+        {RT5677_ASRC_17                 , 0x0000},
+        {RT5677_ASRC_18                 , 0x0000},
+        {RT5677_ASRC_19                 , 0x0000},
+        {RT5677_ASRC_20                 , 0x0000},
+        {RT5677_ASRC_21                 , 0x000c},
+        {RT5677_ASRC_22                 , 0x0000},
+        {RT5677_ASRC_23                 , 0x0000},
+        {RT5677_VAD_CTRL1               , 0x2184},
+        {RT5677_VAD_CTRL2               , 0x010a},
+        {RT5677_VAD_CTRL3               , 0x0aea},
+        {RT5677_VAD_CTRL4               , 0x000c},
+        {RT5677_VAD_CTRL5               , 0x0000},
+        {RT5677_DSP_INB_CTRL1           , 0x0000},
+        {RT5677_DSP_INB_CTRL2           , 0x0000},
+        {RT5677_DSP_IN_OUTB_CTRL        , 0x0000},
+        {RT5677_DSP_OUTB0_1_DIG_VOL     , 0x2f2f},
+        {RT5677_DSP_OUTB2_3_DIG_VOL     , 0x2f2f},
+        {RT5677_DSP_OUTB4_5_DIG_VOL     , 0x2f2f},
+        {RT5677_DSP_OUTB6_7_DIG_VOL     , 0x2f2f},
+        {RT5677_ADC_EQ_CTRL1            , 0x6000},
+        {RT5677_ADC_EQ_CTRL2            , 0x0000},
+        {RT5677_EQ_CTRL1                , 0xc000},
+        {RT5677_EQ_CTRL2                , 0x0000},
+        {RT5677_EQ_CTRL3                , 0x0000},
+        {RT5677_SOFT_VOL_ZERO_CROSS1    , 0x0009},
+        {RT5677_JD_CTRL1                , 0x0000},
+        {RT5677_JD_CTRL2                , 0x0000},
+        {RT5677_JD_CTRL3                , 0x0000},
+        {RT5677_IRQ_CTRL1               , 0x0000},
+        {RT5677_IRQ_CTRL2               , 0x0000},
+        {RT5677_GPIO_ST                 , 0x0000},
+        {RT5677_GPIO_CTRL1              , 0x0000},
+        {RT5677_GPIO_CTRL2              , 0x0000},
+        {RT5677_GPIO_CTRL3              , 0x0000},
+        {RT5677_STO1_ADC_HI_FILTER1     , 0xb320},
+        {RT5677_STO1_ADC_HI_FILTER2     , 0x0000},
+        {RT5677_MONO_ADC_HI_FILTER1     , 0xb300},
+        {RT5677_MONO_ADC_HI_FILTER2     , 0x0000},
+        {RT5677_STO2_ADC_HI_FILTER1     , 0xb300},
+        {RT5677_STO2_ADC_HI_FILTER2     , 0x0000},
+        {RT5677_STO3_ADC_HI_FILTER1     , 0xb300},
+        {RT5677_STO3_ADC_HI_FILTER2     , 0x0000},
+        {RT5677_STO4_ADC_HI_FILTER1     , 0xb300},
+        {RT5677_STO4_ADC_HI_FILTER2     , 0x0000},
+        {RT5677_MB_DRC_CTRL1            , 0x0f20},
+        {RT5677_DRC1_CTRL1              , 0x001f},
+        {RT5677_DRC1_CTRL2              , 0x020c},
+        {RT5677_DRC1_CTRL3              , 0x1f00},
+        {RT5677_DRC1_CTRL4              , 0x0000},
+        {RT5677_DRC1_CTRL5              , 0x0000},
+        {RT5677_DRC1_CTRL6              , 0x0029},
+        {RT5677_DRC2_CTRL1              , 0x001f},
+        {RT5677_DRC2_CTRL2              , 0x020c},
+        {RT5677_DRC2_CTRL3              , 0x1f00},
+        {RT5677_DRC2_CTRL4              , 0x0000},
+        {RT5677_DRC2_CTRL5              , 0x0000},
+        {RT5677_DRC2_CTRL6              , 0x0029},
+        {RT5677_DRC1_HL_CTRL1           , 0x8000},
+        {RT5677_DRC1_HL_CTRL2           , 0x0200},
+        {RT5677_DRC2_HL_CTRL1           , 0x8000},
+        {RT5677_DRC2_HL_CTRL2           , 0x0200},
+        {RT5677_DSP_INB1_SRC_CTRL1      , 0x5800},
+        {RT5677_DSP_INB1_SRC_CTRL2      , 0x0000},
+        {RT5677_DSP_INB1_SRC_CTRL3      , 0x0000},
+        {RT5677_DSP_INB1_SRC_CTRL4      , 0x0800},
+        {RT5677_DSP_INB2_SRC_CTRL1      , 0x5800},
+        {RT5677_DSP_INB2_SRC_CTRL2      , 0x0000},
+        {RT5677_DSP_INB2_SRC_CTRL3      , 0x0000},
+        {RT5677_DSP_INB2_SRC_CTRL4      , 0x0800},
+        {RT5677_DSP_INB3_SRC_CTRL1      , 0x5800},
+        {RT5677_DSP_INB3_SRC_CTRL2      , 0x0000},
+        {RT5677_DSP_INB3_SRC_CTRL3      , 0x0000},
+        {RT5677_DSP_INB3_SRC_CTRL4      , 0x0800},
+        {RT5677_DSP_OUTB1_SRC_CTRL1     , 0x5800},
+        {RT5677_DSP_OUTB1_SRC_CTRL2     , 0x0000},
+        {RT5677_DSP_OUTB1_SRC_CTRL3     , 0x0000},
+        {RT5677_DSP_OUTB1_SRC_CTRL4     , 0x0800},
+        {RT5677_DSP_OUTB2_SRC_CTRL1     , 0x5800},
+        {RT5677_DSP_OUTB2_SRC_CTRL2     , 0x0000},
+        {RT5677_DSP_OUTB2_SRC_CTRL3     , 0x0000},
+        {RT5677_DSP_OUTB2_SRC_CTRL4     , 0x0800},
+        {RT5677_DSP_OUTB_0123_MIXER_CTRL, 0xfefe},
+        {RT5677_DSP_OUTB_45_MIXER_CTRL  , 0xfefe},
+        {RT5677_DSP_OUTB_67_MIXER_CTRL  , 0xfefe},
+        {RT5677_DIG_MISC                , 0x0000},
+        {RT5677_GEN_CTRL1               , 0x0000},
+        {RT5677_GEN_CTRL2               , 0x0000},
+        {RT5677_VENDOR_ID               , 0x0000},
+        {RT5677_VENDOR_ID1              , 0x10ec},
+        {RT5677_VENDOR_ID2              , 0x6327},
+};
+static bool rt5677_volatile_register(struct device *dev, unsigned int reg)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(rt5677_ranges); i++) {
+                if (reg >= rt5677_ranges[i].range_min &&
+                        reg <= rt5677_ranges[i].range_max) {
+                        return true;
+                }
+        }
+        switch (reg) {
+        case RT5677_RESET:
+        case RT5677_SLIMBUS_PARAM:
+        case RT5677_PDM_DATA_CTRL1:
+        case RT5677_PDM_DATA_CTRL2:
+        case RT5677_PDM1_DATA_CTRL4:
+        case RT5677_PDM2_DATA_CTRL4:
+        case RT5677_I2C_MASTER_CTRL1:
+        case RT5677_I2C_MASTER_CTRL7:
+        case RT5677_I2C_MASTER_CTRL8:
+        case RT5677_HAP_GENE_CTRL2:
+        case RT5677_PWR_DSP_ST:
+        case RT5677_PRIV_DATA:
+        case RT5677_PLL1_CTRL2:
+        case RT5677_PLL2_CTRL2:
+        case RT5677_ASRC_22:
+        case RT5677_ASRC_23:
+        case RT5677_VAD_CTRL5:
+        case RT5677_ADC_EQ_CTRL1:
+        case RT5677_EQ_CTRL1:
+        case RT5677_IRQ_CTRL1:
+        case RT5677_IRQ_CTRL2:
+        case RT5677_GPIO_ST:
+        case RT5677_DSP_INB1_SRC_CTRL4:
+        case RT5677_DSP_INB2_SRC_CTRL4:
+        case RT5677_DSP_INB3_SRC_CTRL4:
+        case RT5677_DSP_OUTB1_SRC_CTRL4:
+        case RT5677_DSP_OUTB2_SRC_CTRL4:
+        case RT5677_VENDOR_ID:
+        case RT5677_VENDOR_ID1:
+        case RT5677_VENDOR_ID2:
+                return true;
+        default:
+                return false;
+        }
+}
+static bool rt5677_readable_register(struct device *dev, unsigned int reg)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(rt5677_ranges); i++) {
+                if (reg >= rt5677_ranges[i].range_min &&
+                        reg <= rt5677_ranges[i].range_max) {
+                        return true;
+                }
+        }
+        switch (reg) {
+        case RT5677_RESET:
+        case RT5677_LOUT1:
+        case RT5677_IN1:
+        case RT5677_MICBIAS:
+        case RT5677_SLIMBUS_PARAM:
+        case RT5677_SLIMBUS_RX:
+        case RT5677_SLIMBUS_CTRL:
+        case RT5677_SIDETONE_CTRL:
+        case RT5677_ANA_DAC1_2_3_SRC:
+        case RT5677_IF_DSP_DAC3_4_MIXER:
+        case RT5677_DAC4_DIG_VOL:
+        case RT5677_DAC3_DIG_VOL:
+        case RT5677_DAC1_DIG_VOL:
+        case RT5677_DAC2_DIG_VOL:
+        case RT5677_IF_DSP_DAC2_MIXER:
+        case RT5677_STO1_ADC_DIG_VOL:
+        case RT5677_MONO_ADC_DIG_VOL:
+        case RT5677_STO1_2_ADC_BST:
+        case RT5677_STO2_ADC_DIG_VOL:
+        case RT5677_ADC_BST_CTRL2:
+        case RT5677_STO3_4_ADC_BST:
+        case RT5677_STO3_ADC_DIG_VOL:
+        case RT5677_STO4_ADC_DIG_VOL:
+        case RT5677_STO4_ADC_MIXER:
+        case RT5677_STO3_ADC_MIXER:
+        case RT5677_STO2_ADC_MIXER:
+        case RT5677_STO1_ADC_MIXER:
+        case RT5677_MONO_ADC_MIXER:
+        case RT5677_ADC_IF_DSP_DAC1_MIXER:
+        case RT5677_STO1_DAC_MIXER:
+        case RT5677_MONO_DAC_MIXER:
+        case RT5677_DD1_MIXER:
+        case RT5677_DD2_MIXER:
+        case RT5677_IF3_DATA:
+        case RT5677_IF4_DATA:
+        case RT5677_PDM_OUT_CTRL:
+        case RT5677_PDM_DATA_CTRL1:
+        case RT5677_PDM_DATA_CTRL2:
+        case RT5677_PDM1_DATA_CTRL2:
+        case RT5677_PDM1_DATA_CTRL3:
+        case RT5677_PDM1_DATA_CTRL4:
+        case RT5677_PDM2_DATA_CTRL2:
+        case RT5677_PDM2_DATA_CTRL3:
+        case RT5677_PDM2_DATA_CTRL4:
+        case RT5677_TDM1_CTRL1:
+        case RT5677_TDM1_CTRL2:
+        case RT5677_TDM1_CTRL3:
+        case RT5677_TDM1_CTRL4:
+        case RT5677_TDM1_CTRL5:
+        case RT5677_TDM2_CTRL1:
+        case RT5677_TDM2_CTRL2:
+        case RT5677_TDM2_CTRL3:
+        case RT5677_TDM2_CTRL4:
+        case RT5677_TDM2_CTRL5:
+        case RT5677_I2C_MASTER_CTRL1:
+        case RT5677_I2C_MASTER_CTRL2:
+        case RT5677_I2C_MASTER_CTRL3:
+        case RT5677_I2C_MASTER_CTRL4:
+        case RT5677_I2C_MASTER_CTRL5:
+        case RT5677_I2C_MASTER_CTRL6:
+        case RT5677_I2C_MASTER_CTRL7:
+        case RT5677_I2C_MASTER_CTRL8:
+        case RT5677_DMIC_CTRL1:
+        case RT5677_DMIC_CTRL2:
+        case RT5677_HAP_GENE_CTRL1:
+        case RT5677_HAP_GENE_CTRL2:
+        case RT5677_HAP_GENE_CTRL3:
+        case RT5677_HAP_GENE_CTRL4:
+        case RT5677_HAP_GENE_CTRL5:
+        case RT5677_HAP_GENE_CTRL6:
+        case RT5677_HAP_GENE_CTRL7:
+        case RT5677_HAP_GENE_CTRL8:
+        case RT5677_HAP_GENE_CTRL9:
+        case RT5677_HAP_GENE_CTRL10:
+        case RT5677_PWR_DIG1:
+        case RT5677_PWR_DIG2:
+        case RT5677_PWR_ANLG1:
+        case RT5677_PWR_ANLG2:
+        case RT5677_PWR_DSP1:
+        case RT5677_PWR_DSP_ST:
+        case RT5677_PWR_DSP2:
+        case RT5677_ADC_DAC_HPF_CTRL1:
+        case RT5677_PRIV_INDEX:
+        case RT5677_PRIV_DATA:
+        case RT5677_I2S4_SDP:
+        case RT5677_I2S1_SDP:
+        case RT5677_I2S2_SDP:
+        case RT5677_I2S3_SDP:
+        case RT5677_CLK_TREE_CTRL1:
+        case RT5677_CLK_TREE_CTRL2:
+        case RT5677_CLK_TREE_CTRL3:
+        case RT5677_PLL1_CTRL1:
+        case RT5677_PLL1_CTRL2:
+        case RT5677_PLL2_CTRL1:
+        case RT5677_PLL2_CTRL2:
+        case RT5677_GLB_CLK1:
+        case RT5677_GLB_CLK2:
+        case RT5677_ASRC_1:
+        case RT5677_ASRC_2:
+        case RT5677_ASRC_3:
+        case RT5677_ASRC_4:
+        case RT5677_ASRC_5:
+        case RT5677_ASRC_6:
+        case RT5677_ASRC_7:
+        case RT5677_ASRC_8:
+        case RT5677_ASRC_9:
+        case RT5677_ASRC_10:
+        case RT5677_ASRC_11:
+        case RT5677_ASRC_12:
+        case RT5677_ASRC_13:
+        case RT5677_ASRC_14:
+        case RT5677_ASRC_15:
+        case RT5677_ASRC_16:
+        case RT5677_ASRC_17:
+        case RT5677_ASRC_18:
+        case RT5677_ASRC_19:
+        case RT5677_ASRC_20:
+        case RT5677_ASRC_21:
+        case RT5677_ASRC_22:
+        case RT5677_ASRC_23:
+        case RT5677_VAD_CTRL1:
+        case RT5677_VAD_CTRL2:
+        case RT5677_VAD_CTRL3:
+        case RT5677_VAD_CTRL4:
+        case RT5677_VAD_CTRL5:
+        case RT5677_DSP_INB_CTRL1:
+        case RT5677_DSP_INB_CTRL2:
+        case RT5677_DSP_IN_OUTB_CTRL:
+        case RT5677_DSP_OUTB0_1_DIG_VOL:
+        case RT5677_DSP_OUTB2_3_DIG_VOL:
+        case RT5677_DSP_OUTB4_5_DIG_VOL:
+        case RT5677_DSP_OUTB6_7_DIG_VOL:
+        case RT5677_ADC_EQ_CTRL1:
+        case RT5677_ADC_EQ_CTRL2:
+        case RT5677_EQ_CTRL1:
+        case RT5677_EQ_CTRL2:
+        case RT5677_EQ_CTRL3:
+        case RT5677_SOFT_VOL_ZERO_CROSS1:
+        case RT5677_JD_CTRL1:
+        case RT5677_JD_CTRL2:
+        case RT5677_JD_CTRL3:
+        case RT5677_IRQ_CTRL1:
+        case RT5677_IRQ_CTRL2:
+        case RT5677_GPIO_ST:
+        case RT5677_GPIO_CTRL1:
+        case RT5677_GPIO_CTRL2:
+        case RT5677_GPIO_CTRL3:
+        case RT5677_STO1_ADC_HI_FILTER1:
+        case RT5677_STO1_ADC_HI_FILTER2:
+        case RT5677_MONO_ADC_HI_FILTER1:
+        case RT5677_MONO_ADC_HI_FILTER2:
+        case RT5677_STO2_ADC_HI_FILTER1:
+        case RT5677_STO2_ADC_HI_FILTER2:
+        case RT5677_STO3_ADC_HI_FILTER1:
+        case RT5677_STO3_ADC_HI_FILTER2:
+        case RT5677_STO4_ADC_HI_FILTER1:
+        case RT5677_STO4_ADC_HI_FILTER2:
+        case RT5677_MB_DRC_CTRL1:
+        case RT5677_DRC1_CTRL1:
+        case RT5677_DRC1_CTRL2:
+        case RT5677_DRC1_CTRL3:
+        case RT5677_DRC1_CTRL4:
+        case RT5677_DRC1_CTRL5:
+        case RT5677_DRC1_CTRL6:
+        case RT5677_DRC2_CTRL1:
+        case RT5677_DRC2_CTRL2:
+        case RT5677_DRC2_CTRL3:
+        case RT5677_DRC2_CTRL4:
+        case RT5677_DRC2_CTRL5:
+        case RT5677_DRC2_CTRL6:
+        case RT5677_DRC1_HL_CTRL1:
+        case RT5677_DRC1_HL_CTRL2:
+        case RT5677_DRC2_HL_CTRL1:
+        case RT5677_DRC2_HL_CTRL2:
+        case RT5677_DSP_INB1_SRC_CTRL1:
+        case RT5677_DSP_INB1_SRC_CTRL2:
+        case RT5677_DSP_INB1_SRC_CTRL3:
+        case RT5677_DSP_INB1_SRC_CTRL4:
+        case RT5677_DSP_INB2_SRC_CTRL1:
+        case RT5677_DSP_INB2_SRC_CTRL2:
+        case RT5677_DSP_INB2_SRC_CTRL3:
+        case RT5677_DSP_INB2_SRC_CTRL4:
+        case RT5677_DSP_INB3_SRC_CTRL1:
+        case RT5677_DSP_INB3_SRC_CTRL2:
+        case RT5677_DSP_INB3_SRC_CTRL3:
+        case RT5677_DSP_INB3_SRC_CTRL4:
+        case RT5677_DSP_OUTB1_SRC_CTRL1:
+        case RT5677_DSP_OUTB1_SRC_CTRL2:
+        case RT5677_DSP_OUTB1_SRC_CTRL3:
+        case RT5677_DSP_OUTB1_SRC_CTRL4:
+        case RT5677_DSP_OUTB2_SRC_CTRL1:
+        case RT5677_DSP_OUTB2_SRC_CTRL2:
+        case RT5677_DSP_OUTB2_SRC_CTRL3:
+        case RT5677_DSP_OUTB2_SRC_CTRL4:
+        case RT5677_DSP_OUTB_0123_MIXER_CTRL:
+        case RT5677_DSP_OUTB_45_MIXER_CTRL:
+        case RT5677_DSP_OUTB_67_MIXER_CTRL:
+        case RT5677_DIG_MISC:
+        case RT5677_GEN_CTRL1:
+        case RT5677_GEN_CTRL2:
+        case RT5677_VENDOR_ID:
+        case RT5677_VENDOR_ID1:
+        case RT5677_VENDOR_ID2:
+                return true;
+        default:
+                return false;
+        }
+}
+static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
+static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
+static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
+/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
+static unsigned int bst_tlv[] = {
+        TLV_DB_RANGE_HEAD(7),
+        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+        1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),
+        2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0),
+        3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0),
+        6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),
+        7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),
+        8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0),
+};
+static const struct snd_kcontrol_new rt5677_snd_controls[] = {
+        /* OUTPUT Control */
+        SOC_SINGLE("OUT1 Playback Switch", RT5677_LOUT1,
+                RT5677_LOUT1_L_MUTE_SFT, 1, 1),
+        SOC_SINGLE("OUT2 Playback Switch", RT5677_LOUT1,
+                RT5677_LOUT2_L_MUTE_SFT, 1, 1),
+        SOC_SINGLE("OUT3 Playback Switch", RT5677_LOUT1,
+                RT5677_LOUT3_L_MUTE_SFT, 1, 1),
+        /* DAC Digital Volume */
+        SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5677_DAC1_DIG_VOL,
+                RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("DAC2 Playback Volume", RT5677_DAC2_DIG_VOL,
+                RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("DAC3 Playback Volume", RT5677_DAC3_DIG_VOL,
+                RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("DAC4 Playback Volume", RT5677_DAC4_DIG_VOL,
+                RT5677_L_VOL_SFT, RT5677_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        /* IN1/IN2 Control */
+        SOC_SINGLE_TLV("IN1 Boost", RT5677_IN1, RT5677_BST_SFT1, 8, 0, bst_tlv),
+        SOC_SINGLE_TLV("IN2 Boost", RT5677_IN1, RT5677_BST_SFT2, 8, 0, bst_tlv),
+        /* ADC Digital Volume Control */
+        SOC_DOUBLE("ADC1 Capture Switch", RT5677_STO1_ADC_DIG_VOL,
+                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE("ADC2 Capture Switch", RT5677_STO2_ADC_DIG_VOL,
+                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE("ADC3 Capture Switch", RT5677_STO3_ADC_DIG_VOL,
+                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE("ADC4 Capture Switch", RT5677_STO4_ADC_DIG_VOL,
+                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE("Mono ADC Capture Switch", RT5677_MONO_ADC_DIG_VOL,
+                RT5677_L_MUTE_SFT, RT5677_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("ADC1 Capture Volume", RT5677_STO1_ADC_DIG_VOL,
+                RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+                adc_vol_tlv),
+        SOC_DOUBLE_TLV("ADC2 Capture Volume", RT5677_STO2_ADC_DIG_VOL,
+                RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+                adc_vol_tlv),
+        SOC_DOUBLE_TLV("ADC3 Capture Volume", RT5677_STO3_ADC_DIG_VOL,
+                RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+                adc_vol_tlv),
+        SOC_DOUBLE_TLV("ADC4 Capture Volume", RT5677_STO4_ADC_DIG_VOL,
+                RT5677_STO1_ADC_L_VOL_SFT, RT5677_STO1_ADC_R_VOL_SFT, 127, 0,
+                adc_vol_tlv),
+        SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5677_MONO_ADC_DIG_VOL,
+                RT5677_MONO_ADC_L_VOL_SFT, RT5677_MONO_ADC_R_VOL_SFT, 127, 0,
+                adc_vol_tlv),
+        /* ADC Boost Volume Control */
+        SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5677_STO1_2_ADC_BST,
+                RT5677_STO1_ADC_L_BST_SFT, RT5677_STO1_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+        SOC_DOUBLE_TLV("STO2 ADC Boost Gain", RT5677_STO1_2_ADC_BST,
+                RT5677_STO2_ADC_L_BST_SFT, RT5677_STO2_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+        SOC_DOUBLE_TLV("STO3 ADC Boost Gain", RT5677_STO3_4_ADC_BST,
+                RT5677_STO3_ADC_L_BST_SFT, RT5677_STO3_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+        SOC_DOUBLE_TLV("STO4 ADC Boost Gain", RT5677_STO3_4_ADC_BST,
+                RT5677_STO4_ADC_L_BST_SFT, RT5677_STO4_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+        SOC_DOUBLE_TLV("Mono ADC Boost Gain", RT5677_ADC_BST_CTRL2,
+                RT5677_MONO_ADC_L_BST_SFT, RT5677_MONO_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+};
+/**
+ * set_dmic_clk - Set parameter of dmic.
+ *
+ * @w: DAPM widget.
+ * @kcontrol: The kcontrol of this widget.
+ * @event: Event id.
+ *
+ * Choose dmic clock between 1MHz and 3MHz.
+ * It is better for clock to approximate 3MHz.
+ */
+static int set_dmic_clk(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        int div[] = {2, 3, 4, 6, 8, 12}, idx = -EINVAL, i;
+        int rate, red, bound, temp;
+        rate = rt5677->sysclk;
+        red = 3000000 * 12;
+        for (i = 0; i < ARRAY_SIZE(div); i++) {
+                bound = div[i] * 3000000;
+                if (rate > bound)
+                        continue;
+                temp = bound - rate;
+                if (temp < red) {
+                        red = temp;
+                        idx = i;
+                }
+        }
+        if (idx < 0)
+                dev_err(codec->dev, "Failed to set DMIC clock\n");
+        else
+                regmap_update_bits(rt5677->regmap, RT5677_DMIC_CTRL1,
+                        RT5677_DMIC_CLK_MASK, idx << RT5677_DMIC_CLK_SFT);
+        return idx;
+}
+static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(source->codec);
+        unsigned int val;
+        regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val);
+        val &= RT5677_SCLK_SRC_MASK;
+        if (val == RT5677_SCLK_SRC_PLL1)
+                return 1;
+        else
+                return 0;
+}
+/* Digital Mixer */
+static const struct snd_kcontrol_new rt5677_sto1_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
+                        RT5677_M_STO1_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO1_ADC_MIXER,
+                        RT5677_M_STO1_ADC_L2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto1_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
+                        RT5677_M_STO1_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO1_ADC_MIXER,
+                        RT5677_M_STO1_ADC_R2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto2_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO2_ADC_MIXER,
+                        RT5677_M_STO2_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO2_ADC_MIXER,
+                        RT5677_M_STO2_ADC_L2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto2_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO2_ADC_MIXER,
+                        RT5677_M_STO2_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO2_ADC_MIXER,
+                        RT5677_M_STO2_ADC_R2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto3_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO3_ADC_MIXER,
+                        RT5677_M_STO3_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO3_ADC_MIXER,
+                        RT5677_M_STO3_ADC_L2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto3_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO3_ADC_MIXER,
+                        RT5677_M_STO3_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO3_ADC_MIXER,
+                        RT5677_M_STO3_ADC_R2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto4_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO4_ADC_MIXER,
+                        RT5677_M_STO4_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO4_ADC_MIXER,
+                        RT5677_M_STO4_ADC_L2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto4_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO4_ADC_MIXER,
+                        RT5677_M_STO4_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_STO4_ADC_MIXER,
+                        RT5677_M_STO4_ADC_R2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_mono_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_MONO_ADC_MIXER,
+                        RT5677_M_MONO_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_MONO_ADC_MIXER,
+                        RT5677_M_MONO_ADC_L2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_mono_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5677_MONO_ADC_MIXER,
+                        RT5677_M_MONO_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5677_MONO_ADC_MIXER,
+                        RT5677_M_MONO_ADC_R2_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5677_ADC_IF_DSP_DAC1_MIXER,
+                        RT5677_M_ADDA_MIXER1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5677_ADC_IF_DSP_DAC1_MIXER,
+                        RT5677_M_DAC1_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5677_ADC_IF_DSP_DAC1_MIXER,
+                        RT5677_M_ADDA_MIXER1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5677_ADC_IF_DSP_DAC1_MIXER,
+                        RT5677_M_DAC1_R_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto1_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("ST L Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_ST_DAC1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC1_L_STO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC2_L_STO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC1_R_STO_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_sto1_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("ST R Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_ST_DAC1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC1_R_STO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC2_R_STO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,
+                        RT5677_M_DAC1_L_STO_R_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_mono_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("ST L Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_ST_DAC2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC1_L_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC2_L_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC2_R_MONO_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_mono_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("ST R Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_ST_DAC2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC1_R_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC2_R_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,
+                        RT5677_M_DAC2_L_MONO_R_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dd1_l_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix L Switch", RT5677_DD1_MIXER,
+                        RT5677_M_STO_L_DD1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Mono DAC Mix L Switch", RT5677_DD1_MIXER,
+                        RT5677_M_MONO_L_DD1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC3 L Switch", RT5677_DD1_MIXER,
+                        RT5677_M_DAC3_L_DD1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC3 R Switch", RT5677_DD1_MIXER,
+                        RT5677_M_DAC3_R_DD1_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dd1_r_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix R Switch", RT5677_DD1_MIXER,
+                        RT5677_M_STO_R_DD1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Mono DAC Mix R Switch", RT5677_DD1_MIXER,
+                        RT5677_M_MONO_R_DD1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC3 R Switch", RT5677_DD1_MIXER,
+                        RT5677_M_DAC3_R_DD1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC3 L Switch", RT5677_DD1_MIXER,
+                        RT5677_M_DAC3_L_DD1_R_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dd2_l_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix L Switch", RT5677_DD2_MIXER,
+                        RT5677_M_STO_L_DD2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Mono DAC Mix L Switch", RT5677_DD2_MIXER,
+                        RT5677_M_MONO_L_DD2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC4 L Switch", RT5677_DD2_MIXER,
+                        RT5677_M_DAC4_L_DD2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC4 R Switch", RT5677_DD2_MIXER,
+                        RT5677_M_DAC4_R_DD2_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_dd2_r_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix R Switch", RT5677_DD2_MIXER,
+                        RT5677_M_STO_R_DD2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("Mono DAC Mix R Switch", RT5677_DD2_MIXER,
+                        RT5677_M_MONO_R_DD2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC4 R Switch", RT5677_DD2_MIXER,
+                        RT5677_M_DAC4_R_DD2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC4 L Switch", RT5677_DD2_MIXER,
+                        RT5677_M_DAC4_L_DD2_R_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_01_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_01_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_23_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_45_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_6_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_7_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_8_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_9_H_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_23_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_01_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_23_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_45_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_6_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_7_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_8_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_0123_MIXER_CTRL,
+                        RT5677_DSP_IB_9_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_4_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_01_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_23_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_45_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_6_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_7_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_8_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_9_H_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_5_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_01_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_23_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_45_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_6_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_7_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_8_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_45_MIXER_CTRL,
+                        RT5677_DSP_IB_9_L_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_6_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_01_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_23_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_45_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_6_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_7_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_8_H_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_9_H_SFT, 1, 1),
+};
+static const struct snd_kcontrol_new rt5677_ob_7_mix[] = {
+        SOC_DAPM_SINGLE("IB01 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_01_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB23 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_23_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB45 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_45_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB6 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_6_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB7 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_7_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB8 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_8_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("IB9 Switch", RT5677_DSP_OUTB_67_MIXER_CTRL,
+                        RT5677_DSP_IB_9_L_SFT, 1, 1),
+};
+/* Mux */
+/* DAC1 L/R source */ /* MX-29 [10:8] */
+static const char * const rt5677_dac1_src[] = {
+        "IF1 DAC 01", "IF2 DAC 01", "IF3 DAC LR", "IF4 DAC LR", "SLB DAC 01",
+        "OB 01"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac1_enum, RT5677_ADC_IF_DSP_DAC1_MIXER,
+        RT5677_DAC1_L_SEL_SFT, rt5677_dac1_src);
+static const struct snd_kcontrol_new rt5677_dac1_mux =
+        SOC_DAPM_ENUM("DAC1 source", rt5677_dac1_enum);
+/* ADDA1 L/R source */ /* MX-29 [1:0] */
+static const char * const rt5677_adda1_src[] = {
+        "STO1 ADC MIX", "STO2 ADC MIX", "OB 67",
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_adda1_enum, RT5677_ADC_IF_DSP_DAC1_MIXER,
+        RT5677_ADDA1_SEL_SFT, rt5677_adda1_src);
+static const struct snd_kcontrol_new rt5677_adda1_mux =
+        SOC_DAPM_ENUM("ADDA1 source", rt5677_adda1_enum);
+/*DAC2 L/R source*/ /* MX-1B [6:4] [2:0] */
+static const char * const rt5677_dac2l_src[] = {
+        "IF1 DAC 2", "IF2 DAC 2", "IF3 DAC L", "IF4 DAC L", "SLB DAC 2",
+        "OB 2",
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac2l_enum, RT5677_IF_DSP_DAC2_MIXER,
+        RT5677_SEL_DAC2_L_SRC_SFT, rt5677_dac2l_src);
+static const struct snd_kcontrol_new rt5677_dac2_l_mux =
+        SOC_DAPM_ENUM("DAC2 L source", rt5677_dac2l_enum);
+static const char * const rt5677_dac2r_src[] = {
+        "IF1 DAC 3", "IF2 DAC 3", "IF3 DAC R", "IF4 DAC R", "SLB DAC 3",
+        "OB 3", "Haptic Generator", "VAD ADC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac2r_enum, RT5677_IF_DSP_DAC2_MIXER,
+        RT5677_SEL_DAC2_R_SRC_SFT, rt5677_dac2r_src);
+static const struct snd_kcontrol_new rt5677_dac2_r_mux =
+        SOC_DAPM_ENUM("DAC2 R source", rt5677_dac2r_enum);
+/*DAC3 L/R source*/ /* MX-16 [6:4] [2:0] */
+static const char * const rt5677_dac3l_src[] = {
+        "IF1 DAC 4", "IF2 DAC 4", "IF3 DAC L", "IF4 DAC L",
+        "SLB DAC 4", "OB 4"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac3l_enum, RT5677_IF_DSP_DAC3_4_MIXER,
+        RT5677_SEL_DAC3_L_SRC_SFT, rt5677_dac3l_src);
+static const struct snd_kcontrol_new rt5677_dac3_l_mux =
+        SOC_DAPM_ENUM("DAC3 L source", rt5677_dac3l_enum);
+static const char * const rt5677_dac3r_src[] = {
+        "IF1 DAC 5", "IF2 DAC 5", "IF3 DAC R", "IF4 DAC R",
+        "SLB DAC 5", "OB 5"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac3r_enum, RT5677_IF_DSP_DAC3_4_MIXER,
+        RT5677_SEL_DAC3_R_SRC_SFT, rt5677_dac3r_src);
+static const struct snd_kcontrol_new rt5677_dac3_r_mux =
+        SOC_DAPM_ENUM("DAC3 R source", rt5677_dac3r_enum);
+/*DAC4 L/R source*/ /* MX-16 [14:12] [10:8] */
+static const char * const rt5677_dac4l_src[] = {
+        "IF1 DAC 6", "IF2 DAC 6", "IF3 DAC L", "IF4 DAC L",
+        "SLB DAC 6", "OB 6"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac4l_enum, RT5677_IF_DSP_DAC3_4_MIXER,
+        RT5677_SEL_DAC4_L_SRC_SFT, rt5677_dac4l_src);
+static const struct snd_kcontrol_new rt5677_dac4_l_mux =
+        SOC_DAPM_ENUM("DAC4 L source", rt5677_dac4l_enum);
+static const char * const rt5677_dac4r_src[] = {
+        "IF1 DAC 7", "IF2 DAC 7", "IF3 DAC R", "IF4 DAC R",
+        "SLB DAC 7", "OB 7"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac4r_enum, RT5677_IF_DSP_DAC3_4_MIXER,
+        RT5677_SEL_DAC4_R_SRC_SFT, rt5677_dac4r_src);
+static const struct snd_kcontrol_new rt5677_dac4_r_mux =
+        SOC_DAPM_ENUM("DAC4 R source", rt5677_dac4r_enum);
+/* In/OutBound Source Pass SRC */ /* MX-A5 [3] [4] [0] [1] [2] */
+static const char * const rt5677_iob_bypass_src[] = {
+        "Bypass", "Pass SRC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_ob01_bypass_src_enum, RT5677_DSP_IN_OUTB_CTRL,
+        RT5677_SEL_SRC_OB01_SFT, rt5677_iob_bypass_src);
+static const struct snd_kcontrol_new rt5677_ob01_bypass_src_mux =
+        SOC_DAPM_ENUM("OB01 Bypass source", rt5677_ob01_bypass_src_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_ob23_bypass_src_enum, RT5677_DSP_IN_OUTB_CTRL,
+        RT5677_SEL_SRC_OB23_SFT, rt5677_iob_bypass_src);
+static const struct snd_kcontrol_new rt5677_ob23_bypass_src_mux =
+        SOC_DAPM_ENUM("OB23 Bypass source", rt5677_ob23_bypass_src_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_ib01_bypass_src_enum, RT5677_DSP_IN_OUTB_CTRL,
+        RT5677_SEL_SRC_IB01_SFT, rt5677_iob_bypass_src);
+static const struct snd_kcontrol_new rt5677_ib01_bypass_src_mux =
+        SOC_DAPM_ENUM("IB01 Bypass source", rt5677_ib01_bypass_src_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_ib23_bypass_src_enum, RT5677_DSP_IN_OUTB_CTRL,
+        RT5677_SEL_SRC_IB23_SFT, rt5677_iob_bypass_src);
+static const struct snd_kcontrol_new rt5677_ib23_bypass_src_mux =
+        SOC_DAPM_ENUM("IB23 Bypass source", rt5677_ib23_bypass_src_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_ib45_bypass_src_enum, RT5677_DSP_IN_OUTB_CTRL,
+        RT5677_SEL_SRC_IB45_SFT, rt5677_iob_bypass_src);
+static const struct snd_kcontrol_new rt5677_ib45_bypass_src_mux =
+        SOC_DAPM_ENUM("IB45 Bypass source", rt5677_ib45_bypass_src_enum);
+/* Stereo ADC Source 2 */ /* MX-27 MX26  MX25 [11:10] */
+static const char * const rt5677_stereo_adc2_src[] = {
+        "DD MIX1", "DMIC", "Stereo DAC MIX"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo1_adc2_enum, RT5677_STO1_ADC_MIXER,
+        RT5677_SEL_STO1_ADC2_SFT, rt5677_stereo_adc2_src);
+static const struct snd_kcontrol_new rt5677_sto1_adc2_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC2 source", rt5677_stereo1_adc2_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo2_adc2_enum, RT5677_STO2_ADC_MIXER,
+        RT5677_SEL_STO2_ADC2_SFT, rt5677_stereo_adc2_src);
+static const struct snd_kcontrol_new rt5677_sto2_adc2_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC2 source", rt5677_stereo2_adc2_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo3_adc2_enum, RT5677_STO3_ADC_MIXER,
+        RT5677_SEL_STO3_ADC2_SFT, rt5677_stereo_adc2_src);
+static const struct snd_kcontrol_new rt5677_sto3_adc2_mux =
+        SOC_DAPM_ENUM("Stereo3 ADC2 source", rt5677_stereo3_adc2_enum);
+/* DMIC Source */ /* MX-28 [9:8][1:0] MX-27 MX-26 MX-25 MX-24 [9:8] */
+static const char * const rt5677_dmic_src[] = {
+        "DMIC1", "DMIC2", "DMIC3", "DMIC4"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_dmic_l_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_DMIC_L_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_mono_dmic_l_mux =
+        SOC_DAPM_ENUM("Mono DMIC L source", rt5677_mono_dmic_l_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_dmic_r_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_DMIC_R_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_mono_dmic_r_mux =
+        SOC_DAPM_ENUM("Mono DMIC R source", rt5677_mono_dmic_r_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo1_dmic_enum, RT5677_STO1_ADC_MIXER,
+        RT5677_SEL_STO1_DMIC_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_sto1_dmic_mux =
+        SOC_DAPM_ENUM("Stereo1 DMIC source", rt5677_stereo1_dmic_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo2_dmic_enum, RT5677_STO2_ADC_MIXER,
+        RT5677_SEL_STO2_DMIC_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_sto2_dmic_mux =
+        SOC_DAPM_ENUM("Stereo2 DMIC source", rt5677_stereo2_dmic_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo3_dmic_enum, RT5677_STO3_ADC_MIXER,
+        RT5677_SEL_STO3_DMIC_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_sto3_dmic_mux =
+        SOC_DAPM_ENUM("Stereo3 DMIC source", rt5677_stereo3_dmic_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo4_dmic_enum, RT5677_STO4_ADC_MIXER,
+        RT5677_SEL_STO4_DMIC_SFT, rt5677_dmic_src);
+static const struct snd_kcontrol_new rt5677_sto4_dmic_mux =
+        SOC_DAPM_ENUM("Stereo4 DMIC source", rt5677_stereo4_dmic_enum);
+/* Stereo2 ADC source */ /* MX-26 [0] */
+static const char * const rt5677_stereo2_adc_lr_src[] = {
+        "L", "LR"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo2_adc_lr_enum, RT5677_STO2_ADC_MIXER,
+        RT5677_SEL_STO2_LR_MIX_SFT, rt5677_stereo2_adc_lr_src);
+static const struct snd_kcontrol_new rt5677_sto2_adc_lr_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC LR source", rt5677_stereo2_adc_lr_enum);
+/* Stereo1 ADC Source 1 */ /* MX-27 MX26  MX25 [13:12] */
+static const char * const rt5677_stereo_adc1_src[] = {
+        "DD MIX1", "ADC1/2", "Stereo DAC MIX"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo1_adc1_enum, RT5677_STO1_ADC_MIXER,
+        RT5677_SEL_STO1_ADC1_SFT, rt5677_stereo_adc1_src);
+static const struct snd_kcontrol_new rt5677_sto1_adc1_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC1 source", rt5677_stereo1_adc1_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo2_adc1_enum, RT5677_STO2_ADC_MIXER,
+        RT5677_SEL_STO2_ADC1_SFT, rt5677_stereo_adc1_src);
+static const struct snd_kcontrol_new rt5677_sto2_adc1_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC1 source", rt5677_stereo2_adc1_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo3_adc1_enum, RT5677_STO3_ADC_MIXER,
+        RT5677_SEL_STO3_ADC1_SFT, rt5677_stereo_adc1_src);
+static const struct snd_kcontrol_new rt5677_sto3_adc1_mux =
+        SOC_DAPM_ENUM("Stereo3 ADC1 source", rt5677_stereo3_adc1_enum);
+/* Mono ADC Left source 2 */ /* MX-28 [11:10] */
+static const char * const rt5677_mono_adc2_l_src[] = {
+        "DD MIX1L", "DMIC", "MONO DAC MIXL"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_adc2_l_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_ADC_L2_SFT, rt5677_mono_adc2_l_src);
+static const struct snd_kcontrol_new rt5677_mono_adc2_l_mux =
+        SOC_DAPM_ENUM("Mono ADC2 L source", rt5677_mono_adc2_l_enum);
+/* Mono ADC Left source 1 */ /* MX-28 [13:12] */
+static const char * const rt5677_mono_adc1_l_src[] = {
+        "DD MIX1L", "ADC1", "MONO DAC MIXL"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_adc1_l_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_ADC_L1_SFT, rt5677_mono_adc1_l_src);
+static const struct snd_kcontrol_new rt5677_mono_adc1_l_mux =
+        SOC_DAPM_ENUM("Mono ADC1 L source", rt5677_mono_adc1_l_enum);
+/* Mono ADC Right source 2 */ /* MX-28 [3:2] */
+static const char * const rt5677_mono_adc2_r_src[] = {
+        "DD MIX1R", "DMIC", "MONO DAC MIXR"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_adc2_r_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_ADC_R2_SFT, rt5677_mono_adc2_r_src);
+static const struct snd_kcontrol_new rt5677_mono_adc2_r_mux =
+        SOC_DAPM_ENUM("Mono ADC2 R source", rt5677_mono_adc2_r_enum);
+/* Mono ADC Right source 1 */ /* MX-28 [5:4] */
+static const char * const rt5677_mono_adc1_r_src[] = {
+        "DD MIX1R", "ADC2", "MONO DAC MIXR"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_mono_adc1_r_enum, RT5677_MONO_ADC_MIXER,
+        RT5677_SEL_MONO_ADC_R1_SFT, rt5677_mono_adc1_r_src);
+static const struct snd_kcontrol_new rt5677_mono_adc1_r_mux =
+        SOC_DAPM_ENUM("Mono ADC1 R source", rt5677_mono_adc1_r_enum);
+/* Stereo4 ADC Source 2 */ /* MX-24 [11:10] */
+static const char * const rt5677_stereo4_adc2_src[] = {
+        "DD MIX1", "DMIC", "DD MIX2"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo4_adc2_enum, RT5677_STO4_ADC_MIXER,
+        RT5677_SEL_STO4_ADC2_SFT, rt5677_stereo4_adc2_src);
+static const struct snd_kcontrol_new rt5677_sto4_adc2_mux =
+        SOC_DAPM_ENUM("Stereo4 ADC2 source", rt5677_stereo4_adc2_enum);
+/* Stereo4 ADC Source 1 */ /* MX-24 [13:12] */
+static const char * const rt5677_stereo4_adc1_src[] = {
+        "DD MIX1", "ADC1/2", "DD MIX2"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_stereo4_adc1_enum, RT5677_STO4_ADC_MIXER,
+        RT5677_SEL_STO4_ADC1_SFT, rt5677_stereo4_adc1_src);
+static const struct snd_kcontrol_new rt5677_sto4_adc1_mux =
+        SOC_DAPM_ENUM("Stereo4 ADC1 source", rt5677_stereo4_adc1_enum);
+/* InBound0/1 Source */ /* MX-A3 [14:12] */
+static const char * const rt5677_inbound01_src[] = {
+        "IF1 DAC 01", "IF2 DAC 01", "SLB DAC 01", "STO1 ADC MIX",
+        "VAD ADC/DAC1 FS"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound01_enum, RT5677_DSP_INB_CTRL1,
+        RT5677_IB01_SRC_SFT, rt5677_inbound01_src);
+static const struct snd_kcontrol_new rt5677_ib01_src_mux =
+        SOC_DAPM_ENUM("InBound0/1 Source", rt5677_inbound01_enum);
+/* InBound2/3 Source */ /* MX-A3 [10:8] */
+static const char * const rt5677_inbound23_src[] = {
+        "IF1 DAC 23", "IF2 DAC 23", "SLB DAC 23", "STO2 ADC MIX",
+        "DAC1 FS", "IF4 DAC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound23_enum, RT5677_DSP_INB_CTRL1,
+        RT5677_IB23_SRC_SFT, rt5677_inbound23_src);
+static const struct snd_kcontrol_new rt5677_ib23_src_mux =
+        SOC_DAPM_ENUM("InBound2/3 Source", rt5677_inbound23_enum);
+/* InBound4/5 Source */ /* MX-A3 [6:4] */
+static const char * const rt5677_inbound45_src[] = {
+        "IF1 DAC 45", "IF2 DAC 45", "SLB DAC 45", "STO3 ADC MIX",
+        "IF3 DAC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound45_enum, RT5677_DSP_INB_CTRL1,
+        RT5677_IB45_SRC_SFT, rt5677_inbound45_src);
+static const struct snd_kcontrol_new rt5677_ib45_src_mux =
+        SOC_DAPM_ENUM("InBound4/5 Source", rt5677_inbound45_enum);
+/* InBound6 Source */ /* MX-A3 [2:0] */
+static const char * const rt5677_inbound6_src[] = {
+        "IF1 DAC 6", "IF2 DAC 6", "SLB DAC 6", "STO4 ADC MIX L",
+        "IF4 DAC L", "STO1 ADC MIX L", "STO2 ADC MIX L", "STO3 ADC MIX L"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound6_enum, RT5677_DSP_INB_CTRL1,
+        RT5677_IB6_SRC_SFT, rt5677_inbound6_src);
+static const struct snd_kcontrol_new rt5677_ib6_src_mux =
+        SOC_DAPM_ENUM("InBound6 Source", rt5677_inbound6_enum);
+/* InBound7 Source */ /* MX-A4 [14:12] */
+static const char * const rt5677_inbound7_src[] = {
+        "IF1 DAC 7", "IF2 DAC 7", "SLB DAC 7", "STO4 ADC MIX R",
+        "IF4 DAC R", "STO1 ADC MIX R", "STO2 ADC MIX R", "STO3 ADC MIX R"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound7_enum, RT5677_DSP_INB_CTRL2,
+        RT5677_IB7_SRC_SFT, rt5677_inbound7_src);
+static const struct snd_kcontrol_new rt5677_ib7_src_mux =
+        SOC_DAPM_ENUM("InBound7 Source", rt5677_inbound7_enum);
+/* InBound8 Source */ /* MX-A4 [10:8] */
+static const char * const rt5677_inbound8_src[] = {
+        "STO1 ADC MIX L", "STO2 ADC MIX L", "STO3 ADC MIX L", "STO4 ADC MIX L",
+        "MONO ADC MIX L", "DACL1 FS"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound8_enum, RT5677_DSP_INB_CTRL2,
+        RT5677_IB8_SRC_SFT, rt5677_inbound8_src);
+static const struct snd_kcontrol_new rt5677_ib8_src_mux =
+        SOC_DAPM_ENUM("InBound8 Source", rt5677_inbound8_enum);
+/* InBound9 Source */ /* MX-A4 [6:4] */
+static const char * const rt5677_inbound9_src[] = {
+        "STO1 ADC MIX R", "STO2 ADC MIX R", "STO3 ADC MIX R", "STO4 ADC MIX R",
+        "MONO ADC MIX R", "DACR1 FS", "DAC1 FS"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_inbound9_enum, RT5677_DSP_INB_CTRL2,
+        RT5677_IB9_SRC_SFT, rt5677_inbound9_src);
+static const struct snd_kcontrol_new rt5677_ib9_src_mux =
+        SOC_DAPM_ENUM("InBound9 Source", rt5677_inbound9_enum);
+/* VAD Source */ /* MX-9F [6:4] */
+static const char * const rt5677_vad_src[] = {
+        "STO1 ADC MIX L", "MONO ADC MIX L", "MONO ADC MIX R", "STO2 ADC MIX L",
+        "STO3 ADC MIX L"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_vad_enum, RT5677_VAD_CTRL4,
+        RT5677_VAD_SRC_SFT, rt5677_vad_src);
+static const struct snd_kcontrol_new rt5677_vad_src_mux =
+        SOC_DAPM_ENUM("VAD Source", rt5677_vad_enum);
+/* Sidetone Source */ /* MX-13 [11:9] */
+static const char * const rt5677_sidetone_src[] = {
+        "DMIC1 L", "DMIC2 L", "DMIC3 L", "DMIC4 L", "ADC1", "ADC2"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_sidetone_enum, RT5677_SIDETONE_CTRL,
+        RT5677_ST_SEL_SFT, rt5677_sidetone_src);
+static const struct snd_kcontrol_new rt5677_sidetone_mux =
+        SOC_DAPM_ENUM("Sidetone Source", rt5677_sidetone_enum);
+/* DAC1/2 Source */ /* MX-15 [1:0] */
+static const char * const rt5677_dac12_src[] = {
+        "STO1 DAC MIX", "MONO DAC MIX", "DD MIX1", "DD MIX2"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac12_enum, RT5677_ANA_DAC1_2_3_SRC,
+        RT5677_ANA_DAC1_2_SRC_SEL_SFT, rt5677_dac12_src);
+static const struct snd_kcontrol_new rt5677_dac12_mux =
+        SOC_DAPM_ENUM("Analog DAC1/2 Source", rt5677_dac12_enum);
+/* DAC3 Source */ /* MX-15 [5:4] */
+static const char * const rt5677_dac3_src[] = {
+        "MONO DAC MIXL", "MONO DAC MIXR", "DD MIX1L", "DD MIX2L"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_dac3_enum, RT5677_ANA_DAC1_2_3_SRC,
+        RT5677_ANA_DAC3_SRC_SEL_SFT, rt5677_dac3_src);
+static const struct snd_kcontrol_new rt5677_dac3_mux =
+        SOC_DAPM_ENUM("Analog DAC3 Source", rt5677_dac3_enum);
+/* PDM channel source */ /* MX-31 [13:12][9:8][5:4][1:0] */
+static const char * const rt5677_pdm_src[] = {
+        "STO1 DAC MIX", "MONO DAC MIX", "DD MIX1", "DD MIX2"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_pdm1_l_enum, RT5677_PDM_OUT_CTRL,
+        RT5677_SEL_PDM1_L_SFT, rt5677_pdm_src);
+static const struct snd_kcontrol_new rt5677_pdm1_l_mux =
+        SOC_DAPM_ENUM("PDM1 source", rt5677_pdm1_l_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_pdm2_l_enum, RT5677_PDM_OUT_CTRL,
+        RT5677_SEL_PDM2_L_SFT, rt5677_pdm_src);
+static const struct snd_kcontrol_new rt5677_pdm2_l_mux =
+        SOC_DAPM_ENUM("PDM2 source", rt5677_pdm2_l_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_pdm1_r_enum, RT5677_PDM_OUT_CTRL,
+        RT5677_SEL_PDM1_R_SFT, rt5677_pdm_src);
+static const struct snd_kcontrol_new rt5677_pdm1_r_mux =
+        SOC_DAPM_ENUM("PDM1 source", rt5677_pdm1_r_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_pdm2_r_enum, RT5677_PDM_OUT_CTRL,
+        RT5677_SEL_PDM2_R_SFT, rt5677_pdm_src);
+static const struct snd_kcontrol_new rt5677_pdm2_r_mux =
+        SOC_DAPM_ENUM("PDM2 source", rt5677_pdm2_r_enum);
+/* TDM IF1/2 SLB ADC1 Data Selection */ /* MX-3C MX-41 [5:4] MX-08 [1:0]*/
+static const char * const rt5677_if12_adc1_src[] = {
+        "STO1 ADC MIX", "OB01", "VAD ADC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if1_adc1_enum, RT5677_TDM1_CTRL2,
+        RT5677_IF1_ADC1_SFT, rt5677_if12_adc1_src);
+static const struct snd_kcontrol_new rt5677_if1_adc1_mux =
+        SOC_DAPM_ENUM("IF1 ADC1 source", rt5677_if1_adc1_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if2_adc1_enum, RT5677_TDM2_CTRL2,
+        RT5677_IF2_ADC1_SFT, rt5677_if12_adc1_src);
+static const struct snd_kcontrol_new rt5677_if2_adc1_mux =
+        SOC_DAPM_ENUM("IF2 ADC1 source", rt5677_if2_adc1_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_slb_adc1_enum, RT5677_SLIMBUS_RX,
+        RT5677_SLB_ADC1_SFT, rt5677_if12_adc1_src);
+static const struct snd_kcontrol_new rt5677_slb_adc1_mux =
+        SOC_DAPM_ENUM("SLB ADC1 source", rt5677_slb_adc1_enum);
+/* TDM IF1/2 SLB ADC2 Data Selection */ /* MX-3C MX-41 [7:6] MX-08 [3:2] */
+static const char * const rt5677_if12_adc2_src[] = {
+        "STO2 ADC MIX", "OB23"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if1_adc2_enum, RT5677_TDM1_CTRL2,
+        RT5677_IF1_ADC2_SFT, rt5677_if12_adc2_src);
+static const struct snd_kcontrol_new rt5677_if1_adc2_mux =
+        SOC_DAPM_ENUM("IF1 ADC2 source", rt5677_if1_adc2_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if2_adc2_enum, RT5677_TDM2_CTRL2,
+        RT5677_IF2_ADC2_SFT, rt5677_if12_adc2_src);
+static const struct snd_kcontrol_new rt5677_if2_adc2_mux =
+        SOC_DAPM_ENUM("IF2 ADC2 source", rt5677_if2_adc2_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_slb_adc2_enum, RT5677_SLIMBUS_RX,
+        RT5677_SLB_ADC2_SFT, rt5677_if12_adc2_src);
+static const struct snd_kcontrol_new rt5677_slb_adc2_mux =
+        SOC_DAPM_ENUM("SLB ADC2 source", rt5677_slb_adc2_enum);
+/* TDM IF1/2 SLB ADC3 Data Selection */ /* MX-3C MX-41 [9:8] MX-08 [5:4] */
+static const char * const rt5677_if12_adc3_src[] = {
+        "STO3 ADC MIX", "MONO ADC MIX", "OB45"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if1_adc3_enum, RT5677_TDM1_CTRL2,
+        RT5677_IF1_ADC3_SFT, rt5677_if12_adc3_src);
+static const struct snd_kcontrol_new rt5677_if1_adc3_mux =
+        SOC_DAPM_ENUM("IF1 ADC3 source", rt5677_if1_adc3_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if2_adc3_enum, RT5677_TDM2_CTRL2,
+        RT5677_IF2_ADC3_SFT, rt5677_if12_adc3_src);
+static const struct snd_kcontrol_new rt5677_if2_adc3_mux =
+        SOC_DAPM_ENUM("IF2 ADC3 source", rt5677_if2_adc3_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_slb_adc3_enum, RT5677_SLIMBUS_RX,
+        RT5677_SLB_ADC3_SFT, rt5677_if12_adc3_src);
+static const struct snd_kcontrol_new rt5677_slb_adc3_mux =
+        SOC_DAPM_ENUM("SLB ADC3 source", rt5677_slb_adc3_enum);
+/* TDM IF1/2 SLB ADC4 Data Selection */ /* MX-3C MX-41 [11:10]  MX-08 [7:6] */
+static const char * const rt5677_if12_adc4_src[] = {
+        "STO4 ADC MIX", "OB67", "OB01"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if1_adc4_enum, RT5677_TDM1_CTRL2,
+        RT5677_IF1_ADC4_SFT, rt5677_if12_adc4_src);
+static const struct snd_kcontrol_new rt5677_if1_adc4_mux =
+        SOC_DAPM_ENUM("IF1 ADC4 source", rt5677_if1_adc4_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if2_adc4_enum, RT5677_TDM2_CTRL2,
+        RT5677_IF2_ADC4_SFT, rt5677_if12_adc4_src);
+static const struct snd_kcontrol_new rt5677_if2_adc4_mux =
+        SOC_DAPM_ENUM("IF2 ADC4 source", rt5677_if2_adc4_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_slb_adc4_enum, RT5677_SLIMBUS_RX,
+        RT5677_SLB_ADC4_SFT, rt5677_if12_adc4_src);
+static const struct snd_kcontrol_new rt5677_slb_adc4_mux =
+        SOC_DAPM_ENUM("SLB ADC4 source", rt5677_slb_adc4_enum);
+/* Interface3/4 ADC Data Input */ /* MX-2F [3:0] MX-30 [7:4]*/
+static const char * const rt5677_if34_adc_src[] = {
+        "STO1 ADC MIX", "STO2 ADC MIX", "STO3 ADC MIX", "STO4 ADC MIX",
+        "MONO ADC MIX", "OB01", "OB23", "VAD ADC"
+};
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if3_adc_enum, RT5677_IF3_DATA,
+        RT5677_IF3_ADC_IN_SFT, rt5677_if34_adc_src);
+static const struct snd_kcontrol_new rt5677_if3_adc_mux =
+        SOC_DAPM_ENUM("IF3 ADC source", rt5677_if3_adc_enum);
+static SOC_ENUM_SINGLE_DECL(
+        rt5677_if4_adc_enum, RT5677_IF4_DATA,
+        RT5677_IF4_ADC_IN_SFT, rt5677_if34_adc_src);
+static const struct snd_kcontrol_new rt5677_if4_adc_mux =
+        SOC_DAPM_ENUM("IF4 ADC source", rt5677_if4_adc_enum);
+static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                        RT5677_PWR_BST1_P, RT5677_PWR_BST1_P);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                        RT5677_PWR_BST1_P, 0);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+static int rt5677_bst2_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                        RT5677_PWR_BST2_P, RT5677_PWR_BST2_P);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                        RT5677_PWR_BST2_P, 0);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x2);
+                regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x0);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x2);
+                regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x0);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                        RT5677_PWR_CLK_MB1 | RT5677_PWR_PP_MB1 |
+                        RT5677_PWR_CLK_MB, RT5677_PWR_CLK_MB1 |
+                        RT5677_PWR_PP_MB1 | RT5677_PWR_CLK_MB);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,
+                0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,
+                0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),
+        /* Input Side */
+        /* micbias */
+        SND_SOC_DAPM_SUPPLY("micbias1", RT5677_PWR_ANLG2, RT5677_PWR_MB1_BIT,
+                0, rt5677_set_micbias1_event, SND_SOC_DAPM_POST_PMU),
+        /* Input Lines */
+        SND_SOC_DAPM_INPUT("DMIC L1"),
+        SND_SOC_DAPM_INPUT("DMIC R1"),
+        SND_SOC_DAPM_INPUT("DMIC L2"),
+        SND_SOC_DAPM_INPUT("DMIC R2"),
+        SND_SOC_DAPM_INPUT("DMIC L3"),
+        SND_SOC_DAPM_INPUT("DMIC R3"),
+        SND_SOC_DAPM_INPUT("DMIC L4"),
+        SND_SOC_DAPM_INPUT("DMIC R4"),
+        SND_SOC_DAPM_INPUT("IN1P"),
+        SND_SOC_DAPM_INPUT("IN1N"),
+        SND_SOC_DAPM_INPUT("IN2P"),
+        SND_SOC_DAPM_INPUT("IN2N"),
+        SND_SOC_DAPM_INPUT("Haptic Generator"),
+        SND_SOC_DAPM_PGA("DMIC1", RT5677_DMIC_CTRL1, RT5677_DMIC_1_EN_SFT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_PGA("DMIC2", RT5677_DMIC_CTRL1, RT5677_DMIC_2_EN_SFT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_PGA("DMIC3", RT5677_DMIC_CTRL1, RT5677_DMIC_3_EN_SFT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_PGA("DMIC4", RT5677_DMIC_CTRL2, RT5677_DMIC_4_EN_SFT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0,
+                set_dmic_clk, SND_SOC_DAPM_PRE_PMU),
+        /* Boost */
+        SND_SOC_DAPM_PGA_E("BST1", RT5677_PWR_ANLG2,
+                RT5677_PWR_BST1_BIT, 0, NULL, 0, rt5677_bst1_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_E("BST2", RT5677_PWR_ANLG2,
+                RT5677_PWR_BST2_BIT, 0, NULL, 0, rt5677_bst2_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        /* ADCs */
+        SND_SOC_DAPM_ADC("ADC 1", NULL, SND_SOC_NOPM,
+                0, 0),
+        SND_SOC_DAPM_ADC("ADC 2", NULL, SND_SOC_NOPM,
+                0, 0),
+        SND_SOC_DAPM_PGA("ADC 1_2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC 1 power", RT5677_PWR_DIG1,
+                RT5677_PWR_ADC_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC 2 power", RT5677_PWR_DIG1,
+                RT5677_PWR_ADC_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC1 clock", RT5677_PWR_DIG1,
+                RT5677_PWR_ADCFED1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC2 clock", RT5677_PWR_DIG1,
+                RT5677_PWR_ADCFED2_BIT, 0, NULL, 0),
+        /* ADC Mux */
+        SND_SOC_DAPM_MUX("Stereo1 DMIC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto1_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto1_adc1_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto1_adc2_mux),
+        SND_SOC_DAPM_MUX("Stereo2 DMIC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto2_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto2_adc1_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto2_adc2_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC LR Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto2_adc_lr_mux),
+        SND_SOC_DAPM_MUX("Stereo3 DMIC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto3_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo3 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto3_adc1_mux),
+        SND_SOC_DAPM_MUX("Stereo3 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto3_adc2_mux),
+        SND_SOC_DAPM_MUX("Stereo4 DMIC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto4_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo4 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto4_adc1_mux),
+        SND_SOC_DAPM_MUX("Stereo4 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_sto4_adc2_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC L Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_dmic_l_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC R Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_dmic_r_mux),
+        SND_SOC_DAPM_MUX("Mono ADC2 L Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_adc2_l_mux),
+        SND_SOC_DAPM_MUX("Mono ADC1 L Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_adc1_l_mux),
+        SND_SOC_DAPM_MUX("Mono ADC1 R Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_adc1_r_mux),
+        SND_SOC_DAPM_MUX("Mono ADC2 R Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_mono_adc2_r_mux),
+        /* ADC Mixer */
+        SND_SOC_DAPM_SUPPLY("adc stereo1 filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_S1F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("adc stereo2 filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_S2F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("adc stereo3 filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_S3F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("adc stereo4 filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_S4F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Sto1 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_sto1_adc_l_mix, ARRAY_SIZE(rt5677_sto1_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Sto1 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_sto1_adc_r_mix, ARRAY_SIZE(rt5677_sto1_adc_r_mix)),
+        SND_SOC_DAPM_MIXER("Sto2 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_sto2_adc_l_mix, ARRAY_SIZE(rt5677_sto2_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Sto2 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_sto2_adc_r_mix, ARRAY_SIZE(rt5677_sto2_adc_r_mix)),
+        SND_SOC_DAPM_MIXER("Sto3 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_sto3_adc_l_mix, ARRAY_SIZE(rt5677_sto3_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Sto3 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_sto3_adc_r_mix, ARRAY_SIZE(rt5677_sto3_adc_r_mix)),
+        SND_SOC_DAPM_MIXER("Sto4 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_sto4_adc_l_mix, ARRAY_SIZE(rt5677_sto4_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Sto4 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_sto4_adc_r_mix, ARRAY_SIZE(rt5677_sto4_adc_r_mix)),
+        SND_SOC_DAPM_SUPPLY("adc mono left filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_MF_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Mono ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_mono_adc_l_mix, ARRAY_SIZE(rt5677_mono_adc_l_mix)),
+        SND_SOC_DAPM_SUPPLY("adc mono right filter", RT5677_PWR_DIG2,
+                RT5677_PWR_ADC_MF_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Mono ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_mono_adc_r_mix, ARRAY_SIZE(rt5677_mono_adc_r_mix)),
+        /* ADC PGA */
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIXL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIXR", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo2 ADC MIXL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo2 ADC MIXR", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo2 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo3 ADC MIXL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo3 ADC MIXR", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo3 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo4 ADC MIXL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo4 ADC MIXR", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo4 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Sto2 ADC LR MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Mono ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* DSP */
+        SND_SOC_DAPM_MUX("IB9 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib9_src_mux),
+        SND_SOC_DAPM_MUX("IB8 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib8_src_mux),
+        SND_SOC_DAPM_MUX("IB7 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib7_src_mux),
+        SND_SOC_DAPM_MUX("IB6 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib6_src_mux),
+        SND_SOC_DAPM_MUX("IB45 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib45_src_mux),
+        SND_SOC_DAPM_MUX("IB23 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib23_src_mux),
+        SND_SOC_DAPM_MUX("IB01 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib01_src_mux),
+        SND_SOC_DAPM_MUX("IB45 Bypass Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib45_bypass_src_mux),
+        SND_SOC_DAPM_MUX("IB23 Bypass Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib23_bypass_src_mux),
+        SND_SOC_DAPM_MUX("IB01 Bypass Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ib01_bypass_src_mux),
+        SND_SOC_DAPM_MUX("OB23 Bypass Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ob23_bypass_src_mux),
+        SND_SOC_DAPM_MUX("OB01 Bypass Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_ob01_bypass_src_mux),
+        SND_SOC_DAPM_PGA("OB45", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OB67", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound5", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound6", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("OutBound7", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* Digital Interface */
+        SND_SOC_DAPM_SUPPLY("I2S1", RT5677_PWR_DIG1,
+                RT5677_PWR_I2S1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC0", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC5", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC6", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC7", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC01", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC23", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC45", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC67", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S2", RT5677_PWR_DIG1,
+                RT5677_PWR_I2S2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC0", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC5", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC6", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC7", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC01", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC23", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC45", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC67", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S3", RT5677_PWR_DIG1,
+                RT5677_PWR_I2S3_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 ADC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 ADC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S4", RT5677_PWR_DIG1,
+                RT5677_PWR_I2S4_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 ADC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF4 ADC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("SLB", RT5677_PWR_DIG1,
+                RT5677_PWR_SLB_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC0", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC5", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC6", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC7", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC01", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC23", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC45", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB DAC67", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("SLB ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* Digital Interface Select */
+        SND_SOC_DAPM_MUX("IF1 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if1_adc1_mux),
+        SND_SOC_DAPM_MUX("IF1 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if1_adc2_mux),
+        SND_SOC_DAPM_MUX("IF1 ADC3 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if1_adc3_mux),
+        SND_SOC_DAPM_MUX("IF1 ADC4 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if1_adc4_mux),
+        SND_SOC_DAPM_MUX("IF2 ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if2_adc1_mux),
+        SND_SOC_DAPM_MUX("IF2 ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if2_adc2_mux),
+        SND_SOC_DAPM_MUX("IF2 ADC3 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if2_adc3_mux),
+        SND_SOC_DAPM_MUX("IF2 ADC4 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if2_adc4_mux),
+        SND_SOC_DAPM_MUX("IF3 ADC Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if3_adc_mux),
+        SND_SOC_DAPM_MUX("IF4 ADC Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_if4_adc_mux),
+        SND_SOC_DAPM_MUX("SLB ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_slb_adc1_mux),
+        SND_SOC_DAPM_MUX("SLB ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_slb_adc2_mux),
+        SND_SOC_DAPM_MUX("SLB ADC3 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_slb_adc3_mux),
+        SND_SOC_DAPM_MUX("SLB ADC4 Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_slb_adc4_mux),
+        /* 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),
+        SND_SOC_DAPM_AIF_IN("AIF3RX", "AIF3 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF3TX", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF4RX", "AIF4 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF4TX", "AIF4 Capture", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("SLBRX", "SLIMBus Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("SLBTX", "SLIMBus Capture", 0, SND_SOC_NOPM, 0, 0),
+        /* Sidetone Mux */
+        SND_SOC_DAPM_MUX("Sidetone Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_sidetone_mux),
+        /* VAD Mux*/
+        SND_SOC_DAPM_MUX("VAD ADC Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_vad_src_mux),
+        /* Tensilica DSP */
+        SND_SOC_DAPM_PGA("Tensilica DSP", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("OB01 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_01_mix, ARRAY_SIZE(rt5677_ob_01_mix)),
+        SND_SOC_DAPM_MIXER("OB23 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_23_mix, ARRAY_SIZE(rt5677_ob_23_mix)),
+        SND_SOC_DAPM_MIXER("OB4 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_4_mix, ARRAY_SIZE(rt5677_ob_4_mix)),
+        SND_SOC_DAPM_MIXER("OB5 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_5_mix, ARRAY_SIZE(rt5677_ob_5_mix)),
+        SND_SOC_DAPM_MIXER("OB6 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_6_mix, ARRAY_SIZE(rt5677_ob_6_mix)),
+        SND_SOC_DAPM_MIXER("OB7 MIX", SND_SOC_NOPM, 0, 0,
+                rt5677_ob_7_mix, ARRAY_SIZE(rt5677_ob_7_mix)),
+        /* Output Side */
+        /* DAC mixer before sound effect  */
+        SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_dac_l_mix, ARRAY_SIZE(rt5677_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_dac_r_mix, ARRAY_SIZE(rt5677_dac_r_mix)),
+        SND_SOC_DAPM_PGA("DAC1 FS", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* DAC Mux */
+        SND_SOC_DAPM_MUX("DAC1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_dac1_mux),
+        SND_SOC_DAPM_MUX("ADDA1 Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_adda1_mux),
+        SND_SOC_DAPM_MUX("DAC12 SRC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_dac12_mux),
+        SND_SOC_DAPM_MUX("DAC3 SRC Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_dac3_mux),
+        /* DAC2 channel Mux */
+        SND_SOC_DAPM_MUX("DAC2 L Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_dac2_l_mux),
+        SND_SOC_DAPM_MUX("DAC2 R Mux", SND_SOC_NOPM, 0, 0,
+                                &rt5677_dac2_r_mux),
+        /* DAC3 channel Mux */
+        SND_SOC_DAPM_MUX("DAC3 L Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_dac3_l_mux),
+        SND_SOC_DAPM_MUX("DAC3 R Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_dac3_r_mux),
+        /* DAC4 channel Mux */
+        SND_SOC_DAPM_MUX("DAC4 L Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_dac4_l_mux),
+        SND_SOC_DAPM_MUX("DAC4 R Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5677_dac4_r_mux),
+        /* DAC Mixer */
+        SND_SOC_DAPM_SUPPLY("dac stereo1 filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_S1F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono left filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M2F_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono right filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M2F_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_sto1_dac_l_mix, ARRAY_SIZE(rt5677_sto1_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_sto1_dac_r_mix, ARRAY_SIZE(rt5677_sto1_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_mono_dac_l_mix, ARRAY_SIZE(rt5677_mono_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_mono_dac_r_mix, ARRAY_SIZE(rt5677_mono_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("DD1 MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_dd1_l_mix, ARRAY_SIZE(rt5677_dd1_l_mix)),
+        SND_SOC_DAPM_MIXER("DD1 MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_dd1_r_mix, ARRAY_SIZE(rt5677_dd1_r_mix)),
+        SND_SOC_DAPM_MIXER("DD2 MIXL", SND_SOC_NOPM, 0, 0,
+                rt5677_dd2_l_mix, ARRAY_SIZE(rt5677_dd2_l_mix)),
+        SND_SOC_DAPM_MIXER("DD2 MIXR", SND_SOC_NOPM, 0, 0,
+                rt5677_dd2_r_mix, ARRAY_SIZE(rt5677_dd2_r_mix)),
+        SND_SOC_DAPM_PGA("Stereo DAC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Mono DAC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DD1 MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DD2 MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* DACs */
+        SND_SOC_DAPM_DAC("DAC 1", NULL, RT5677_PWR_DIG1,
+                RT5677_PWR_DAC1_BIT, 0),
+        SND_SOC_DAPM_DAC("DAC 2", NULL, RT5677_PWR_DIG1,
+                RT5677_PWR_DAC2_BIT, 0),
+        SND_SOC_DAPM_DAC("DAC 3", NULL, RT5677_PWR_DIG1,
+                RT5677_PWR_DAC3_BIT, 0),
+        /* PDM */
+        SND_SOC_DAPM_SUPPLY("PDM1 Power", RT5677_PWR_DIG2,
+                RT5677_PWR_PDM1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("PDM2 Power", RT5677_PWR_DIG2,
+                RT5677_PWR_PDM2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("PDM1 L Mux", RT5677_PDM_OUT_CTRL, RT5677_M_PDM1_L_SFT,
+                1, &rt5677_pdm1_l_mux),
+        SND_SOC_DAPM_MUX("PDM1 R Mux", RT5677_PDM_OUT_CTRL, RT5677_M_PDM1_R_SFT,
+                1, &rt5677_pdm1_r_mux),
+        SND_SOC_DAPM_MUX("PDM2 L Mux", RT5677_PDM_OUT_CTRL, RT5677_M_PDM2_L_SFT,
+                1, &rt5677_pdm2_l_mux),
+        SND_SOC_DAPM_MUX("PDM2 R Mux", RT5677_PDM_OUT_CTRL, RT5677_M_PDM2_R_SFT,
+                1, &rt5677_pdm2_r_mux),
+        SND_SOC_DAPM_PGA_S("LOUT1 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO1_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_PGA_S("LOUT2 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO2_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_PGA_S("LOUT3 amp", 1, RT5677_PWR_ANLG1, RT5677_PWR_LO3_BIT,
+                0, NULL, 0),
+        /* Output Lines */
+        SND_SOC_DAPM_OUTPUT("LOUT1"),
+        SND_SOC_DAPM_OUTPUT("LOUT2"),
+        SND_SOC_DAPM_OUTPUT("LOUT3"),
+        SND_SOC_DAPM_OUTPUT("PDM1L"),
+        SND_SOC_DAPM_OUTPUT("PDM1R"),
+        SND_SOC_DAPM_OUTPUT("PDM2L"),
+        SND_SOC_DAPM_OUTPUT("PDM2R"),
+};
+static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
+        { "DMIC1", NULL, "DMIC L1" },
+        { "DMIC1", NULL, "DMIC R1" },
+        { "DMIC2", NULL, "DMIC L2" },
+        { "DMIC2", NULL, "DMIC R2" },
+        { "DMIC3", NULL, "DMIC L3" },
+        { "DMIC3", NULL, "DMIC R3" },
+        { "DMIC4", NULL, "DMIC L4" },
+        { "DMIC4", NULL, "DMIC R4" },
+        { "DMIC L1", NULL, "DMIC CLK" },
+        { "DMIC R1", NULL, "DMIC CLK" },
+        { "DMIC L2", NULL, "DMIC CLK" },
+        { "DMIC R2", NULL, "DMIC CLK" },
+        { "DMIC L3", NULL, "DMIC CLK" },
+        { "DMIC R3", NULL, "DMIC CLK" },
+        { "DMIC L4", NULL, "DMIC CLK" },
+        { "DMIC R4", NULL, "DMIC CLK" },
+        { "BST1", NULL, "IN1P" },
+        { "BST1", NULL, "IN1N" },
+        { "BST2", NULL, "IN2P" },
+        { "BST2", NULL, "IN2N" },
+        { "IN1P", NULL, "micbias1" },
+        { "IN1N", NULL, "micbias1" },
+        { "IN2P", NULL, "micbias1" },
+        { "IN2N", NULL, "micbias1" },
+        { "ADC 1", NULL, "BST1" },
+        { "ADC 1", NULL, "ADC 1 power" },
+        { "ADC 1", NULL, "ADC1 clock" },
+        { "ADC 2", NULL, "BST2" },
+        { "ADC 2", NULL, "ADC 2 power" },
+        { "ADC 2", NULL, "ADC2 clock" },
+        { "Stereo1 DMIC Mux", "DMIC1", "DMIC1" },
+        { "Stereo1 DMIC Mux", "DMIC2", "DMIC2" },
+        { "Stereo1 DMIC Mux", "DMIC3", "DMIC3" },
+        { "Stereo1 DMIC Mux", "DMIC4", "DMIC4" },
+        { "Stereo2 DMIC Mux", "DMIC1", "DMIC1" },
+        { "Stereo2 DMIC Mux", "DMIC2", "DMIC2" },
+        { "Stereo2 DMIC Mux", "DMIC3", "DMIC3" },
+        { "Stereo2 DMIC Mux", "DMIC4", "DMIC4" },
+        { "Stereo3 DMIC Mux", "DMIC1", "DMIC1" },
+        { "Stereo3 DMIC Mux", "DMIC2", "DMIC2" },
+        { "Stereo3 DMIC Mux", "DMIC3", "DMIC3" },
+        { "Stereo3 DMIC Mux", "DMIC4", "DMIC4" },
+        { "Stereo4 DMIC Mux", "DMIC1", "DMIC1" },
+        { "Stereo4 DMIC Mux", "DMIC2", "DMIC2" },
+        { "Stereo4 DMIC Mux", "DMIC3", "DMIC3" },
+        { "Stereo4 DMIC Mux", "DMIC4", "DMIC4" },
+        { "Mono DMIC L Mux", "DMIC1", "DMIC1" },
+        { "Mono DMIC L Mux", "DMIC2", "DMIC2" },
+        { "Mono DMIC L Mux", "DMIC3", "DMIC3" },
+        { "Mono DMIC L Mux", "DMIC4", "DMIC4" },
+        { "Mono DMIC R Mux", "DMIC1", "DMIC1" },
+        { "Mono DMIC R Mux", "DMIC2", "DMIC2" },
+        { "Mono DMIC R Mux", "DMIC3", "DMIC3" },
+        { "Mono DMIC R Mux", "DMIC4", "DMIC4" },
+        { "ADC 1_2", NULL, "ADC 1" },
+        { "ADC 1_2", NULL, "ADC 2" },
+        { "Stereo1 ADC1 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo1 ADC1 Mux", "ADC1/2", "ADC 1_2" },
+        { "Stereo1 ADC1 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo1 ADC2 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo1 ADC2 Mux", "DMIC", "Stereo1 DMIC Mux" },
+        { "Stereo1 ADC2 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo2 ADC1 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo2 ADC1 Mux", "ADC1/2", "ADC 1_2" },
+        { "Stereo2 ADC1 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo2 ADC2 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo2 ADC2 Mux", "DMIC", "Stereo2 DMIC Mux" },
+        { "Stereo2 ADC2 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo3 ADC1 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo3 ADC1 Mux", "ADC1/2", "ADC 1_2" },
+        { "Stereo3 ADC1 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo3 ADC2 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo3 ADC2 Mux", "DMIC", "Stereo3 DMIC Mux" },
+        { "Stereo3 ADC2 Mux", "Stereo DAC MIX", "Stereo DAC MIX" },
+        { "Stereo4 ADC1 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo4 ADC1 Mux", "ADC1/2", "ADC 1_2" },
+        { "Stereo4 ADC1 Mux", "DD MIX2", "DD2 MIX" },
+        { "Stereo4 ADC2 Mux", "DD MIX1", "DD1 MIX" },
+        { "Stereo4 ADC2 Mux", "DMIC", "Stereo3 DMIC Mux" },
+        { "Stereo4 ADC2 Mux", "DD MIX2", "DD2 MIX" },
+        { "Mono ADC2 L Mux", "DD MIX1L", "DD1 MIXL" },
+        { "Mono ADC2 L Mux", "DMIC", "Mono DMIC L Mux" },
+        { "Mono ADC2 L Mux", "MONO DAC MIXL", "Mono DAC MIXL" },
+        { "Mono ADC1 L Mux", "DD MIX1L", "DD1 MIXL" },
+        { "Mono ADC1 L Mux", "ADC1", "ADC 1" },
+        { "Mono ADC1 L Mux", "MONO DAC MIXL", "Mono DAC MIXL" },
+        { "Mono ADC1 R Mux", "DD MIX1R", "DD1 MIXR" },
+        { "Mono ADC1 R Mux", "ADC2", "ADC 2" },
+        { "Mono ADC1 R Mux", "MONO DAC MIXR", "Mono DAC MIXR" },
+        { "Mono ADC2 R Mux", "DD MIX1R", "DD1 MIXR" },
+        { "Mono ADC2 R Mux", "DMIC", "Mono DMIC R Mux" },
+        { "Mono ADC2 R Mux", "MONO DAC MIXR", "Mono DAC MIXR" },
+        { "Sto1 ADC MIXL", "ADC1 Switch", "Stereo1 ADC1 Mux" },
+        { "Sto1 ADC MIXL", "ADC2 Switch", "Stereo1 ADC2 Mux" },
+        { "Sto1 ADC MIXR", "ADC1 Switch", "Stereo1 ADC1 Mux" },
+        { "Sto1 ADC MIXR", "ADC2 Switch", "Stereo1 ADC2 Mux" },
+        { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" },
+        { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" },
+        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" },
+        { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" },
+        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo1 ADC MIX", NULL, "Stereo1 ADC MIXL" },
+        { "Stereo1 ADC MIX", NULL, "Stereo1 ADC MIXR" },
+        { "Sto2 ADC MIXL", "ADC1 Switch", "Stereo2 ADC1 Mux" },
+        { "Sto2 ADC MIXL", "ADC2 Switch", "Stereo2 ADC2 Mux" },
+        { "Sto2 ADC MIXR", "ADC1 Switch", "Stereo2 ADC1 Mux" },
+        { "Sto2 ADC MIXR", "ADC2 Switch", "Stereo2 ADC2 Mux" },
+        { "Sto2 ADC LR MIX", NULL, "Sto2 ADC MIXL" },
+        { "Sto2 ADC LR MIX", NULL, "Sto2 ADC MIXR" },
+        { "Stereo2 ADC LR Mux", "L", "Sto2 ADC MIXL" },
+        { "Stereo2 ADC LR Mux", "LR", "Sto2 ADC LR MIX" },
+        { "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" },
+        { "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" },
+        { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" },
+        { "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" },
+        { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo2 ADC MIX", NULL, "Stereo2 ADC MIXL" },
+        { "Stereo2 ADC MIX", NULL, "Stereo2 ADC MIXR" },
+        { "Sto3 ADC MIXL", "ADC1 Switch", "Stereo3 ADC1 Mux" },
+        { "Sto3 ADC MIXL", "ADC2 Switch", "Stereo3 ADC2 Mux" },
+        { "Sto3 ADC MIXR", "ADC1 Switch", "Stereo3 ADC1 Mux" },
+        { "Sto3 ADC MIXR", "ADC2 Switch", "Stereo3 ADC2 Mux" },
+        { "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" },
+        { "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" },
+        { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" },
+        { "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" },
+        { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo3 ADC MIX", NULL, "Stereo3 ADC MIXL" },
+        { "Stereo3 ADC MIX", NULL, "Stereo3 ADC MIXR" },
+        { "Sto4 ADC MIXL", "ADC1 Switch", "Stereo4 ADC1 Mux" },
+        { "Sto4 ADC MIXL", "ADC2 Switch", "Stereo4 ADC2 Mux" },
+        { "Sto4 ADC MIXR", "ADC1 Switch", "Stereo4 ADC1 Mux" },
+        { "Sto4 ADC MIXR", "ADC2 Switch", "Stereo4 ADC2 Mux" },
+        { "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" },
+        { "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" },
+        { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" },
+        { "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" },
+        { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Stereo4 ADC MIX", NULL, "Stereo4 ADC MIXL" },
+        { "Stereo4 ADC MIX", NULL, "Stereo4 ADC MIXR" },
+        { "Mono ADC MIXL", "ADC1 Switch", "Mono ADC1 L Mux" },
+        { "Mono ADC MIXL", "ADC2 Switch", "Mono ADC2 L Mux" },
+        { "Mono ADC MIXL", NULL, "adc mono left filter" },
+        { "adc mono left filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Mono ADC MIXR", "ADC1 Switch", "Mono ADC1 R Mux" },
+        { "Mono ADC MIXR", "ADC2 Switch", "Mono ADC2 R Mux" },
+        { "Mono ADC MIXR", NULL, "adc mono right filter" },
+        { "adc mono right filter", NULL, "PLL1", is_sys_clk_from_pll },
+        { "Mono ADC MIX", NULL, "Mono ADC MIXL" },
+        { "Mono ADC MIX", NULL, "Mono ADC MIXR" },
+        { "VAD ADC Mux", "STO1 ADC MIX L", "Stereo1 ADC MIXL" },
+        { "VAD ADC Mux", "MONO ADC MIX L", "Mono ADC MIXL" },
+        { "VAD ADC Mux", "MONO ADC MIX R", "Mono ADC MIXR" },
+        { "VAD ADC Mux", "STO2 ADC MIX L", "Stereo2 ADC MIXL" },
+        { "VAD ADC Mux", "STO3 ADC MIX L", "Stereo3 ADC MIXL" },
+        { "IF1 ADC1 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "IF1 ADC1 Mux", "OB01", "OB01 Bypass Mux" },
+        { "IF1 ADC1 Mux", "VAD ADC", "VAD ADC Mux" },
+        { "IF1 ADC2 Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "IF1 ADC2 Mux", "OB23", "OB23 Bypass Mux" },
+        { "IF1 ADC3 Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "IF1 ADC3 Mux", "MONO ADC MIX", "Mono ADC MIX" },
+        { "IF1 ADC3 Mux", "OB45", "OB45" },
+        { "IF1 ADC4 Mux", "STO4 ADC MIX", "Stereo4 ADC MIX" },
+        { "IF1 ADC4 Mux", "OB67", "OB67" },
+        { "IF1 ADC4 Mux", "OB01", "OB01 Bypass Mux" },
+        { "AIF1TX", NULL, "I2S1" },
+        { "AIF1TX", NULL, "IF1 ADC1 Mux" },
+        { "AIF1TX", NULL, "IF1 ADC2 Mux" },
+        { "AIF1TX", NULL, "IF1 ADC3 Mux" },
+        { "AIF1TX", NULL, "IF1 ADC4 Mux" },
+        { "IF2 ADC1 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "IF2 ADC1 Mux", "OB01", "OB01 Bypass Mux" },
+        { "IF2 ADC1 Mux", "VAD ADC", "VAD ADC Mux" },
+        { "IF2 ADC2 Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "IF2 ADC2 Mux", "OB23", "OB23 Bypass Mux" },
+        { "IF2 ADC3 Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "IF2 ADC3 Mux", "MONO ADC MIX", "Mono ADC MIX" },
+        { "IF2 ADC3 Mux", "OB45", "OB45" },
+        { "IF2 ADC4 Mux", "STO4 ADC MIX", "Stereo4 ADC MIX" },
+        { "IF2 ADC4 Mux", "OB67", "OB67" },
+        { "IF2 ADC4 Mux", "OB01", "OB01 Bypass Mux" },
+        { "AIF2TX", NULL, "I2S2" },
+        { "AIF2TX", NULL, "IF2 ADC1 Mux" },
+        { "AIF2TX", NULL, "IF2 ADC2 Mux" },
+        { "AIF2TX", NULL, "IF2 ADC3 Mux" },
+        { "AIF2TX", NULL, "IF2 ADC4 Mux" },
+        { "IF3 ADC Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "IF3 ADC Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "IF3 ADC Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "IF3 ADC Mux", "STO4 ADC MIX", "Stereo4 ADC MIX" },
+        { "IF3 ADC Mux", "MONO ADC MIX", "Mono ADC MIX" },
+        { "IF3 ADC Mux", "OB01", "OB01 Bypass Mux" },
+        { "IF3 ADC Mux", "OB23", "OB23 Bypass Mux" },
+        { "IF3 ADC Mux", "VAD ADC", "VAD ADC Mux" },
+        { "AIF3TX", NULL, "I2S3" },
+        { "AIF3TX", NULL, "IF3 ADC Mux" },
+        { "IF4 ADC Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "IF4 ADC Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "IF4 ADC Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "IF4 ADC Mux", "STO4 ADC MIX", "Stereo4 ADC MIX" },
+        { "IF4 ADC Mux", "MONO ADC MIX", "Mono ADC MIX" },
+        { "IF4 ADC Mux", "OB01", "OB01 Bypass Mux" },
+        { "IF4 ADC Mux", "OB23", "OB23 Bypass Mux" },
+        { "IF4 ADC Mux", "VAD ADC", "VAD ADC Mux" },
+        { "AIF4TX", NULL, "I2S4" },
+        { "AIF4TX", NULL, "IF4 ADC Mux" },
+        { "SLB ADC1 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "SLB ADC1 Mux", "OB01", "OB01 Bypass Mux" },
+        { "SLB ADC1 Mux", "VAD ADC", "VAD ADC Mux" },
+        { "SLB ADC2 Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "SLB ADC2 Mux", "OB23", "OB23 Bypass Mux" },
+        { "SLB ADC3 Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "SLB ADC3 Mux", "MONO ADC MIX", "Mono ADC MIX" },
+        { "SLB ADC3 Mux", "OB45", "OB45" },
+        { "SLB ADC4 Mux", "STO4 ADC MIX", "Stereo4 ADC MIX" },
+        { "SLB ADC4 Mux", "OB67", "OB67" },
+        { "SLB ADC4 Mux", "OB01", "OB01 Bypass Mux" },
+        { "SLBTX", NULL, "SLB" },
+        { "SLBTX", NULL, "SLB ADC1 Mux" },
+        { "SLBTX", NULL, "SLB ADC2 Mux" },
+        { "SLBTX", NULL, "SLB ADC3 Mux" },
+        { "SLBTX", NULL, "SLB ADC4 Mux" },
+        { "IB01 Mux", "IF1 DAC 01", "IF1 DAC01" },
+        { "IB01 Mux", "IF2 DAC 01", "IF2 DAC01" },
+        { "IB01 Mux", "SLB DAC 01", "SLB DAC01" },
+        { "IB01 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "IB01 Mux", "VAD ADC/DAC1 FS", "DAC1 FS" },
+        { "IB01 Bypass Mux", "Bypass", "IB01 Mux" },
+        { "IB01 Bypass Mux", "Pass SRC", "IB01 Mux" },
+        { "IB23 Mux", "IF1 DAC 23", "IF1 DAC23" },
+        { "IB23 Mux", "IF2 DAC 23", "IF2 DAC23" },
+        { "IB23 Mux", "SLB DAC 23", "SLB DAC23" },
+        { "IB23 Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "IB23 Mux", "DAC1 FS", "DAC1 FS" },
+        { "IB23 Mux", "IF4 DAC", "IF4 DAC" },
+        { "IB23 Bypass Mux", "Bypass", "IB23 Mux" },
+        { "IB23 Bypass Mux", "Pass SRC", "IB23 Mux" },
+        { "IB45 Mux", "IF1 DAC 45", "IF1 DAC45" },
+        { "IB45 Mux", "IF2 DAC 45", "IF2 DAC45" },
+        { "IB45 Mux", "SLB DAC 45", "SLB DAC45" },
+        { "IB45 Mux", "STO3 ADC MIX", "Stereo3 ADC MIX" },
+        { "IB45 Mux", "IF3 DAC", "IF3 DAC" },
+        { "IB45 Bypass Mux", "Bypass", "IB45 Mux" },
+        { "IB45 Bypass Mux", "Pass SRC", "IB45 Mux" },
+        { "IB6 Mux", "IF1 DAC 6", "IF1 DAC6" },
+        { "IB6 Mux", "IF2 DAC 6", "IF2 DAC6" },
+        { "IB6 Mux", "SLB DAC 6", "SLB DAC6" },
+        { "IB6 Mux", "STO4 ADC MIX L", "Stereo4 ADC MIXL" },
+        { "IB6 Mux", "IF4 DAC L", "IF4 DAC L" },
+        { "IB6 Mux", "STO1 ADC MIX L", "Stereo1 ADC MIXL" },
+        { "IB6 Mux", "STO2 ADC MIX L", "Stereo2 ADC MIXL" },
+        { "IB6 Mux", "STO3 ADC MIX L", "Stereo3 ADC MIXL" },
+        { "IB7 Mux", "IF1 DAC 7", "IF1 DAC7" },
+        { "IB7 Mux", "IF2 DAC 7", "IF2 DAC7" },
+        { "IB7 Mux", "SLB DAC 7", "SLB DAC7" },
+        { "IB7 Mux", "STO4 ADC MIX R", "Stereo4 ADC MIXR" },
+        { "IB7 Mux", "IF4 DAC R", "IF4 DAC R" },
+        { "IB7 Mux", "STO1 ADC MIX R", "Stereo1 ADC MIXR" },
+        { "IB7 Mux", "STO2 ADC MIX R", "Stereo2 ADC MIXR" },
+        { "IB7 Mux", "STO3 ADC MIX R", "Stereo3 ADC MIXR" },
+        { "IB8 Mux", "STO1 ADC MIX L", "Stereo1 ADC MIXL" },
+        { "IB8 Mux", "STO2 ADC MIX L", "Stereo2 ADC MIXL" },
+        { "IB8 Mux", "STO3 ADC MIX L", "Stereo3 ADC MIXL" },
+        { "IB8 Mux", "STO4 ADC MIX L", "Stereo4 ADC MIXL" },
+        { "IB8 Mux", "MONO ADC MIX L", "Mono ADC MIXL" },
+        { "IB8 Mux", "DACL1 FS", "DAC1 MIXL" },
+        { "IB9 Mux", "STO1 ADC MIX R", "Stereo1 ADC MIXR" },
+        { "IB9 Mux", "STO2 ADC MIX R", "Stereo2 ADC MIXR" },
+        { "IB9 Mux", "STO3 ADC MIX R", "Stereo3 ADC MIXR" },
+        { "IB9 Mux", "STO4 ADC MIX R", "Stereo4 ADC MIXR" },
+        { "IB9 Mux", "MONO ADC MIX R", "Mono ADC MIXR" },
+        { "IB9 Mux", "DACR1 FS", "DAC1 MIXR" },
+        { "IB9 Mux", "DAC1 FS", "DAC1 FS" },
+        { "OB01 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB01 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB01 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB01 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB01 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB01 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB01 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB23 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB23 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB23 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB23 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB23 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB23 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB23 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB4 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB4 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB4 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB4 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB4 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB4 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB4 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB5 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB5 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB5 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB5 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB5 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB5 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB5 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB6 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB6 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB6 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB6 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB6 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB6 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB6 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB7 MIX", "IB01 Switch", "IB01 Bypass Mux" },
+        { "OB7 MIX", "IB23 Switch", "IB23 Bypass Mux" },
+        { "OB7 MIX", "IB45 Switch", "IB45 Bypass Mux" },
+        { "OB7 MIX", "IB6 Switch", "IB6 Mux" },
+        { "OB7 MIX", "IB7 Switch", "IB7 Mux" },
+        { "OB7 MIX", "IB8 Switch", "IB8 Mux" },
+        { "OB7 MIX", "IB9 Switch", "IB9 Mux" },
+        { "OB01 Bypass Mux", "Bypass", "OB01 MIX" },
+        { "OB01 Bypass Mux", "Pass SRC", "OB01 MIX" },
+        { "OB23 Bypass Mux", "Bypass", "OB23 MIX" },
+        { "OB23 Bypass Mux", "Pass SRC", "OB23 MIX" },
+        { "OutBound2", NULL, "OB23 Bypass Mux" },
+        { "OutBound3", NULL, "OB23 Bypass Mux" },
+        { "OutBound4", NULL, "OB4 MIX" },
+        { "OutBound5", NULL, "OB5 MIX" },
+        { "OutBound6", NULL, "OB6 MIX" },
+        { "OutBound7", NULL, "OB7 MIX" },
+        { "OB45", NULL, "OutBound4" },
+        { "OB45", NULL, "OutBound5" },
+        { "OB67", NULL, "OutBound6" },
+        { "OB67", NULL, "OutBound7" },
+        { "IF1 DAC0", NULL, "AIF1RX" },
+        { "IF1 DAC1", NULL, "AIF1RX" },
+        { "IF1 DAC2", NULL, "AIF1RX" },
+        { "IF1 DAC3", NULL, "AIF1RX" },
+        { "IF1 DAC4", NULL, "AIF1RX" },
+        { "IF1 DAC5", NULL, "AIF1RX" },
+        { "IF1 DAC6", NULL, "AIF1RX" },
+        { "IF1 DAC7", NULL, "AIF1RX" },
+        { "IF1 DAC0", NULL, "I2S1" },
+        { "IF1 DAC1", NULL, "I2S1" },
+        { "IF1 DAC2", NULL, "I2S1" },
+        { "IF1 DAC3", NULL, "I2S1" },
+        { "IF1 DAC4", NULL, "I2S1" },
+        { "IF1 DAC5", NULL, "I2S1" },
+        { "IF1 DAC6", NULL, "I2S1" },
+        { "IF1 DAC7", NULL, "I2S1" },
+        { "IF1 DAC01", NULL, "IF1 DAC0" },
+        { "IF1 DAC01", NULL, "IF1 DAC1" },
+        { "IF1 DAC23", NULL, "IF1 DAC2" },
+        { "IF1 DAC23", NULL, "IF1 DAC3" },
+        { "IF1 DAC45", NULL, "IF1 DAC4" },
+        { "IF1 DAC45", NULL, "IF1 DAC5" },
+        { "IF1 DAC67", NULL, "IF1 DAC6" },
+        { "IF1 DAC67", NULL, "IF1 DAC7" },
+        { "IF2 DAC0", NULL, "AIF2RX" },
+        { "IF2 DAC1", NULL, "AIF2RX" },
+        { "IF2 DAC2", NULL, "AIF2RX" },
+        { "IF2 DAC3", NULL, "AIF2RX" },
+        { "IF2 DAC4", NULL, "AIF2RX" },
+        { "IF2 DAC5", NULL, "AIF2RX" },
+        { "IF2 DAC6", NULL, "AIF2RX" },
+        { "IF2 DAC7", NULL, "AIF2RX" },
+        { "IF2 DAC0", NULL, "I2S2" },
+        { "IF2 DAC1", NULL, "I2S2" },
+        { "IF2 DAC2", NULL, "I2S2" },
+        { "IF2 DAC3", NULL, "I2S2" },
+        { "IF2 DAC4", NULL, "I2S2" },
+        { "IF2 DAC5", NULL, "I2S2" },
+        { "IF2 DAC6", NULL, "I2S2" },
+        { "IF2 DAC7", NULL, "I2S2" },
+        { "IF2 DAC01", NULL, "IF2 DAC0" },
+        { "IF2 DAC01", NULL, "IF2 DAC1" },
+        { "IF2 DAC23", NULL, "IF2 DAC2" },
+        { "IF2 DAC23", NULL, "IF2 DAC3" },
+        { "IF2 DAC45", NULL, "IF2 DAC4" },
+        { "IF2 DAC45", NULL, "IF2 DAC5" },
+        { "IF2 DAC67", NULL, "IF2 DAC6" },
+        { "IF2 DAC67", NULL, "IF2 DAC7" },
+        { "IF3 DAC", NULL, "AIF3RX" },
+        { "IF3 DAC", NULL, "I2S3" },
+        { "IF4 DAC", NULL, "AIF4RX" },
+        { "IF4 DAC", NULL, "I2S4" },
+        { "IF3 DAC L", NULL, "IF3 DAC" },
+        { "IF3 DAC R", NULL, "IF3 DAC" },
+        { "IF4 DAC L", NULL, "IF4 DAC" },
+        { "IF4 DAC R", NULL, "IF4 DAC" },
+        { "SLB DAC0", NULL, "SLBRX" },
+        { "SLB DAC1", NULL, "SLBRX" },
+        { "SLB DAC2", NULL, "SLBRX" },
+        { "SLB DAC3", NULL, "SLBRX" },
+        { "SLB DAC4", NULL, "SLBRX" },
+        { "SLB DAC5", NULL, "SLBRX" },
+        { "SLB DAC6", NULL, "SLBRX" },
+        { "SLB DAC7", NULL, "SLBRX" },
+        { "SLB DAC0", NULL, "SLB" },
+        { "SLB DAC1", NULL, "SLB" },
+        { "SLB DAC2", NULL, "SLB" },
+        { "SLB DAC3", NULL, "SLB" },
+        { "SLB DAC4", NULL, "SLB" },
+        { "SLB DAC5", NULL, "SLB" },
+        { "SLB DAC6", NULL, "SLB" },
+        { "SLB DAC7", NULL, "SLB" },
+        { "SLB DAC01", NULL, "SLB DAC0" },
+        { "SLB DAC01", NULL, "SLB DAC1" },
+        { "SLB DAC23", NULL, "SLB DAC2" },
+        { "SLB DAC23", NULL, "SLB DAC3" },
+        { "SLB DAC45", NULL, "SLB DAC4" },
+        { "SLB DAC45", NULL, "SLB DAC5" },
+        { "SLB DAC67", NULL, "SLB DAC6" },
+        { "SLB DAC67", NULL, "SLB DAC7" },
+        { "ADDA1 Mux", "STO1 ADC MIX", "Stereo1 ADC MIX" },
+        { "ADDA1 Mux", "STO2 ADC MIX", "Stereo2 ADC MIX" },
+        { "ADDA1 Mux", "OB 67", "OB67" },
+        { "DAC1 Mux", "IF1 DAC 01", "IF1 DAC01" },
+        { "DAC1 Mux", "IF2 DAC 01", "IF2 DAC01" },
+        { "DAC1 Mux", "IF3 DAC LR", "IF3 DAC" },
+        { "DAC1 Mux", "IF4 DAC LR", "IF4 DAC" },
+        { "DAC1 Mux", "SLB DAC 01", "SLB DAC01" },
+        { "DAC1 Mux", "OB 01", "OB01 Bypass Mux" },
+        { "DAC1 MIXL", "Stereo ADC Switch", "ADDA1 Mux" },
+        { "DAC1 MIXL", "DAC1 Switch", "DAC1 Mux" },
+        { "DAC1 MIXL", NULL, "dac stereo1 filter" },
+        { "DAC1 MIXR", "Stereo ADC Switch", "ADDA1 Mux" },
+        { "DAC1 MIXR", "DAC1 Switch", "DAC1 Mux" },
+        { "DAC1 MIXR", NULL, "dac stereo1 filter" },
+        { "DAC1 FS", NULL, "DAC1 MIXL" },
+        { "DAC1 FS", NULL, "DAC1 MIXR" },
+        { "DAC2 L Mux", "IF1 DAC 2", "IF1 DAC2" },
+        { "DAC2 L Mux", "IF2 DAC 2", "IF2 DAC2" },
+        { "DAC2 L Mux", "IF3 DAC L", "IF3 DAC L" },
+        { "DAC2 L Mux", "IF4 DAC L", "IF4 DAC L" },
+        { "DAC2 L Mux", "SLB DAC 2", "SLB DAC2" },
+        { "DAC2 L Mux", "OB 2", "OutBound2" },
+        { "DAC2 R Mux", "IF1 DAC 3", "IF1 DAC3" },
+        { "DAC2 R Mux", "IF2 DAC 3", "IF2 DAC3" },
+        { "DAC2 R Mux", "IF3 DAC R", "IF3 DAC R" },
+        { "DAC2 R Mux", "IF4 DAC R", "IF4 DAC R" },
+        { "DAC2 R Mux", "SLB DAC 3", "SLB DAC3" },
+        { "DAC2 R Mux", "OB 3", "OutBound3" },
+        { "DAC2 R Mux", "Haptic Generator", "Haptic Generator" },
+        { "DAC2 R Mux", "VAD ADC", "VAD ADC Mux" },
+        { "DAC3 L Mux", "IF1 DAC 4", "IF1 DAC4" },
+        { "DAC3 L Mux", "IF2 DAC 4", "IF2 DAC4" },
+        { "DAC3 L Mux", "IF3 DAC L", "IF3 DAC L" },
+        { "DAC3 L Mux", "IF4 DAC L", "IF4 DAC L" },
+        { "DAC3 L Mux", "SLB DAC 4", "SLB DAC4" },
+        { "DAC3 L Mux", "OB 4", "OutBound4" },
+        { "DAC3 R Mux", "IF1 DAC 5", "IF1 DAC4" },
+        { "DAC3 R Mux", "IF2 DAC 5", "IF2 DAC4" },
+        { "DAC3 R Mux", "IF3 DAC R", "IF3 DAC R" },
+        { "DAC3 R Mux", "IF4 DAC R", "IF4 DAC R" },
+        { "DAC3 R Mux", "SLB DAC 5", "SLB DAC5" },
+        { "DAC3 R Mux", "OB 5", "OutBound5" },
+        { "DAC4 L Mux", "IF1 DAC 6", "IF1 DAC6" },
+        { "DAC4 L Mux", "IF2 DAC 6", "IF2 DAC6" },
+        { "DAC4 L Mux", "IF3 DAC L", "IF3 DAC L" },
+        { "DAC4 L Mux", "IF4 DAC L", "IF4 DAC L" },
+        { "DAC4 L Mux", "SLB DAC 6", "SLB DAC6" },
+        { "DAC4 L Mux", "OB 6", "OutBound6" },
+        { "DAC4 R Mux", "IF1 DAC 7", "IF1 DAC7" },
+        { "DAC4 R Mux", "IF2 DAC 7", "IF2 DAC7" },
+        { "DAC4 R Mux", "IF3 DAC R", "IF3 DAC R" },
+        { "DAC4 R Mux", "IF4 DAC R", "IF4 DAC R" },
+        { "DAC4 R Mux", "SLB DAC 7", "SLB DAC7" },
+        { "DAC4 R Mux", "OB 7", "OutBound7" },
+        { "Sidetone Mux", "DMIC1 L", "DMIC L1" },
+        { "Sidetone Mux", "DMIC2 L", "DMIC L2" },
+        { "Sidetone Mux", "DMIC3 L", "DMIC L3" },
+        { "Sidetone Mux", "DMIC4 L", "DMIC L4" },
+        { "Sidetone Mux", "ADC1", "ADC 1" },
+        { "Sidetone Mux", "ADC2", "ADC 2" },
+        { "Stereo DAC MIXL", "ST L Switch", "Sidetone Mux" },
+        { "Stereo DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" },
+        { "Stereo DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" },
+        { "Stereo DAC MIXL", "DAC1 R Switch", "DAC1 MIXR" },
+        { "Stereo DAC MIXL", NULL, "dac stereo1 filter" },
+        { "Stereo DAC MIXR", "ST R Switch", "Sidetone Mux" },
+        { "Stereo DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" },
+        { "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
+        { "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" },
+        { "Stereo DAC MIXR", NULL, "dac stereo1 filter" },
+        { "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" },
+        { "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" },
+        { "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" },
+        { "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" },
+        { "Mono DAC MIXL", NULL, "dac mono left filter" },
+        { "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" },
+        { "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" },
+        { "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
+        { "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" },
+        { "Mono DAC MIXR", NULL, "dac mono right filter" },
+        { "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
+        { "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
+        { "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" },
+        { "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" },
+        { "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
+        { "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
+        { "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" },
+        { "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" },
+        { "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
+        { "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
+        { "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" },
+        { "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" },
+        { "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
+        { "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
+        { "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" },
+        { "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" },
+        { "Stereo DAC MIX", NULL, "Stereo DAC MIXL" },
+        { "Stereo DAC MIX", NULL, "Stereo DAC MIXR" },
+        { "Mono DAC MIX", NULL, "Mono DAC MIXL" },
+        { "Mono DAC MIX", NULL, "Mono DAC MIXR" },
+        { "DD1 MIX", NULL, "DD1 MIXL" },
+        { "DD1 MIX", NULL, "DD1 MIXR" },
+        { "DD2 MIX", NULL, "DD2 MIXL" },
+        { "DD2 MIX", NULL, "DD2 MIXR" },
+        { "DAC12 SRC Mux", "STO1 DAC MIX", "Stereo DAC MIX" },
+        { "DAC12 SRC Mux", "MONO DAC MIX", "Mono DAC MIX" },
+        { "DAC12 SRC Mux", "DD MIX1", "DD1 MIX" },
+        { "DAC12 SRC Mux", "DD MIX2", "DD2 MIX" },
+        { "DAC3 SRC Mux", "MONO DAC MIXL", "Mono DAC MIXL" },
+        { "DAC3 SRC Mux", "MONO DAC MIXR", "Mono DAC MIXR" },
+        { "DAC3 SRC Mux", "DD MIX1L", "DD1 MIXL" },
+        { "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" },
+        { "DAC 1", NULL, "DAC12 SRC Mux" },
+        { "DAC 1", NULL, "PLL1", is_sys_clk_from_pll },
+        { "DAC 2", NULL, "DAC12 SRC Mux" },
+        { "DAC 2", NULL, "PLL1", is_sys_clk_from_pll },
+        { "DAC 3", NULL, "DAC3 SRC Mux" },
+        { "DAC 3", NULL, "PLL1", is_sys_clk_from_pll },
+        { "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" },
+        { "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" },
+        { "PDM1 L Mux", "DD MIX1", "DD1 MIXL" },
+        { "PDM1 L Mux", "DD MIX2", "DD2 MIXL" },
+        { "PDM1 L Mux", NULL, "PDM1 Power" },
+        { "PDM1 R Mux", "STO1 DAC MIX", "Stereo DAC MIXR" },
+        { "PDM1 R Mux", "MONO DAC MIX", "Mono DAC MIXR" },
+        { "PDM1 R Mux", "DD MIX1", "DD1 MIXR" },
+        { "PDM1 R Mux", "DD MIX2", "DD2 MIXR" },
+        { "PDM1 R Mux", NULL, "PDM1 Power" },
+        { "PDM2 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" },
+        { "PDM2 L Mux", "MONO DAC MIX", "Mono DAC MIXL" },
+        { "PDM2 L Mux", "DD MIX1", "DD1 MIXL" },
+        { "PDM2 L Mux", "DD MIX2", "DD2 MIXL" },
+        { "PDM2 L Mux", NULL, "PDM2 Power" },
+        { "PDM2 R Mux", "STO1 DAC MIX", "Stereo DAC MIXR" },
+        { "PDM2 R Mux", "MONO DAC MIX", "Mono DAC MIXR" },
+        { "PDM2 R Mux", "DD MIX1", "DD1 MIXR" },
+        { "PDM2 R Mux", "DD MIX1", "DD2 MIXR" },
+        { "PDM2 R Mux", NULL, "PDM2 Power" },
+        { "LOUT1 amp", NULL, "DAC 1" },
+        { "LOUT2 amp", NULL, "DAC 2" },
+        { "LOUT3 amp", NULL, "DAC 3" },
+        { "LOUT1", NULL, "LOUT1 amp" },
+        { "LOUT2", NULL, "LOUT2 amp" },
+        { "LOUT3", NULL, "LOUT3 amp" },
+        { "PDM1L", NULL, "PDM1 L Mux" },
+        { "PDM1R", NULL, "PDM1 R Mux" },
+        { "PDM2L", NULL, "PDM2 L Mux" },
+        { "PDM2R", NULL, "PDM2 R Mux" },
+};
+static int get_clk_info(int sclk, int rate)
+{
+        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
+        if (sclk <= 0 || rate <= 0)
+                return -EINVAL;
+        rate = rate << 8;
+        for (i = 0; i < ARRAY_SIZE(pd); i++)
+                if (sclk == rate * pd[i])
+                        return i;
+        return -EINVAL;
+}
+static int rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val_len = 0, val_clk, mask_clk;
+        int pre_div, bclk_ms, frame_size;
+        rt5677->lrck[dai->id] = params_rate(params);
+        pre_div = get_clk_info(rt5677->sysclk, rt5677->lrck[dai->id]);
+        if (pre_div < 0) {
+                dev_err(codec->dev, "Unsupported clock setting\n");
+                return -EINVAL;
+        }
+        frame_size = snd_soc_params_to_frame_size(params);
+        if (frame_size < 0) {
+                dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size);
+                return -EINVAL;
+        }
+        bclk_ms = frame_size > 32;
+        rt5677->bclk[dai->id] = rt5677->lrck[dai->id] * (32 << bclk_ms);
+        dev_dbg(dai->dev, "bclk is %dHz and lrck is %dHz\n",
+                rt5677->bclk[dai->id], rt5677->lrck[dai->id]);
+        dev_dbg(dai->dev, "bclk_ms is %d and pre_div is %d for iis %d\n",
+                                bclk_ms, pre_div, dai->id);
+        switch (params_width(params)) {
+        case 16:
+                break;
+        case 20:
+                val_len |= RT5677_I2S_DL_20;
+                break;
+        case 24:
+                val_len |= RT5677_I2S_DL_24;
+                break;
+        case 8:
+                val_len |= RT5677_I2S_DL_8;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (dai->id) {
+        case RT5677_AIF1:
+                mask_clk = RT5677_I2S_PD1_MASK;
+                val_clk = pre_div << RT5677_I2S_PD1_SFT;
+                regmap_update_bits(rt5677->regmap, RT5677_I2S1_SDP,
+                        RT5677_I2S_DL_MASK, val_len);
+                regmap_update_bits(rt5677->regmap, RT5677_CLK_TREE_CTRL1,
+                        mask_clk, val_clk);
+                break;
+        case RT5677_AIF2:
+                mask_clk = RT5677_I2S_PD2_MASK;
+                val_clk = pre_div << RT5677_I2S_PD2_SFT;
+                regmap_update_bits(rt5677->regmap, RT5677_I2S2_SDP,
+                        RT5677_I2S_DL_MASK, val_len);
+                regmap_update_bits(rt5677->regmap, RT5677_CLK_TREE_CTRL1,
+                        mask_clk, val_clk);
+                break;
+        case RT5677_AIF3:
+                mask_clk = RT5677_I2S_BCLK_MS3_MASK | RT5677_I2S_PD3_MASK;
+                val_clk = bclk_ms << RT5677_I2S_BCLK_MS3_SFT |
+                        pre_div << RT5677_I2S_PD3_SFT;
+                regmap_update_bits(rt5677->regmap, RT5677_I2S3_SDP,
+                        RT5677_I2S_DL_MASK, val_len);
+                regmap_update_bits(rt5677->regmap, RT5677_CLK_TREE_CTRL1,
+                        mask_clk, val_clk);
+                break;
+        case RT5677_AIF4:
+                mask_clk = RT5677_I2S_BCLK_MS4_MASK | RT5677_I2S_PD4_MASK;
+                val_clk = bclk_ms << RT5677_I2S_BCLK_MS4_SFT |
+                        pre_div << RT5677_I2S_PD4_SFT;
+                regmap_update_bits(rt5677->regmap, RT5677_I2S4_SDP,
+                        RT5677_I2S_DL_MASK, val_len);
+                regmap_update_bits(rt5677->regmap, RT5677_CLK_TREE_CTRL1,
+                        mask_clk, val_clk);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+static int rt5677_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                rt5677->master[dai->id] = 1;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                reg_val |= RT5677_I2S_MS_S;
+                rt5677->master[dai->id] = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                reg_val |= RT5677_I2S_BP_INV;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                reg_val |= RT5677_I2S_DF_LEFT;
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                reg_val |= RT5677_I2S_DF_PCM_A;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                reg_val |= RT5677_I2S_DF_PCM_B;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (dai->id) {
+        case RT5677_AIF1:
+                regmap_update_bits(rt5677->regmap, RT5677_I2S1_SDP,
+                        RT5677_I2S_MS_MASK | RT5677_I2S_BP_MASK |
+                        RT5677_I2S_DF_MASK, reg_val);
+                break;
+        case RT5677_AIF2:
+                regmap_update_bits(rt5677->regmap, RT5677_I2S2_SDP,
+                        RT5677_I2S_MS_MASK | RT5677_I2S_BP_MASK |
+                        RT5677_I2S_DF_MASK, reg_val);
+                break;
+        case RT5677_AIF3:
+                regmap_update_bits(rt5677->regmap, RT5677_I2S3_SDP,
+                        RT5677_I2S_MS_MASK | RT5677_I2S_BP_MASK |
+                        RT5677_I2S_DF_MASK, reg_val);
+                break;
+        case RT5677_AIF4:
+                regmap_update_bits(rt5677->regmap, RT5677_I2S4_SDP,
+                        RT5677_I2S_MS_MASK | RT5677_I2S_BP_MASK |
+                        RT5677_I2S_DF_MASK, reg_val);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+static int rt5677_set_dai_sysclk(struct snd_soc_dai *dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+        if (freq == rt5677->sysclk && clk_id == rt5677->sysclk_src)
+                return 0;
+        switch (clk_id) {
+        case RT5677_SCLK_S_MCLK:
+                reg_val |= RT5677_SCLK_SRC_MCLK;
+                break;
+        case RT5677_SCLK_S_PLL1:
+                reg_val |= RT5677_SCLK_SRC_PLL1;
+                break;
+        case RT5677_SCLK_S_RCCLK:
+                reg_val |= RT5677_SCLK_SRC_RCCLK;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
+                return -EINVAL;
+        }
+        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                RT5677_SCLK_SRC_MASK, reg_val);
+        rt5677->sysclk = freq;
+        rt5677->sysclk_src = clk_id;
+        dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
+        return 0;
+}
+/**
+ * rt5677_pll_calc - Calcualte PLL M/N/K code.
+ * @freq_in: external clock provided to codec.
+ * @freq_out: target clock which codec works on.
+ * @pll_code: Pointer to structure with M, N, K, bypass K and bypass M flag.
+ *
+ * Calcualte M/N/K code and bypass K/M flag to configure PLL for codec.
+ *
+ * Returns 0 for success or negative error code.
+ */
+static int rt5677_pll_calc(const unsigned int freq_in,
+        const unsigned int freq_out, struct rt5677_pll_code *pll_code)
+{
+        int max_n = RT5677_PLL_N_MAX, max_m = RT5677_PLL_M_MAX;
+        int k, red, n_t, pll_out, in_t;
+        int n = 0, m = 0, m_t = 0;
+        int out_t, red_t = abs(freq_out - freq_in);
+        bool m_bp = false, k_bp = false;
+        if (RT5677_PLL_INP_MAX < freq_in || RT5677_PLL_INP_MIN > freq_in)
+                return -EINVAL;
+        k = 100000000 / freq_out - 2;
+        if (k > RT5677_PLL_K_MAX)
+                k = RT5677_PLL_K_MAX;
+        for (n_t = 0; n_t <= max_n; n_t++) {
+                in_t = freq_in / (k + 2);
+                pll_out = freq_out / (n_t + 2);
+                if (in_t < 0)
+                        continue;
+                if (in_t == pll_out) {
+                        m_bp = true;
+                        n = n_t;
+                        goto code_find;
+                }
+                red = abs(in_t - pll_out);
+                if (red < red_t) {
+                        m_bp = true;
+                        n = n_t;
+                        m = m_t;
+                        if (red == 0)
+                                goto code_find;
+                        red_t = red;
+                }
+                for (m_t = 0; m_t <= max_m; m_t++) {
+                        out_t = in_t / (m_t + 2);
+                        red = abs(out_t - pll_out);
+                        if (red < red_t) {
+                                m_bp = false;
+                                n = n_t;
+                                m = m_t;
+                                if (red == 0)
+                                        goto code_find;
+                                red_t = red;
+                        }
+                }
+        }
+        pr_debug("Only get approximation about PLL\n");
+code_find:
+        pll_code->m_bp = m_bp;
+        pll_code->k_bp = k_bp;
+        pll_code->m_code = m;
+        pll_code->n_code = n;
+        pll_code->k_code = k;
+        return 0;
+}
+static int rt5677_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
+                        unsigned int freq_in, unsigned int freq_out)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        struct rt5677_pll_code pll_code;
+        int ret;
+        if (source == rt5677->pll_src && freq_in == rt5677->pll_in &&
+            freq_out == rt5677->pll_out)
+                return 0;
+        if (!freq_in || !freq_out) {
+                dev_dbg(codec->dev, "PLL disabled\n");
+                rt5677->pll_in = 0;
+                rt5677->pll_out = 0;
+                regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                        RT5677_SCLK_SRC_MASK, RT5677_SCLK_SRC_MCLK);
+                return 0;
+        }
+        switch (source) {
+        case RT5677_PLL1_S_MCLK:
+                regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                        RT5677_PLL1_SRC_MASK, RT5677_PLL1_SRC_MCLK);
+                break;
+        case RT5677_PLL1_S_BCLK1:
+        case RT5677_PLL1_S_BCLK2:
+        case RT5677_PLL1_S_BCLK3:
+        case RT5677_PLL1_S_BCLK4:
+                switch (dai->id) {
+                case RT5677_AIF1:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                                RT5677_PLL1_SRC_MASK, RT5677_PLL1_SRC_BCLK1);
+                        break;
+                case RT5677_AIF2:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                                RT5677_PLL1_SRC_MASK, RT5677_PLL1_SRC_BCLK2);
+                        break;
+                case RT5677_AIF3:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                                RT5677_PLL1_SRC_MASK, RT5677_PLL1_SRC_BCLK3);
+                        break;
+                case RT5677_AIF4:
+                        regmap_update_bits(rt5677->regmap, RT5677_GLB_CLK1,
+                                RT5677_PLL1_SRC_MASK, RT5677_PLL1_SRC_BCLK4);
+                        break;
+                default:
+                        break;
+                }
+                break;
+        default:
+                dev_err(codec->dev, "Unknown PLL source %d\n", source);
+                return -EINVAL;
+        }
+        ret = rt5677_pll_calc(freq_in, freq_out, &pll_code);
+        if (ret < 0) {
+                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
+                return ret;
+        }
+        dev_dbg(codec->dev, "m_bypass=%d k_bypass=%d m=%d n=%d k=%d\n",
+                pll_code.m_bp, pll_code.k_bp,
+                (pll_code.m_bp ? 0 : pll_code.m_code), pll_code.n_code,
+                (pll_code.k_bp ? 0 : pll_code.k_code));
+        regmap_write(rt5677->regmap, RT5677_PLL1_CTRL1,
+                pll_code.n_code << RT5677_PLL_N_SFT |
+                pll_code.k_bp << RT5677_PLL_K_BP_SFT |
+                (pll_code.k_bp ? 0 : pll_code.k_code));
+        regmap_write(rt5677->regmap, RT5677_PLL1_CTRL2,
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5677_PLL_M_SFT |
+                pll_code.m_bp << RT5677_PLL_M_BP_SFT);
+        rt5677->pll_in = freq_in;
+        rt5677->pll_out = freq_out;
+        rt5677->pll_src = source;
+        return 0;
+}
+static int rt5677_set_bias_level(struct snd_soc_codec *codec,
+                        enum snd_soc_bias_level level)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
+                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
+                                RT5677_LDO1_SEL_MASK | RT5677_LDO2_SEL_MASK,
+                                0x0055);
+                        regmap_update_bits(rt5677->regmap,
+                                RT5677_PR_BASE + RT5677_BIAS_CUR4,
+                                0x0f00, 0x0f00);
+                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
+                                RT5677_PWR_VREF1 | RT5677_PWR_MB |
+                                RT5677_PWR_BG | RT5677_PWR_VREF2,
+                                RT5677_PWR_VREF1 | RT5677_PWR_MB |
+                                RT5677_PWR_BG | RT5677_PWR_VREF2);
+                        mdelay(20);
+                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
+                                RT5677_PWR_FV1 | RT5677_PWR_FV2,
+                                RT5677_PWR_FV1 | RT5677_PWR_FV2);
+                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2,
+                                RT5677_PWR_CORE, RT5677_PWR_CORE);
+                        regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC,
+                                0x1, 0x1);
+                }
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                break;
+        case SND_SOC_BIAS_OFF:
+                regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x1, 0x0);
+                regmap_write(rt5677->regmap, RT5677_PWR_DIG1, 0x0000);
+                regmap_write(rt5677->regmap, RT5677_PWR_DIG2, 0x0000);
+                regmap_write(rt5677->regmap, RT5677_PWR_ANLG1, 0x0000);
+                regmap_write(rt5677->regmap, RT5677_PWR_ANLG2, 0x0000);
+                regmap_update_bits(rt5677->regmap,
+                        RT5677_PR_BASE + RT5677_BIAS_CUR4, 0x0f00, 0x0000);
+                break;
+        default:
+                break;
+        }
+        codec->dapm.bias_level = level;
+        return 0;
+}
+static int rt5677_probe(struct snd_soc_codec *codec)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        rt5677->codec = codec;
+        rt5677_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regmap_write(rt5677->regmap, RT5677_DIG_MISC, 0x0020);
+        regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x0c00);
+        return 0;
+}
+static int rt5677_remove(struct snd_soc_codec *codec)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int rt5677_suspend(struct snd_soc_codec *codec)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        regcache_cache_only(rt5677->regmap, true);
+        regcache_mark_dirty(rt5677->regmap);
+        return 0;
+}
+static int rt5677_resume(struct snd_soc_codec *codec)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        regcache_cache_only(rt5677->regmap, false);
+        regcache_sync(rt5677->regmap);
+        return 0;
+}
+#else
+#define rt5677_suspend NULL
+#define rt5677_resume NULL
+#endif
+#define RT5677_STEREO_RATES SNDRV_PCM_RATE_8000_96000
+#define RT5677_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
+static struct snd_soc_dai_ops rt5677_aif_dai_ops = {
+        .hw_params = rt5677_hw_params,
+        .set_fmt = rt5677_set_dai_fmt,
+        .set_sysclk = rt5677_set_dai_sysclk,
+        .set_pll = rt5677_set_dai_pll,
+};
+static struct snd_soc_dai_driver rt5677_dai[] = {
+        {
+                .name = "rt5677-aif1",
+                .id = RT5677_AIF1,
+                .playback = {
+                        .stream_name = "AIF1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .ops = &rt5677_aif_dai_ops,
+        },
+        {
+                .name = "rt5677-aif2",
+                .id = RT5677_AIF2,
+                .playback = {
+                        .stream_name = "AIF2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .ops = &rt5677_aif_dai_ops,
+        },
+        {
+                .name = "rt5677-aif3",
+                .id = RT5677_AIF3,
+                .playback = {
+                        .stream_name = "AIF3 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF3 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .ops = &rt5677_aif_dai_ops,
+        },
+        {
+                .name = "rt5677-aif4",
+                .id = RT5677_AIF4,
+                .playback = {
+                        .stream_name = "AIF4 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF4 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .ops = &rt5677_aif_dai_ops,
+        },
+        {
+                .name = "rt5677-slimbus",
+                .id = RT5677_AIF5,
+                .playback = {
+                        .stream_name = "SLIMBus Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "SLIMBus Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5677_STEREO_RATES,
+                        .formats = RT5677_FORMATS,
+                },
+                .ops = &rt5677_aif_dai_ops,
+        },
+};
+static struct snd_soc_codec_driver soc_codec_dev_rt5677 = {
+        .probe = rt5677_probe,
+        .remove = rt5677_remove,
+        .suspend = rt5677_suspend,
+        .resume = rt5677_resume,
+        .set_bias_level = rt5677_set_bias_level,
+        .idle_bias_off = true,
+        .controls = rt5677_snd_controls,
+        .num_controls = ARRAY_SIZE(rt5677_snd_controls),
+        .dapm_widgets = rt5677_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets),
+        .dapm_routes = rt5677_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes),
+};
+static const struct regmap_config rt5677_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+        .max_register = RT5677_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5677_ranges) *
+                                                RT5677_PR_SPACING),
+        .volatile_reg = rt5677_volatile_register,
+        .readable_reg = rt5677_readable_register,
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = rt5677_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt5677_reg),
+        .ranges = rt5677_ranges,
+        .num_ranges = ARRAY_SIZE(rt5677_ranges),
+};
+static const struct i2c_device_id rt5677_i2c_id[] = {
+        { "rt5677", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
+static int rt5677_i2c_probe(struct i2c_client *i2c,
+                    const struct i2c_device_id *id)
+{
+        struct rt5677_platform_data *pdata = dev_get_platdata(&i2c->dev);
+        struct rt5677_priv *rt5677;
+        int ret;
+        unsigned int val;
+        rt5677 = devm_kzalloc(&i2c->dev, sizeof(struct rt5677_priv),
+                                GFP_KERNEL);
+        if (rt5677 == NULL)
+                return -ENOMEM;
+        i2c_set_clientdata(i2c, rt5677);
+        if (pdata)
+                rt5677->pdata = *pdata;
+        rt5677->regmap = devm_regmap_init_i2c(i2c, &rt5677_regmap);
+        if (IS_ERR(rt5677->regmap)) {
+                ret = PTR_ERR(rt5677->regmap);
+                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+        regmap_read(rt5677->regmap, RT5677_VENDOR_ID2, &val);
+        if (val != RT5677_DEVICE_ID) {
+                dev_err(&i2c->dev,
+                        "Device with ID register %x is not rt5677\n", val);
+                return -ENODEV;
+        }
+        regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec);
+        ret = regmap_register_patch(rt5677->regmap, init_list,
+                                    ARRAY_SIZE(init_list));
+        if (ret != 0)
+                dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
+        if (rt5677->pdata.in1_diff)
+                regmap_update_bits(rt5677->regmap, RT5677_IN1,
+                                        RT5677_IN_DF1, RT5677_IN_DF1);
+        if (rt5677->pdata.in2_diff)
+                regmap_update_bits(rt5677->regmap, RT5677_IN1,
+                                        RT5677_IN_DF2, RT5677_IN_DF2);
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677,
+                        rt5677_dai, ARRAY_SIZE(rt5677_dai));
+        if (ret < 0)
+                goto err;
+        return 0;
+err:
+        return ret;
+}
+static int rt5677_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+        return 0;
+}
+static struct i2c_driver rt5677_i2c_driver = {
+        .driver = {
+                .name = "rt5677",
+                .owner = THIS_MODULE,
+        },
+        .probe = rt5677_i2c_probe,
+        .remove   = rt5677_i2c_remove,
+        .id_table = rt5677_i2c_id,
+};
+static int __init rt5677_modinit(void)
+{
+        return i2c_add_driver(&rt5677_i2c_driver);
+}
+module_init(rt5677_modinit);
+static void __exit rt5677_modexit(void)
+{
+        i2c_del_driver(&rt5677_i2c_driver);
+}
+module_exit(rt5677_modexit);
+MODULE_DESCRIPTION("ASoC RT5677 driver");
+MODULE_AUTHOR("Oder Chiou <oder_chiou@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h
new file mode 100644
index 000000000000..af4e9c797408
--- /dev/null
+++ b/sound/soc/codecs/rt5677.h
@@ -0,0 +1,1451 @@
+/*
+ * rt5677.h  --  RT5677 ALSA SoC audio driver
+ *
+ * Copyright 2013 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@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 __RT5677_H__
+#define __RT5677_H__
+#include <sound/rt5677.h>
+/* Info */
+#define RT5677_RESET                            0x00
+#define RT5677_VENDOR_ID                        0xfd
+#define RT5677_VENDOR_ID1                       0xfe
+#define RT5677_VENDOR_ID2                       0xff
+/*  I/O - Output */
+#define RT5677_LOUT1                            0x01
+/* I/O - Input */
+#define RT5677_IN1                              0x03
+#define RT5677_MICBIAS                          0x04
+/* I/O - SLIMBus */
+#define RT5677_SLIMBUS_PARAM                    0x07
+#define RT5677_SLIMBUS_RX                       0x08
+#define RT5677_SLIMBUS_CTRL                     0x09
+/* I/O */
+#define RT5677_SIDETONE_CTRL                    0x13
+/* I/O - ADC/DAC */
+#define RT5677_ANA_DAC1_2_3_SRC                 0x15
+#define RT5677_IF_DSP_DAC3_4_MIXER              0x16
+#define RT5677_DAC4_DIG_VOL                     0x17
+#define RT5677_DAC3_DIG_VOL                     0x18
+#define RT5677_DAC1_DIG_VOL                     0x19
+#define RT5677_DAC2_DIG_VOL                     0x1a
+#define RT5677_IF_DSP_DAC2_MIXER                0x1b
+#define RT5677_STO1_ADC_DIG_VOL                 0x1c
+#define RT5677_MONO_ADC_DIG_VOL                 0x1d
+#define RT5677_STO1_2_ADC_BST                   0x1e
+#define RT5677_STO2_ADC_DIG_VOL                 0x1f
+/* Mixer - D-D */
+#define RT5677_ADC_BST_CTRL2                    0x20
+#define RT5677_STO3_4_ADC_BST                   0x21
+#define RT5677_STO3_ADC_DIG_VOL                 0x22
+#define RT5677_STO4_ADC_DIG_VOL                 0x23
+#define RT5677_STO4_ADC_MIXER                   0x24
+#define RT5677_STO3_ADC_MIXER                   0x25
+#define RT5677_STO2_ADC_MIXER                   0x26
+#define RT5677_STO1_ADC_MIXER                   0x27
+#define RT5677_MONO_ADC_MIXER                   0x28
+#define RT5677_ADC_IF_DSP_DAC1_MIXER            0x29
+#define RT5677_STO1_DAC_MIXER                   0x2a
+#define RT5677_MONO_DAC_MIXER                   0x2b
+#define RT5677_DD1_MIXER                        0x2c
+#define RT5677_DD2_MIXER                        0x2d
+#define RT5677_IF3_DATA                         0x2f
+#define RT5677_IF4_DATA                         0x30
+/* Mixer - PDM */
+#define RT5677_PDM_OUT_CTRL                     0x31
+#define RT5677_PDM_DATA_CTRL1                   0x32
+#define RT5677_PDM_DATA_CTRL2                   0x33
+#define RT5677_PDM1_DATA_CTRL2                  0x34
+#define RT5677_PDM1_DATA_CTRL3                  0x35
+#define RT5677_PDM1_DATA_CTRL4                  0x36
+#define RT5677_PDM2_DATA_CTRL2                  0x37
+#define RT5677_PDM2_DATA_CTRL3                  0x38
+#define RT5677_PDM2_DATA_CTRL4                  0x39
+/* TDM */
+#define RT5677_TDM1_CTRL1                       0x3b
+#define RT5677_TDM1_CTRL2                       0x3c
+#define RT5677_TDM1_CTRL3                       0x3d
+#define RT5677_TDM1_CTRL4                       0x3e
+#define RT5677_TDM1_CTRL5                       0x3f
+#define RT5677_TDM2_CTRL1                       0x40
+#define RT5677_TDM2_CTRL2                       0x41
+#define RT5677_TDM2_CTRL3                       0x42
+#define RT5677_TDM2_CTRL4                       0x43
+#define RT5677_TDM2_CTRL5                       0x44
+/* I2C_MASTER_CTRL */
+#define RT5677_I2C_MASTER_CTRL1                 0x47
+#define RT5677_I2C_MASTER_CTRL2                 0x48
+#define RT5677_I2C_MASTER_CTRL3                 0x49
+#define RT5677_I2C_MASTER_CTRL4                 0x4a
+#define RT5677_I2C_MASTER_CTRL5                 0x4b
+#define RT5677_I2C_MASTER_CTRL6                 0x4c
+#define RT5677_I2C_MASTER_CTRL7                 0x4d
+#define RT5677_I2C_MASTER_CTRL8                 0x4e
+/* DMIC */
+#define RT5677_DMIC_CTRL1                       0x50
+#define RT5677_DMIC_CTRL2                       0x51
+/* Haptic Generator */
+#define RT5677_HAP_GENE_CTRL1                   0x56
+#define RT5677_HAP_GENE_CTRL2                   0x57
+#define RT5677_HAP_GENE_CTRL3                   0x58
+#define RT5677_HAP_GENE_CTRL4                   0x59
+#define RT5677_HAP_GENE_CTRL5                   0x5a
+#define RT5677_HAP_GENE_CTRL6                   0x5b
+#define RT5677_HAP_GENE_CTRL7                   0x5c
+#define RT5677_HAP_GENE_CTRL8                   0x5d
+#define RT5677_HAP_GENE_CTRL9                   0x5e
+#define RT5677_HAP_GENE_CTRL10                  0x5f
+/* Power */
+#define RT5677_PWR_DIG1                         0x61
+#define RT5677_PWR_DIG2                         0x62
+#define RT5677_PWR_ANLG1                        0x63
+#define RT5677_PWR_ANLG2                        0x64
+#define RT5677_PWR_DSP1                         0x65
+#define RT5677_PWR_DSP_ST                       0x66
+#define RT5677_PWR_DSP2                         0x67
+#define RT5677_ADC_DAC_HPF_CTRL1                0x68
+/* Private Register Control */
+#define RT5677_PRIV_INDEX                       0x6a
+#define RT5677_PRIV_DATA                        0x6c
+/* Format - ADC/DAC */
+#define RT5677_I2S4_SDP                         0x6f
+#define RT5677_I2S1_SDP                         0x70
+#define RT5677_I2S2_SDP                         0x71
+#define RT5677_I2S3_SDP                         0x72
+#define RT5677_CLK_TREE_CTRL1                   0x73
+#define RT5677_CLK_TREE_CTRL2                   0x74
+#define RT5677_CLK_TREE_CTRL3                   0x75
+/* Function - Analog */
+#define RT5677_PLL1_CTRL1                       0x7a
+#define RT5677_PLL1_CTRL2                       0x7b
+#define RT5677_PLL2_CTRL1                       0x7c
+#define RT5677_PLL2_CTRL2                       0x7d
+#define RT5677_GLB_CLK1                         0x80
+#define RT5677_GLB_CLK2                         0x81
+#define RT5677_ASRC_1                           0x83
+#define RT5677_ASRC_2                           0x84
+#define RT5677_ASRC_3                           0x85
+#define RT5677_ASRC_4                           0x86
+#define RT5677_ASRC_5                           0x87
+#define RT5677_ASRC_6                           0x88
+#define RT5677_ASRC_7                           0x89
+#define RT5677_ASRC_8                           0x8a
+#define RT5677_ASRC_9                           0x8b
+#define RT5677_ASRC_10                          0x8c
+#define RT5677_ASRC_11                          0x8d
+#define RT5677_ASRC_12                          0x8e
+#define RT5677_ASRC_13                          0x8f
+#define RT5677_ASRC_14                          0x90
+#define RT5677_ASRC_15                          0x91
+#define RT5677_ASRC_16                          0x92
+#define RT5677_ASRC_17                          0x93
+#define RT5677_ASRC_18                          0x94
+#define RT5677_ASRC_19                          0x95
+#define RT5677_ASRC_20                          0x97
+#define RT5677_ASRC_21                          0x98
+#define RT5677_ASRC_22                          0x99
+#define RT5677_ASRC_23                          0x9a
+#define RT5677_VAD_CTRL1                        0x9c
+#define RT5677_VAD_CTRL2                        0x9d
+#define RT5677_VAD_CTRL3                        0x9e
+#define RT5677_VAD_CTRL4                        0x9f
+#define RT5677_VAD_CTRL5                        0xa0
+/* Function - Digital */
+#define RT5677_DSP_INB_CTRL1                    0xa3
+#define RT5677_DSP_INB_CTRL2                    0xa4
+#define RT5677_DSP_IN_OUTB_CTRL                 0xa5
+#define RT5677_DSP_OUTB0_1_DIG_VOL              0xa6
+#define RT5677_DSP_OUTB2_3_DIG_VOL              0xa7
+#define RT5677_DSP_OUTB4_5_DIG_VOL              0xa8
+#define RT5677_DSP_OUTB6_7_DIG_VOL              0xa9
+#define RT5677_ADC_EQ_CTRL1                     0xae
+#define RT5677_ADC_EQ_CTRL2                     0xaf
+#define RT5677_EQ_CTRL1                         0xb0
+#define RT5677_EQ_CTRL2                         0xb1
+#define RT5677_EQ_CTRL3                         0xb2
+#define RT5677_SOFT_VOL_ZERO_CROSS1             0xb3
+#define RT5677_JD_CTRL1                         0xb5
+#define RT5677_JD_CTRL2                         0xb6
+#define RT5677_JD_CTRL3                         0xb8
+#define RT5677_IRQ_CTRL1                        0xbd
+#define RT5677_IRQ_CTRL2                        0xbe
+#define RT5677_GPIO_ST                          0xbf
+#define RT5677_GPIO_CTRL1                       0xc0
+#define RT5677_GPIO_CTRL2                       0xc1
+#define RT5677_GPIO_CTRL3                       0xc2
+#define RT5677_STO1_ADC_HI_FILTER1              0xc5
+#define RT5677_STO1_ADC_HI_FILTER2              0xc6
+#define RT5677_MONO_ADC_HI_FILTER1              0xc7
+#define RT5677_MONO_ADC_HI_FILTER2              0xc8
+#define RT5677_STO2_ADC_HI_FILTER1              0xc9
+#define RT5677_STO2_ADC_HI_FILTER2              0xca
+#define RT5677_STO3_ADC_HI_FILTER1              0xcb
+#define RT5677_STO3_ADC_HI_FILTER2              0xcc
+#define RT5677_STO4_ADC_HI_FILTER1              0xcd
+#define RT5677_STO4_ADC_HI_FILTER2              0xce
+#define RT5677_MB_DRC_CTRL1                     0xd0
+#define RT5677_DRC1_CTRL1                       0xd2
+#define RT5677_DRC1_CTRL2                       0xd3
+#define RT5677_DRC1_CTRL3                       0xd4
+#define RT5677_DRC1_CTRL4                       0xd5
+#define RT5677_DRC1_CTRL5                       0xd6
+#define RT5677_DRC1_CTRL6                       0xd7
+#define RT5677_DRC2_CTRL1                       0xd8
+#define RT5677_DRC2_CTRL2                       0xd9
+#define RT5677_DRC2_CTRL3                       0xda
+#define RT5677_DRC2_CTRL4                       0xdb
+#define RT5677_DRC2_CTRL5                       0xdc
+#define RT5677_DRC2_CTRL6                       0xdd
+#define RT5677_DRC1_HL_CTRL1                    0xde
+#define RT5677_DRC1_HL_CTRL2                    0xdf
+#define RT5677_DRC2_HL_CTRL1                    0xe0
+#define RT5677_DRC2_HL_CTRL2                    0xe1
+#define RT5677_DSP_INB1_SRC_CTRL1               0xe3
+#define RT5677_DSP_INB1_SRC_CTRL2               0xe4
+#define RT5677_DSP_INB1_SRC_CTRL3               0xe5
+#define RT5677_DSP_INB1_SRC_CTRL4               0xe6
+#define RT5677_DSP_INB2_SRC_CTRL1               0xe7
+#define RT5677_DSP_INB2_SRC_CTRL2               0xe8
+#define RT5677_DSP_INB2_SRC_CTRL3               0xe9
+#define RT5677_DSP_INB2_SRC_CTRL4               0xea
+#define RT5677_DSP_INB3_SRC_CTRL1               0xeb
+#define RT5677_DSP_INB3_SRC_CTRL2               0xec
+#define RT5677_DSP_INB3_SRC_CTRL3               0xed
+#define RT5677_DSP_INB3_SRC_CTRL4               0xee
+#define RT5677_DSP_OUTB1_SRC_CTRL1              0xef
+#define RT5677_DSP_OUTB1_SRC_CTRL2              0xf0
+#define RT5677_DSP_OUTB1_SRC_CTRL3              0xf1
+#define RT5677_DSP_OUTB1_SRC_CTRL4              0xf2
+#define RT5677_DSP_OUTB2_SRC_CTRL1              0xf3
+#define RT5677_DSP_OUTB2_SRC_CTRL2              0xf4
+#define RT5677_DSP_OUTB2_SRC_CTRL3              0xf5
+#define RT5677_DSP_OUTB2_SRC_CTRL4              0xf6
+/* Virtual DSP Mixer Control */
+#define RT5677_DSP_OUTB_0123_MIXER_CTRL         0xf7
+#define RT5677_DSP_OUTB_45_MIXER_CTRL           0xf8
+#define RT5677_DSP_OUTB_67_MIXER_CTRL           0xf9
+/* General Control */
+#define RT5677_DIG_MISC                         0xfa
+#define RT5677_GEN_CTRL1                        0xfb
+#define RT5677_GEN_CTRL2                        0xfc
+/* DSP Mode I2C Control*/
+#define RT5677_DSP_I2C_OP_CODE                  0x00
+#define RT5677_DSP_I2C_ADDR_LSB                 0x01
+#define RT5677_DSP_I2C_ADDR_MSB                 0x02
+#define RT5677_DSP_I2C_DATA_LSB                 0x03
+#define RT5677_DSP_I2C_DATA_MSB                 0x04
+/* Index of Codec Private Register definition */
+#define RT5677_PR_DRC1_CTRL_1                   0x01
+#define RT5677_PR_DRC1_CTRL_2                   0x02
+#define RT5677_PR_DRC1_CTRL_3                   0x03
+#define RT5677_PR_DRC1_CTRL_4                   0x04
+#define RT5677_PR_DRC1_CTRL_5                   0x05
+#define RT5677_PR_DRC1_CTRL_6                   0x06
+#define RT5677_PR_DRC1_CTRL_7                   0x07
+#define RT5677_PR_DRC2_CTRL_1                   0x08
+#define RT5677_PR_DRC2_CTRL_2                   0x09
+#define RT5677_PR_DRC2_CTRL_3                   0x0a
+#define RT5677_PR_DRC2_CTRL_4                   0x0b
+#define RT5677_PR_DRC2_CTRL_5                   0x0c
+#define RT5677_PR_DRC2_CTRL_6                   0x0d
+#define RT5677_PR_DRC2_CTRL_7                   0x0e
+#define RT5677_BIAS_CUR1                        0x10
+#define RT5677_BIAS_CUR2                        0x12
+#define RT5677_BIAS_CUR3                        0x13
+#define RT5677_BIAS_CUR4                        0x14
+#define RT5677_BIAS_CUR5                        0x15
+#define RT5677_VREF_LOUT_CTRL                   0x17
+#define RT5677_DIG_VOL_CTRL1                    0x1a
+#define RT5677_DIG_VOL_CTRL2                    0x1b
+#define RT5677_ANA_ADC_GAIN_CTRL                0x1e
+#define RT5677_VAD_SRAM_TEST1                   0x20
+#define RT5677_VAD_SRAM_TEST2                   0x21
+#define RT5677_VAD_SRAM_TEST3                   0x22
+#define RT5677_VAD_SRAM_TEST4                   0x23
+#define RT5677_PAD_DRV_CTRL                     0x26
+#define RT5677_DIG_IN_PIN_ST_CTRL1              0x29
+#define RT5677_DIG_IN_PIN_ST_CTRL2              0x2a
+#define RT5677_DIG_IN_PIN_ST_CTRL3              0x2b
+#define RT5677_PLL1_INT                         0x38
+#define RT5677_PLL2_INT                         0x39
+#define RT5677_TEST_CTRL1                       0x3a
+#define RT5677_TEST_CTRL2                       0x3b
+#define RT5677_TEST_CTRL3                       0x3c
+#define RT5677_CHOP_DAC_ADC                     0x3d
+#define RT5677_SOFT_DEPOP_DAC_CLK_CTRL          0x3e
+#define RT5677_CROSS_OVER_FILTER1               0x90
+#define RT5677_CROSS_OVER_FILTER2               0x91
+#define RT5677_CROSS_OVER_FILTER3               0x92
+#define RT5677_CROSS_OVER_FILTER4               0x93
+#define RT5677_CROSS_OVER_FILTER5               0x94
+#define RT5677_CROSS_OVER_FILTER6               0x95
+#define RT5677_CROSS_OVER_FILTER7               0x96
+#define RT5677_CROSS_OVER_FILTER8               0x97
+#define RT5677_CROSS_OVER_FILTER9               0x98
+#define RT5677_CROSS_OVER_FILTER10              0x99
+/* global definition */
+#define RT5677_L_MUTE                           (0x1 << 15)
+#define RT5677_L_MUTE_SFT                       15
+#define RT5677_VOL_L_MUTE                       (0x1 << 14)
+#define RT5677_VOL_L_SFT                        14
+#define RT5677_R_MUTE                           (0x1 << 7)
+#define RT5677_R_MUTE_SFT                       7
+#define RT5677_VOL_R_MUTE                       (0x1 << 6)
+#define RT5677_VOL_R_SFT                        6
+#define RT5677_L_VOL_MASK                       (0x3f << 8)
+#define RT5677_L_VOL_SFT                        8
+#define RT5677_R_VOL_MASK                       (0x3f)
+#define RT5677_R_VOL_SFT                        0
+/* LOUT1 Control (0x01) */
+#define RT5677_LOUT1_L_MUTE                     (0x1 << 15)
+#define RT5677_LOUT1_L_MUTE_SFT                 (15)
+#define RT5677_LOUT1_L_DF                       (0x1 << 14)
+#define RT5677_LOUT1_L_DF_SFT                   (14)
+#define RT5677_LOUT2_L_MUTE                     (0x1 << 13)
+#define RT5677_LOUT2_L_MUTE_SFT                 (13)
+#define RT5677_LOUT2_L_DF                       (0x1 << 12)
+#define RT5677_LOUT2_L_DF_SFT                   (12)
+#define RT5677_LOUT3_L_MUTE                     (0x1 << 11)
+#define RT5677_LOUT3_L_MUTE_SFT                 (11)
+#define RT5677_LOUT3_L_DF                       (0x1 << 10)
+#define RT5677_LOUT3_L_DF_SFT                   (10)
+#define RT5677_LOUT1_ENH_DRV                    (0x1 << 9)
+#define RT5677_LOUT1_ENH_DRV_SFT                (9)
+#define RT5677_LOUT2_ENH_DRV                    (0x1 << 8)
+#define RT5677_LOUT2_ENH_DRV_SFT                (8)
+#define RT5677_LOUT3_ENH_DRV                    (0x1 << 7)
+#define RT5677_LOUT3_ENH_DRV_SFT                (7)
+/* IN1 Control (0x03) */
+#define RT5677_BST_MASK1                        (0xf << 12)
+#define RT5677_BST_SFT1                         12
+#define RT5677_BST_MASK2                        (0xf << 8)
+#define RT5677_BST_SFT2                         8
+#define RT5677_IN_DF1                           (0x1 << 7)
+#define RT5677_IN_DF1_SFT                       7
+#define RT5677_IN_DF2                           (0x1 << 6)
+#define RT5677_IN_DF2_SFT                       6
+/* Micbias Control (0x04) */
+#define RT5677_MICBIAS1_OUTVOLT_MASK            (0x1 << 15)
+#define RT5677_MICBIAS1_OUTVOLT_SFT             (15)
+#define RT5677_MICBIAS1_OUTVOLT_2_7V            (0x0 << 15)
+#define RT5677_MICBIAS1_OUTVOLT_2_25V           (0x1 << 15)
+#define RT5677_MICBIAS1_CTRL_VDD_MASK           (0x1 << 14)
+#define RT5677_MICBIAS1_CTRL_VDD_SFT            (14)
+#define RT5677_MICBIAS1_CTRL_VDD_1_8V           (0x0 << 14)
+#define RT5677_MICBIAS1_CTRL_VDD_3_3V           (0x1 << 14)
+#define RT5677_MICBIAS1_OVCD_MASK               (0x1 << 11)
+#define RT5677_MICBIAS1_OVCD_SHIFT              (11)
+#define RT5677_MICBIAS1_OVCD_DIS                (0x0 << 11)
+#define RT5677_MICBIAS1_OVCD_EN                 (0x1 << 11)
+#define RT5677_MICBIAS1_OVTH_MASK               (0x3 << 9)
+#define RT5677_MICBIAS1_OVTH_SFT                9
+#define RT5677_MICBIAS1_OVTH_640UA              (0x0 << 9)
+#define RT5677_MICBIAS1_OVTH_1280UA             (0x1 << 9)
+#define RT5677_MICBIAS1_OVTH_1920UA             (0x2 << 9)
+/* SLIMbus Parameter (0x07) */
+/* SLIMbus Rx (0x08) */
+#define RT5677_SLB_ADC4_MASK                    (0x3 << 6)
+#define RT5677_SLB_ADC4_SFT                     6
+#define RT5677_SLB_ADC3_MASK                    (0x3 << 4)
+#define RT5677_SLB_ADC3_SFT                     4
+#define RT5677_SLB_ADC2_MASK                    (0x3 << 2)
+#define RT5677_SLB_ADC2_SFT                     2
+#define RT5677_SLB_ADC1_MASK                    (0x3 << 0)
+#define RT5677_SLB_ADC1_SFT                     0
+/* SLIMBus control (0x09) */
+/* Sidetone Control (0x13) */
+#define RT5677_ST_HPF_SEL_MASK                  (0x7 << 13)
+#define RT5677_ST_HPF_SEL_SFT                   13
+#define RT5677_ST_HPF_PATH                      (0x1 << 12)
+#define RT5677_ST_HPF_PATH_SFT                  12
+#define RT5677_ST_SEL_MASK                      (0x7 << 9)
+#define RT5677_ST_SEL_SFT                       9
+#define RT5677_ST_EN                            (0x1 << 6)
+#define RT5677_ST_EN_SFT                        6
+/* Analog DAC1/2/3 Source Control (0x15) */
+#define RT5677_ANA_DAC3_SRC_SEL_MASK            (0x3 << 4)
+#define RT5677_ANA_DAC3_SRC_SEL_SFT             4
+#define RT5677_ANA_DAC1_2_SRC_SEL_MASK          (0x3 << 0)
+#define RT5677_ANA_DAC1_2_SRC_SEL_SFT           0
+/* IF/DSP to DAC3/4 Mixer Control (0x16) */
+#define RT5677_M_DAC4_L_VOL                     (0x1 << 15)
+#define RT5677_M_DAC4_L_VOL_SFT                 15
+#define RT5677_SEL_DAC4_L_SRC_MASK              (0x7 << 12)
+#define RT5677_SEL_DAC4_L_SRC_SFT               12
+#define RT5677_M_DAC4_R_VOL                     (0x1 << 11)
+#define RT5677_M_DAC4_R_VOL_SFT                 11
+#define RT5677_SEL_DAC4_R_SRC_MASK              (0x7 << 8)
+#define RT5677_SEL_DAC4_R_SRC_SFT               8
+#define RT5677_M_DAC3_L_VOL                     (0x1 << 7)
+#define RT5677_M_DAC3_L_VOL_SFT                 7
+#define RT5677_SEL_DAC3_L_SRC_MASK              (0x7 << 4)
+#define RT5677_SEL_DAC3_L_SRC_SFT               4
+#define RT5677_M_DAC3_R_VOL                     (0x1 << 3)
+#define RT5677_M_DAC3_R_VOL_SFT                 3
+#define RT5677_SEL_DAC3_R_SRC_MASK              (0x7 << 0)
+#define RT5677_SEL_DAC3_R_SRC_SFT               0
+/* DAC4 Digital Volume (0x17) */
+#define RT5677_DAC4_L_VOL_MASK                  (0xff << 8)
+#define RT5677_DAC4_L_VOL_SFT                   8
+#define RT5677_DAC4_R_VOL_MASK                  (0xff)
+#define RT5677_DAC4_R_VOL_SFT                   0
+/* DAC3 Digital Volume (0x18) */
+#define RT5677_DAC3_L_VOL_MASK                  (0xff << 8)
+#define RT5677_DAC3_L_VOL_SFT                   8
+#define RT5677_DAC3_R_VOL_MASK                  (0xff)
+#define RT5677_DAC3_R_VOL_SFT                   0
+/* DAC3 Digital Volume (0x19) */
+#define RT5677_DAC1_L_VOL_MASK                  (0xff << 8)
+#define RT5677_DAC1_L_VOL_SFT                   8
+#define RT5677_DAC1_R_VOL_MASK                  (0xff)
+#define RT5677_DAC1_R_VOL_SFT                   0
+/* DAC2 Digital Volume (0x1a) */
+#define RT5677_DAC2_L_VOL_MASK                  (0xff << 8)
+#define RT5677_DAC2_L_VOL_SFT                   8
+#define RT5677_DAC2_R_VOL_MASK                  (0xff)
+#define RT5677_DAC2_R_VOL_SFT                   0
+/* IF/DSP to DAC2 Mixer Control (0x1b) */
+#define RT5677_M_DAC2_L_VOL                     (0x1 << 7)
+#define RT5677_M_DAC2_L_VOL_SFT                 7
+#define RT5677_SEL_DAC2_L_SRC_MASK              (0x7 << 4)
+#define RT5677_SEL_DAC2_L_SRC_SFT               4
+#define RT5677_M_DAC2_R_VOL                     (0x1 << 3)
+#define RT5677_M_DAC2_R_VOL_SFT                 3
+#define RT5677_SEL_DAC2_R_SRC_MASK              (0x7 << 0)
+#define RT5677_SEL_DAC2_R_SRC_SFT               0
+/* Stereo1 ADC Digital Volume Control (0x1c) */
+#define RT5677_STO1_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5677_STO1_ADC_L_VOL_SFT               8
+#define RT5677_STO1_ADC_R_VOL_MASK              (0x7f)
+#define RT5677_STO1_ADC_R_VOL_SFT               0
+/* Mono ADC Digital Volume Control (0x1d) */
+#define RT5677_MONO_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5677_MONO_ADC_L_VOL_SFT               8
+#define RT5677_MONO_ADC_R_VOL_MASK              (0x7f)
+#define RT5677_MONO_ADC_R_VOL_SFT               0
+/* Stereo 1/2 ADC Boost Gain Control (0x1e) */
+#define RT5677_STO1_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5677_STO1_ADC_L_BST_SFT               14
+#define RT5677_STO1_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5677_STO1_ADC_R_BST_SFT               12
+#define RT5677_STO1_ADC_COMP_MASK               (0x3 << 10)
+#define RT5677_STO1_ADC_COMP_SFT                10
+#define RT5677_STO2_ADC_L_BST_MASK              (0x3 << 8)
+#define RT5677_STO2_ADC_L_BST_SFT               8
+#define RT5677_STO2_ADC_R_BST_MASK              (0x3 << 6)
+#define RT5677_STO2_ADC_R_BST_SFT               6
+#define RT5677_STO2_ADC_COMP_MASK               (0x3 << 4)
+#define RT5677_STO2_ADC_COMP_SFT                4
+/* Stereo2 ADC Digital Volume Control (0x1f) */
+#define RT5677_STO2_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5677_STO2_ADC_L_VOL_SFT               8
+#define RT5677_STO2_ADC_R_VOL_MASK              (0x7f)
+#define RT5677_STO2_ADC_R_VOL_SFT               0
+/* ADC Boost Gain Control 2 (0x20) */
+#define RT5677_MONO_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5677_MONO_ADC_L_BST_SFT               14
+#define RT5677_MONO_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5677_MONO_ADC_R_BST_SFT               12
+#define RT5677_MONO_ADC_COMP_MASK               (0x3 << 10)
+#define RT5677_MONO_ADC_COMP_SFT                10
+/* Stereo 3/4 ADC Boost Gain Control (0x21) */
+#define RT5677_STO3_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5677_STO3_ADC_L_BST_SFT               14
+#define RT5677_STO3_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5677_STO3_ADC_R_BST_SFT               12
+#define RT5677_STO3_ADC_COMP_MASK               (0x3 << 10)
+#define RT5677_STO3_ADC_COMP_SFT                10
+#define RT5677_STO4_ADC_L_BST_MASK              (0x3 << 8)
+#define RT5677_STO4_ADC_L_BST_SFT               8
+#define RT5677_STO4_ADC_R_BST_MASK              (0x3 << 6)
+#define RT5677_STO4_ADC_R_BST_SFT               6
+#define RT5677_STO4_ADC_COMP_MASK               (0x3 << 4)
+#define RT5677_STO4_ADC_COMP_SFT                4
+/* Stereo3 ADC Digital Volume Control (0x22) */
+#define RT5677_STO3_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5677_STO3_ADC_L_VOL_SFT               8
+#define RT5677_STO3_ADC_R_VOL_MASK              (0x7f)
+#define RT5677_STO3_ADC_R_VOL_SFT               0
+/* Stereo4 ADC Digital Volume Control (0x23) */
+#define RT5677_STO4_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5677_STO4_ADC_L_VOL_SFT               8
+#define RT5677_STO4_ADC_R_VOL_MASK              (0x7f)
+#define RT5677_STO4_ADC_R_VOL_SFT               0
+/* Stereo4 ADC Mixer control (0x24) */
+#define RT5677_M_STO4_ADC_L2                    (0x1 << 15)
+#define RT5677_M_STO4_ADC_L2_SFT                15
+#define RT5677_M_STO4_ADC_L1                    (0x1 << 14)
+#define RT5677_M_STO4_ADC_L1_SFT                14
+#define RT5677_SEL_STO4_ADC1_MASK               (0x3 << 12)
+#define RT5677_SEL_STO4_ADC1_SFT                12
+#define RT5677_SEL_STO4_ADC2_MASK               (0x3 << 10)
+#define RT5677_SEL_STO4_ADC2_SFT                10
+#define RT5677_SEL_STO4_DMIC_MASK               (0x3 << 8)
+#define RT5677_SEL_STO4_DMIC_SFT                8
+#define RT5677_M_STO4_ADC_R1                    (0x1 << 7)
+#define RT5677_M_STO4_ADC_R1_SFT                7
+#define RT5677_M_STO4_ADC_R2                    (0x1 << 6)
+#define RT5677_M_STO4_ADC_R2_SFT                6
+/* Stereo3 ADC Mixer control (0x25) */
+#define RT5677_M_STO3_ADC_L2                    (0x1 << 15)
+#define RT5677_M_STO3_ADC_L2_SFT                15
+#define RT5677_M_STO3_ADC_L1                    (0x1 << 14)
+#define RT5677_M_STO3_ADC_L1_SFT                14
+#define RT5677_SEL_STO3_ADC1_MASK               (0x3 << 12)
+#define RT5677_SEL_STO3_ADC1_SFT                12
+#define RT5677_SEL_STO3_ADC2_MASK               (0x3 << 10)
+#define RT5677_SEL_STO3_ADC2_SFT                10
+#define RT5677_SEL_STO3_DMIC_MASK               (0x3 << 8)
+#define RT5677_SEL_STO3_DMIC_SFT                8
+#define RT5677_M_STO3_ADC_R1                    (0x1 << 7)
+#define RT5677_M_STO3_ADC_R1_SFT                7
+#define RT5677_M_STO3_ADC_R2                    (0x1 << 6)
+#define RT5677_M_STO3_ADC_R2_SFT                6
+/* Stereo2 ADC Mixer Control (0x26) */
+#define RT5677_M_STO2_ADC_L2                    (0x1 << 15)
+#define RT5677_M_STO2_ADC_L2_SFT                15
+#define RT5677_M_STO2_ADC_L1                    (0x1 << 14)
+#define RT5677_M_STO2_ADC_L1_SFT                14
+#define RT5677_SEL_STO2_ADC1_MASK               (0x3 << 12)
+#define RT5677_SEL_STO2_ADC1_SFT                12
+#define RT5677_SEL_STO2_ADC2_MASK               (0x3 << 10)
+#define RT5677_SEL_STO2_ADC2_SFT                10
+#define RT5677_SEL_STO2_DMIC_MASK               (0x3 << 8)
+#define RT5677_SEL_STO2_DMIC_SFT                8
+#define RT5677_M_STO2_ADC_R1                    (0x1 << 7)
+#define RT5677_M_STO2_ADC_R1_SFT                7
+#define RT5677_M_STO2_ADC_R2                    (0x1 << 6)
+#define RT5677_M_STO2_ADC_R2_SFT                6
+#define RT5677_SEL_STO2_LR_MIX_MASK             (0x1 << 0)
+#define RT5677_SEL_STO2_LR_MIX_SFT              0
+#define RT5677_SEL_STO2_LR_MIX_L                (0x0 << 0)
+#define RT5677_SEL_STO2_LR_MIX_LR               (0x1 << 0)
+/* Stereo1 ADC Mixer control (0x27) */
+#define RT5677_M_STO1_ADC_L2                    (0x1 << 15)
+#define RT5677_M_STO1_ADC_L2_SFT                15
+#define RT5677_M_STO1_ADC_L1                    (0x1 << 14)
+#define RT5677_M_STO1_ADC_L1_SFT                14
+#define RT5677_SEL_STO1_ADC1_MASK               (0x3 << 12)
+#define RT5677_SEL_STO1_ADC1_SFT                12
+#define RT5677_SEL_STO1_ADC2_MASK               (0x3 << 10)
+#define RT5677_SEL_STO1_ADC2_SFT                10
+#define RT5677_SEL_STO1_DMIC_MASK               (0x3 << 8)
+#define RT5677_SEL_STO1_DMIC_SFT                8
+#define RT5677_M_STO1_ADC_R1                    (0x1 << 7)
+#define RT5677_M_STO1_ADC_R1_SFT                7
+#define RT5677_M_STO1_ADC_R2                    (0x1 << 6)
+#define RT5677_M_STO1_ADC_R2_SFT                6
+/* Mono ADC Mixer control (0x28) */
+#define RT5677_M_MONO_ADC_L2                    (0x1 << 15)
+#define RT5677_M_MONO_ADC_L2_SFT                15
+#define RT5677_M_MONO_ADC_L1                    (0x1 << 14)
+#define RT5677_M_MONO_ADC_L1_SFT                14
+#define RT5677_SEL_MONO_ADC_L1_MASK             (0x3 << 12)
+#define RT5677_SEL_MONO_ADC_L1_SFT              12
+#define RT5677_SEL_MONO_ADC_L2_MASK             (0x3 << 10)
+#define RT5677_SEL_MONO_ADC_L2_SFT              10
+#define RT5677_SEL_MONO_DMIC_L_MASK             (0x3 << 8)
+#define RT5677_SEL_MONO_DMIC_L_SFT              8
+#define RT5677_M_MONO_ADC_R1                    (0x1 << 7)
+#define RT5677_M_MONO_ADC_R1_SFT                7
+#define RT5677_M_MONO_ADC_R2                    (0x1 << 6)
+#define RT5677_M_MONO_ADC_R2_SFT                6
+#define RT5677_SEL_MONO_ADC_R1_MASK             (0x3 << 4)
+#define RT5677_SEL_MONO_ADC_R1_SFT              4
+#define RT5677_SEL_MONO_ADC_R2_MASK             (0x3 << 2)
+#define RT5677_SEL_MONO_ADC_R2_SFT              2
+#define RT5677_SEL_MONO_DMIC_R_MASK             (0x3 << 0)
+#define RT5677_SEL_MONO_DMIC_R_SFT              0
+/* ADC/IF/DSP to DAC1 Mixer control (0x29) */
+#define RT5677_M_ADDA_MIXER1_L                  (0x1 << 15)
+#define RT5677_M_ADDA_MIXER1_L_SFT              15
+#define RT5677_M_DAC1_L                         (0x1 << 14)
+#define RT5677_M_DAC1_L_SFT                     14
+#define RT5677_DAC1_L_SEL_MASK                  (0x7 << 8)
+#define RT5677_DAC1_L_SEL_SFT                   8
+#define RT5677_M_ADDA_MIXER1_R                  (0x1 << 7)
+#define RT5677_M_ADDA_MIXER1_R_SFT              7
+#define RT5677_M_DAC1_R                         (0x1 << 6)
+#define RT5677_M_DAC1_R_SFT                     6
+#define RT5677_ADDA1_SEL_MASK                   (0x3 << 0)
+#define RT5677_ADDA1_SEL_SFT                    0
+/* Stereo1 DAC Mixer L/R Control (0x2a) */
+#define RT5677_M_ST_DAC1_L                      (0x1 << 15)
+#define RT5677_M_ST_DAC1_L_SFT                  15
+#define RT5677_M_DAC1_L_STO_L                   (0x1 << 13)
+#define RT5677_M_DAC1_L_STO_L_SFT               13
+#define RT5677_DAC1_L_STO_L_VOL_MASK            (0x1 << 12)
+#define RT5677_DAC1_L_STO_L_VOL_SFT             12
+#define RT5677_M_DAC2_L_STO_L                   (0x1 << 11)
+#define RT5677_M_DAC2_L_STO_L_SFT               11
+#define RT5677_DAC2_L_STO_L_VOL_MASK            (0x1 << 10)
+#define RT5677_DAC2_L_STO_L_VOL_SFT             10
+#define RT5677_M_DAC1_R_STO_L                   (0x1 << 9)
+#define RT5677_M_DAC1_R_STO_L_SFT               9
+#define RT5677_DAC1_R_STO_L_VOL_MASK            (0x1 << 8)
+#define RT5677_DAC1_R_STO_L_VOL_SFT             8
+#define RT5677_M_ST_DAC1_R                      (0x1 << 7)
+#define RT5677_M_ST_DAC1_R_SFT                  7
+#define RT5677_M_DAC1_R_STO_R                   (0x1 << 5)
+#define RT5677_M_DAC1_R_STO_R_SFT               5
+#define RT5677_DAC1_R_STO_R_VOL_MASK            (0x1 << 4)
+#define RT5677_DAC1_R_STO_R_VOL_SFT             4
+#define RT5677_M_DAC2_R_STO_R                   (0x1 << 3)
+#define RT5677_M_DAC2_R_STO_R_SFT               3
+#define RT5677_DAC2_R_STO_R_VOL_MASK            (0x1 << 2)
+#define RT5677_DAC2_R_STO_R_VOL_SFT             2
+#define RT5677_M_DAC1_L_STO_R                   (0x1 << 1)
+#define RT5677_M_DAC1_L_STO_R_SFT               1
+#define RT5677_DAC1_L_STO_R_VOL_MASK            (0x1 << 0)
+#define RT5677_DAC1_L_STO_R_VOL_SFT             0
+/* Mono DAC Mixer L/R Control (0x2b) */
+#define RT5677_M_ST_DAC2_L                      (0x1 << 15)
+#define RT5677_M_ST_DAC2_L_SFT                  15
+#define RT5677_M_DAC2_L_MONO_L                  (0x1 << 13)
+#define RT5677_M_DAC2_L_MONO_L_SFT              13
+#define RT5677_DAC2_L_MONO_L_VOL_MASK           (0x1 << 12)
+#define RT5677_DAC2_L_MONO_L_VOL_SFT            12
+#define RT5677_M_DAC2_R_MONO_L                  (0x1 << 11)
+#define RT5677_M_DAC2_R_MONO_L_SFT              11
+#define RT5677_DAC2_R_MONO_L_VOL_MASK           (0x1 << 10)
+#define RT5677_DAC2_R_MONO_L_VOL_SFT            10
+#define RT5677_M_DAC1_L_MONO_L                  (0x1 << 9)
+#define RT5677_M_DAC1_L_MONO_L_SFT              9
+#define RT5677_DAC1_L_MONO_L_VOL_MASK           (0x1 << 8)
+#define RT5677_DAC1_L_MONO_L_VOL_SFT            8
+#define RT5677_M_ST_DAC2_R                      (0x1 << 7)
+#define RT5677_M_ST_DAC2_R_SFT                  7
+#define RT5677_M_DAC2_R_MONO_R                  (0x1 << 5)
+#define RT5677_M_DAC2_R_MONO_R_SFT              5
+#define RT5677_DAC2_R_MONO_R_VOL_MASK           (0x1 << 4)
+#define RT5677_DAC2_R_MONO_R_VOL_SFT            4
+#define RT5677_M_DAC1_R_MONO_R                  (0x1 << 3)
+#define RT5677_M_DAC1_R_MONO_R_SFT              3
+#define RT5677_DAC1_R_MONO_R_VOL_MASK           (0x1 << 2)
+#define RT5677_DAC1_R_MONO_R_VOL_SFT            2
+#define RT5677_M_DAC2_L_MONO_R                  (0x1 << 1)
+#define RT5677_M_DAC2_L_MONO_R_SFT              1
+#define RT5677_DAC2_L_MONO_R_VOL_MASK           (0x1 << 0)
+#define RT5677_DAC2_L_MONO_R_VOL_SFT            0
+/* DD Mixer 1 Control (0x2c) */
+#define RT5677_M_STO_L_DD1_L                    (0x1 << 15)
+#define RT5677_M_STO_L_DD1_L_SFT                15
+#define RT5677_STO_L_DD1_L_VOL_MASK             (0x1 << 14)
+#define RT5677_STO_L_DD1_L_VOL_SFT              14
+#define RT5677_M_MONO_L_DD1_L                   (0x1 << 13)
+#define RT5677_M_MONO_L_DD1_L_SFT               13
+#define RT5677_MONO_L_DD1_L_VOL_MASK            (0x1 << 12)
+#define RT5677_MONO_L_DD1_L_VOL_SFT             12
+#define RT5677_M_DAC3_L_DD1_L                   (0x1 << 11)
+#define RT5677_M_DAC3_L_DD1_L_SFT               11
+#define RT5677_DAC3_L_DD1_L_VOL_MASK            (0x1 << 10)
+#define RT5677_DAC3_L_DD1_L_VOL_SFT             10
+#define RT5677_M_DAC3_R_DD1_L                   (0x1 << 9)
+#define RT5677_M_DAC3_R_DD1_L_SFT               9
+#define RT5677_DAC3_R_DD1_L_VOL_MASK            (0x1 << 8)
+#define RT5677_DAC3_R_DD1_L_VOL_SFT             8
+#define RT5677_M_STO_R_DD1_R                    (0x1 << 7)
+#define RT5677_M_STO_R_DD1_R_SFT                7
+#define RT5677_STO_R_DD1_R_VOL_MASK             (0x1 << 6)
+#define RT5677_STO_R_DD1_R_VOL_SFT              6
+#define RT5677_M_MONO_R_DD1_R                   (0x1 << 5)
+#define RT5677_M_MONO_R_DD1_R_SFT               5
+#define RT5677_MONO_R_DD1_R_VOL_MASK            (0x1 << 4)
+#define RT5677_MONO_R_DD1_R_VOL_SFT             4
+#define RT5677_M_DAC3_R_DD1_R                   (0x1 << 3)
+#define RT5677_M_DAC3_R_DD1_R_SFT               3
+#define RT5677_DAC3_R_DD1_R_VOL_MASK            (0x1 << 2)
+#define RT5677_DAC3_R_DD1_R_VOL_SFT             2
+#define RT5677_M_DAC3_L_DD1_R                   (0x1 << 1)
+#define RT5677_M_DAC3_L_DD1_R_SFT               1
+#define RT5677_DAC3_L_DD1_R_VOL_MASK            (0x1 << 0)
+#define RT5677_DAC3_L_DD1_R_VOL_SFT             0
+/* DD Mixer 2 Control (0x2d) */
+#define RT5677_M_STO_L_DD2_L                    (0x1 << 15)
+#define RT5677_M_STO_L_DD2_L_SFT                15
+#define RT5677_STO_L_DD2_L_VOL_MASK             (0x1 << 14)
+#define RT5677_STO_L_DD2_L_VOL_SFT              14
+#define RT5677_M_MONO_L_DD2_L                   (0x1 << 13)
+#define RT5677_M_MONO_L_DD2_L_SFT               13
+#define RT5677_MONO_L_DD2_L_VOL_MASK            (0x1 << 12)
+#define RT5677_MONO_L_DD2_L_VOL_SFT             12
+#define RT5677_M_DAC4_L_DD2_L                   (0x1 << 11)
+#define RT5677_M_DAC4_L_DD2_L_SFT               11
+#define RT5677_DAC4_L_DD2_L_VOL_MASK            (0x1 << 10)
+#define RT5677_DAC4_L_DD2_L_VOL_SFT             10
+#define RT5677_M_DAC4_R_DD2_L                   (0x1 << 9)
+#define RT5677_M_DAC4_R_DD2_L_SFT               9
+#define RT5677_DAC4_R_DD2_L_VOL_MASK            (0x1 << 8)
+#define RT5677_DAC4_R_DD2_L_VOL_SFT             8
+#define RT5677_M_STO_R_DD2_R                    (0x1 << 7)
+#define RT5677_M_STO_R_DD2_R_SFT                7
+#define RT5677_STO_R_DD2_R_VOL_MASK             (0x1 << 6)
+#define RT5677_STO_R_DD2_R_VOL_SFT              6
+#define RT5677_M_MONO_R_DD2_R                   (0x1 << 5)
+#define RT5677_M_MONO_R_DD2_R_SFT               5
+#define RT5677_MONO_R_DD2_R_VOL_MASK            (0x1 << 4)
+#define RT5677_MONO_R_DD2_R_VOL_SFT             4
+#define RT5677_M_DAC4_R_DD2_R                   (0x1 << 3)
+#define RT5677_M_DAC4_R_DD2_R_SFT               3
+#define RT5677_DAC4_R_DD2_R_VOL_MASK            (0x1 << 2)
+#define RT5677_DAC4_R_DD2_R_VOL_SFT             2
+#define RT5677_M_DAC4_L_DD2_R                   (0x1 << 1)
+#define RT5677_M_DAC4_L_DD2_R_SFT               1
+#define RT5677_DAC4_L_DD2_R_VOL_MASK            (0x1 << 0)
+#define RT5677_DAC4_L_DD2_R_VOL_SFT             0
+/* IF3 data control (0x2f) */
+#define RT5677_IF3_DAC_SEL_MASK                 (0x3 << 6)
+#define RT5677_IF3_DAC_SEL_SFT                  6
+#define RT5677_IF3_ADC_SEL_MASK                 (0x3 << 4)
+#define RT5677_IF3_ADC_SEL_SFT                  4
+#define RT5677_IF3_ADC_IN_MASK                  (0xf << 0)
+#define RT5677_IF3_ADC_IN_SFT                   0
+/* IF4 data control (0x30) */
+#define RT5677_IF4_ADC_IN_MASK                  (0xf << 4)
+#define RT5677_IF4_ADC_IN_SFT                   4
+#define RT5677_IF4_DAC_SEL_MASK                 (0x3 << 2)
+#define RT5677_IF4_DAC_SEL_SFT                  2
+#define RT5677_IF4_ADC_SEL_MASK                 (0x3 << 0)
+#define RT5677_IF4_ADC_SEL_SFT                  0
+/* PDM Output Control (0x31) */
+#define RT5677_M_PDM1_L                         (0x1 << 15)
+#define RT5677_M_PDM1_L_SFT                     15
+#define RT5677_SEL_PDM1_L_MASK                  (0x3 << 12)
+#define RT5677_SEL_PDM1_L_SFT                   12
+#define RT5677_M_PDM1_R                         (0x1 << 11)
+#define RT5677_M_PDM1_R_SFT                     11
+#define RT5677_SEL_PDM1_R_MASK                  (0x3 << 8)
+#define RT5677_SEL_PDM1_R_SFT                   8
+#define RT5677_M_PDM2_L                         (0x1 << 7)
+#define RT5677_M_PDM2_L_SFT                     7
+#define RT5677_SEL_PDM2_L_MASK                  (0x3 << 4)
+#define RT5677_SEL_PDM2_L_SFT                   4
+#define RT5677_M_PDM2_R                         (0x1 << 3)
+#define RT5677_M_PDM2_R_SFT                     3
+#define RT5677_SEL_PDM2_R_MASK                  (0x3 << 0)
+#define RT5677_SEL_PDM2_R_SFT                   0
+/* PDM I2C / Data Control 1 (0x32) */
+#define RT5677_PDM2_PW_DOWN                     (0x1 << 7)
+#define RT5677_PDM1_PW_DOWN                     (0x1 << 6)
+#define RT5677_PDM2_BUSY                        (0x1 << 5)
+#define RT5677_PDM1_BUSY                        (0x1 << 4)
+#define RT5677_PDM_PATTERN                      (0x1 << 3)
+#define RT5677_PDM_GAIN                         (0x1 << 2)
+#define RT5677_PDM_DIV_MASK                     (0x3 << 0)
+/* PDM I2C / Data Control 2 (0x33) */
+#define RT5677_PDM1_I2C_ID                      (0xf << 12)
+#define RT5677_PDM1_EXE                         (0x1 << 11)
+#define RT5677_PDM1_I2C_CMD                     (0x1 << 10)
+#define RT5677_PDM1_I2C_EXE                     (0x1 << 9)
+#define RT5677_PDM1_I2C_BUSY                    (0x1 << 8)
+#define RT5677_PDM2_I2C_ID                      (0xf << 4)
+#define RT5677_PDM2_EXE                         (0x1 << 3)
+#define RT5677_PDM2_I2C_CMD                     (0x1 << 2)
+#define RT5677_PDM2_I2C_EXE                     (0x1 << 1)
+#define RT5677_PDM2_I2C_BUSY                    (0x1 << 0)
+/* MX3C TDM1 control 1 (0x3c) */
+#define RT5677_IF1_ADC4_MASK                    (0x3 << 10)
+#define RT5677_IF1_ADC4_SFT                     10
+#define RT5677_IF1_ADC3_MASK                    (0x3 << 8)
+#define RT5677_IF1_ADC3_SFT                     8
+#define RT5677_IF1_ADC2_MASK                    (0x3 << 6)
+#define RT5677_IF1_ADC2_SFT                     6
+#define RT5677_IF1_ADC1_MASK                    (0x3 << 4)
+#define RT5677_IF1_ADC1_SFT                     4
+/* MX41 TDM2 control 1 (0x41) */
+#define RT5677_IF2_ADC4_MASK                    (0x3 << 10)
+#define RT5677_IF2_ADC4_SFT                     10
+#define RT5677_IF2_ADC3_MASK                    (0x3 << 8)
+#define RT5677_IF2_ADC3_SFT                     8
+#define RT5677_IF2_ADC2_MASK                    (0x3 << 6)
+#define RT5677_IF2_ADC2_SFT                     6
+#define RT5677_IF2_ADC1_MASK                    (0x3 << 4)
+#define RT5677_IF2_ADC1_SFT                     4
+/* Digital Microphone Control 1 (0x50) */
+#define RT5677_DMIC_1_EN_MASK                   (0x1 << 15)
+#define RT5677_DMIC_1_EN_SFT                    15
+#define RT5677_DMIC_1_DIS                       (0x0 << 15)
+#define RT5677_DMIC_1_EN                        (0x1 << 15)
+#define RT5677_DMIC_2_EN_MASK                   (0x1 << 14)
+#define RT5677_DMIC_2_EN_SFT                    14
+#define RT5677_DMIC_2_DIS                       (0x0 << 14)
+#define RT5677_DMIC_2_EN                        (0x1 << 14)
+#define RT5677_DMIC_L_STO1_LH_MASK              (0x1 << 13)
+#define RT5677_DMIC_L_STO1_LH_SFT               13
+#define RT5677_DMIC_L_STO1_LH_FALLING           (0x0 << 13)
+#define RT5677_DMIC_L_STO1_LH_RISING            (0x1 << 13)
+#define RT5677_DMIC_R_STO1_LH_MASK              (0x1 << 12)
+#define RT5677_DMIC_R_STO1_LH_SFT               12
+#define RT5677_DMIC_R_STO1_LH_FALLING           (0x0 << 12)
+#define RT5677_DMIC_R_STO1_LH_RISING            (0x1 << 12)
+#define RT5677_DMIC_L_STO3_LH_MASK              (0x1 << 11)
+#define RT5677_DMIC_L_STO3_LH_SFT               11
+#define RT5677_DMIC_L_STO3_LH_FALLING           (0x0 << 11)
+#define RT5677_DMIC_L_STO3_LH_RISING            (0x1 << 11)
+#define RT5677_DMIC_R_STO3_LH_MASK              (0x1 << 10)
+#define RT5677_DMIC_R_STO3_LH_SFT               10
+#define RT5677_DMIC_R_STO3_LH_FALLING           (0x0 << 10)
+#define RT5677_DMIC_R_STO3_LH_RISING            (0x1 << 10)
+#define RT5677_DMIC_L_STO2_LH_MASK              (0x1 << 9)
+#define RT5677_DMIC_L_STO2_LH_SFT               9
+#define RT5677_DMIC_L_STO2_LH_FALLING           (0x0 << 9)
+#define RT5677_DMIC_L_STO2_LH_RISING            (0x1 << 9)
+#define RT5677_DMIC_R_STO2_LH_MASK              (0x1 << 8)
+#define RT5677_DMIC_R_STO2_LH_SFT               8
+#define RT5677_DMIC_R_STO2_LH_FALLING           (0x0 << 8)
+#define RT5677_DMIC_R_STO2_LH_RISING            (0x1 << 8)
+#define RT5677_DMIC_CLK_MASK                    (0x7 << 5)
+#define RT5677_DMIC_CLK_SFT                     5
+#define RT5677_DMIC_3_EN_MASK                   (0x1 << 4)
+#define RT5677_DMIC_3_EN_SFT                    4
+#define RT5677_DMIC_3_DIS                       (0x0 << 4)
+#define RT5677_DMIC_3_EN                        (0x1 << 4)
+#define RT5677_DMIC_R_MONO_LH_MASK              (0x1 << 2)
+#define RT5677_DMIC_R_MONO_LH_SFT               2
+#define RT5677_DMIC_R_MONO_LH_FALLING           (0x0 << 2)
+#define RT5677_DMIC_R_MONO_LH_RISING            (0x1 << 2)
+#define RT5677_DMIC_L_STO4_LH_MASK              (0x1 << 1)
+#define RT5677_DMIC_L_STO4_LH_SFT               1
+#define RT5677_DMIC_L_STO4_LH_FALLING           (0x0 << 1)
+#define RT5677_DMIC_L_STO4_LH_RISING            (0x1 << 1)
+#define RT5677_DMIC_R_STO4_LH_MASK              (0x1 << 0)
+#define RT5677_DMIC_R_STO4_LH_SFT               0
+#define RT5677_DMIC_R_STO4_LH_FALLING           (0x0 << 0)
+#define RT5677_DMIC_R_STO4_LH_RISING            (0x1 << 0)
+/* Digital Microphone Control 2 (0x51) */
+#define RT5677_DMIC_4_EN_MASK                   (0x1 << 15)
+#define RT5677_DMIC_4_EN_SFT                    15
+#define RT5677_DMIC_4_DIS                       (0x0 << 15)
+#define RT5677_DMIC_4_EN                        (0x1 << 15)
+#define RT5677_DMIC_4L_LH_MASK                  (0x1 << 7)
+#define RT5677_DMIC_4L_LH_SFT                   7
+#define RT5677_DMIC_4L_LH_FALLING               (0x0 << 7)
+#define RT5677_DMIC_4L_LH_RISING                (0x1 << 7)
+#define RT5677_DMIC_4R_LH_MASK                  (0x1 << 6)
+#define RT5677_DMIC_4R_LH_SFT                   6
+#define RT5677_DMIC_4R_LH_FALLING               (0x0 << 6)
+#define RT5677_DMIC_4R_LH_RISING                (0x1 << 6)
+#define RT5677_DMIC_3L_LH_MASK                  (0x1 << 5)
+#define RT5677_DMIC_3L_LH_SFT                   5
+#define RT5677_DMIC_3L_LH_FALLING               (0x0 << 5)
+#define RT5677_DMIC_3L_LH_RISING                (0x1 << 5)
+#define RT5677_DMIC_3R_LH_MASK                  (0x1 << 4)
+#define RT5677_DMIC_3R_LH_SFT                   4
+#define RT5677_DMIC_3R_LH_FALLING               (0x0 << 4)
+#define RT5677_DMIC_3R_LH_RISING                (0x1 << 4)
+#define RT5677_DMIC_2L_LH_MASK                  (0x1 << 3)
+#define RT5677_DMIC_2L_LH_SFT                   3
+#define RT5677_DMIC_2L_LH_FALLING               (0x0 << 3)
+#define RT5677_DMIC_2L_LH_RISING                (0x1 << 3)
+#define RT5677_DMIC_2R_LH_MASK                  (0x1 << 2)
+#define RT5677_DMIC_2R_LH_SFT                   2
+#define RT5677_DMIC_2R_LH_FALLING               (0x0 << 2)
+#define RT5677_DMIC_2R_LH_RISING                (0x1 << 2)
+#define RT5677_DMIC_1L_LH_MASK                  (0x1 << 1)
+#define RT5677_DMIC_1L_LH_SFT                   1
+#define RT5677_DMIC_1L_LH_FALLING               (0x0 << 1)
+#define RT5677_DMIC_1L_LH_RISING                (0x1 << 1)
+#define RT5677_DMIC_1R_LH_MASK                  (0x1 << 0)
+#define RT5677_DMIC_1R_LH_SFT                   0
+#define RT5677_DMIC_1R_LH_FALLING               (0x0 << 0)
+#define RT5677_DMIC_1R_LH_RISING                (0x1 << 0)
+/* Power Management for Digital 1 (0x61) */
+#define RT5677_PWR_I2S1                         (0x1 << 15)
+#define RT5677_PWR_I2S1_BIT                     15
+#define RT5677_PWR_I2S2                         (0x1 << 14)
+#define RT5677_PWR_I2S2_BIT                     14
+#define RT5677_PWR_I2S3                         (0x1 << 13)
+#define RT5677_PWR_I2S3_BIT                     13
+#define RT5677_PWR_DAC1                         (0x1 << 12)
+#define RT5677_PWR_DAC1_BIT                     12
+#define RT5677_PWR_DAC2                         (0x1 << 11)
+#define RT5677_PWR_DAC2_BIT                     11
+#define RT5677_PWR_I2S4                         (0x1 << 10)
+#define RT5677_PWR_I2S4_BIT                     10
+#define RT5677_PWR_SLB                          (0x1 << 9)
+#define RT5677_PWR_SLB_BIT                      9
+#define RT5677_PWR_DAC3                         (0x1 << 7)
+#define RT5677_PWR_DAC3_BIT                     7
+#define RT5677_PWR_ADCFED2                      (0x1 << 4)
+#define RT5677_PWR_ADCFED2_BIT                  4
+#define RT5677_PWR_ADCFED1                      (0x1 << 3)
+#define RT5677_PWR_ADCFED1_BIT                  3
+#define RT5677_PWR_ADC_L                        (0x1 << 2)
+#define RT5677_PWR_ADC_L_BIT                    2
+#define RT5677_PWR_ADC_R                        (0x1 << 1)
+#define RT5677_PWR_ADC_R_BIT                    1
+#define RT5677_PWR_I2C_MASTER                   (0x1 << 0)
+#define RT5677_PWR_I2C_MASTER_BIT               0
+/* Power Management for Digital 2 (0x62) */
+#define RT5677_PWR_ADC_S1F                      (0x1 << 15)
+#define RT5677_PWR_ADC_S1F_BIT                  15
+#define RT5677_PWR_ADC_MF_L                     (0x1 << 14)
+#define RT5677_PWR_ADC_MF_L_BIT                 14
+#define RT5677_PWR_ADC_MF_R                     (0x1 << 13)
+#define RT5677_PWR_ADC_MF_R_BIT                 13
+#define RT5677_PWR_DAC_S1F                      (0x1 << 12)
+#define RT5677_PWR_DAC_S1F_BIT                  12
+#define RT5677_PWR_DAC_M2F_L                    (0x1 << 11)
+#define RT5677_PWR_DAC_M2F_L_BIT                11
+#define RT5677_PWR_DAC_M2F_R                    (0x1 << 10)
+#define RT5677_PWR_DAC_M2F_R_BIT                10
+#define RT5677_PWR_DAC_M3F_L                    (0x1 << 9)
+#define RT5677_PWR_DAC_M3F_L_BIT                9
+#define RT5677_PWR_DAC_M3F_R                    (0x1 << 8)
+#define RT5677_PWR_DAC_M3F_R_BIT                8
+#define RT5677_PWR_DAC_M4F_L                    (0x1 << 7)
+#define RT5677_PWR_DAC_M4F_L_BIT                7
+#define RT5677_PWR_DAC_M4F_R                    (0x1 << 6)
+#define RT5677_PWR_DAC_M4F_R_BIT                6
+#define RT5677_PWR_ADC_S2F                      (0x1 << 5)
+#define RT5677_PWR_ADC_S2F_BIT                  5
+#define RT5677_PWR_ADC_S3F                      (0x1 << 4)
+#define RT5677_PWR_ADC_S3F_BIT                  4
+#define RT5677_PWR_ADC_S4F                      (0x1 << 3)
+#define RT5677_PWR_ADC_S4F_BIT                  3
+#define RT5677_PWR_PDM1                         (0x1 << 2)
+#define RT5677_PWR_PDM1_BIT                     2
+#define RT5677_PWR_PDM2                         (0x1 << 1)
+#define RT5677_PWR_PDM2_BIT                     1
+/* Power Management for Analog 1 (0x63) */
+#define RT5677_PWR_VREF1                        (0x1 << 15)
+#define RT5677_PWR_VREF1_BIT                    15
+#define RT5677_PWR_FV1                          (0x1 << 14)
+#define RT5677_PWR_FV1_BIT                      14
+#define RT5677_PWR_MB                           (0x1 << 13)
+#define RT5677_PWR_MB_BIT                       13
+#define RT5677_PWR_LO1                          (0x1 << 12)
+#define RT5677_PWR_LO1_BIT                      12
+#define RT5677_PWR_BG                           (0x1 << 11)
+#define RT5677_PWR_BG_BIT                       11
+#define RT5677_PWR_LO2                          (0x1 << 10)
+#define RT5677_PWR_LO2_BIT                      10
+#define RT5677_PWR_LO3                          (0x1 << 9)
+#define RT5677_PWR_LO3_BIT                      9
+#define RT5677_PWR_VREF2                        (0x1 << 8)
+#define RT5677_PWR_VREF2_BIT                    8
+#define RT5677_PWR_FV2                          (0x1 << 7)
+#define RT5677_PWR_FV2_BIT                      7
+#define RT5677_LDO2_SEL_MASK                    (0x7 << 4)
+#define RT5677_LDO2_SEL_SFT                     4
+#define RT5677_LDO1_SEL_MASK                    (0x7 << 0)
+#define RT5677_LDO1_SEL_SFT                     0
+/* Power Management for Analog 2 (0x64) */
+#define RT5677_PWR_BST1                         (0x1 << 15)
+#define RT5677_PWR_BST1_BIT                     15
+#define RT5677_PWR_BST2                         (0x1 << 14)
+#define RT5677_PWR_BST2_BIT                     14
+#define RT5677_PWR_CLK_MB1                      (0x1 << 13)
+#define RT5677_PWR_CLK_MB1_BIT                  13
+#define RT5677_PWR_SLIM                         (0x1 << 12)
+#define RT5677_PWR_SLIM_BIT                     12
+#define RT5677_PWR_MB1                          (0x1 << 11)
+#define RT5677_PWR_MB1_BIT                      11
+#define RT5677_PWR_PP_MB1                       (0x1 << 10)
+#define RT5677_PWR_PP_MB1_BIT                   10
+#define RT5677_PWR_PLL1                         (0x1 << 9)
+#define RT5677_PWR_PLL1_BIT                     9
+#define RT5677_PWR_PLL2                         (0x1 << 8)
+#define RT5677_PWR_PLL2_BIT                     8
+#define RT5677_PWR_CORE                         (0x1 << 7)
+#define RT5677_PWR_CORE_BIT                     7
+#define RT5677_PWR_CLK_MB                       (0x1 << 6)
+#define RT5677_PWR_CLK_MB_BIT                   6
+#define RT5677_PWR_BST1_P                       (0x1 << 5)
+#define RT5677_PWR_BST1_P_BIT                   5
+#define RT5677_PWR_BST2_P                       (0x1 << 4)
+#define RT5677_PWR_BST2_P_BIT                   4
+#define RT5677_PWR_IPTV                         (0x1 << 3)
+#define RT5677_PWR_IPTV_BIT                     3
+#define RT5677_PWR_25M_CLK                      (0x1 << 1)
+#define RT5677_PWR_25M_CLK_BIT                  1
+#define RT5677_PWR_LDO1                         (0x1 << 0)
+#define RT5677_PWR_LDO1_BIT                     0
+/* Power Management for DSP (0x65) */
+#define RT5677_PWR_SR7                          (0x1 << 10)
+#define RT5677_PWR_SR7_BIT                      10
+#define RT5677_PWR_SR6                          (0x1 << 9)
+#define RT5677_PWR_SR6_BIT                      9
+#define RT5677_PWR_SR5                          (0x1 << 8)
+#define RT5677_PWR_SR5_BIT                      8
+#define RT5677_PWR_SR4                          (0x1 << 7)
+#define RT5677_PWR_SR4_BIT                      7
+#define RT5677_PWR_SR3                          (0x1 << 6)
+#define RT5677_PWR_SR3_BIT                      6
+#define RT5677_PWR_SR2                          (0x1 << 5)
+#define RT5677_PWR_SR2_BIT                      5
+#define RT5677_PWR_SR1                          (0x1 << 4)
+#define RT5677_PWR_SR1_BIT                      4
+#define RT5677_PWR_SR0                          (0x1 << 3)
+#define RT5677_PWR_SR0_BIT                      3
+#define RT5677_PWR_MLT                          (0x1 << 2)
+#define RT5677_PWR_MLT_BIT                      2
+#define RT5677_PWR_DSP                          (0x1 << 1)
+#define RT5677_PWR_DSP_BIT                      1
+#define RT5677_PWR_DSP_CPU                      (0x1 << 0)
+#define RT5677_PWR_DSP_CPU_BIT                  0
+/* Power Status for DSP (0x66) */
+#define RT5677_PWR_SR7_RDY                      (0x1 << 9)
+#define RT5677_PWR_SR7_RDY_BIT                  9
+#define RT5677_PWR_SR6_RDY                      (0x1 << 8)
+#define RT5677_PWR_SR6_RDY_BIT                  8
+#define RT5677_PWR_SR5_RDY                      (0x1 << 7)
+#define RT5677_PWR_SR5_RDY_BIT                  7
+#define RT5677_PWR_SR4_RDY                      (0x1 << 6)
+#define RT5677_PWR_SR4_RDY_BIT                  6
+#define RT5677_PWR_SR3_RDY                      (0x1 << 5)
+#define RT5677_PWR_SR3_RDY_BIT                  5
+#define RT5677_PWR_SR2_RDY                      (0x1 << 4)
+#define RT5677_PWR_SR2_RDY_BIT                  4
+#define RT5677_PWR_SR1_RDY                      (0x1 << 3)
+#define RT5677_PWR_SR1_RDY_BIT                  3
+#define RT5677_PWR_SR0_RDY                      (0x1 << 2)
+#define RT5677_PWR_SR0_RDY_BIT                  2
+#define RT5677_PWR_MLT_RDY                      (0x1 << 1)
+#define RT5677_PWR_MLT_RDY_BIT                  1
+#define RT5677_PWR_DSP_RDY                      (0x1 << 0)
+#define RT5677_PWR_DSP_RDY_BIT                  0
+/* Power Management for DSP (0x67) */
+#define RT5677_PWR_SLIM_ISO                     (0x1 << 11)
+#define RT5677_PWR_SLIM_ISO_BIT                 11
+#define RT5677_PWR_CORE_ISO                     (0x1 << 10)
+#define RT5677_PWR_CORE_ISO_BIT                 10
+#define RT5677_PWR_DSP_ISO                      (0x1 << 9)
+#define RT5677_PWR_DSP_ISO_BIT                  9
+#define RT5677_PWR_SR7_ISO                      (0x1 << 8)
+#define RT5677_PWR_SR7_ISO_BIT                  8
+#define RT5677_PWR_SR6_ISO                      (0x1 << 7)
+#define RT5677_PWR_SR6_ISO_BIT                  7
+#define RT5677_PWR_SR5_ISO                      (0x1 << 6)
+#define RT5677_PWR_SR5_ISO_BIT                  6
+#define RT5677_PWR_SR4_ISO                      (0x1 << 5)
+#define RT5677_PWR_SR4_ISO_BIT                  5
+#define RT5677_PWR_SR3_ISO                      (0x1 << 4)
+#define RT5677_PWR_SR3_ISO_BIT                  4
+#define RT5677_PWR_SR2_ISO                      (0x1 << 3)
+#define RT5677_PWR_SR2_ISO_BIT                  3
+#define RT5677_PWR_SR1_ISO                      (0x1 << 2)
+#define RT5677_PWR_SR1_ISO_BIT                  2
+#define RT5677_PWR_SR0_ISO                      (0x1 << 1)
+#define RT5677_PWR_SR0_ISO_BIT                  1
+#define RT5677_PWR_MLT_ISO                      (0x1 << 0)
+#define RT5677_PWR_MLT_ISO_BIT                  0
+/* I2S1/2/3/4 Audio Serial Data Port Control (0x6f 0x70 0x71 0x72) */
+#define RT5677_I2S_MS_MASK                      (0x1 << 15)
+#define RT5677_I2S_MS_SFT                       15
+#define RT5677_I2S_MS_M                         (0x0 << 15)
+#define RT5677_I2S_MS_S                         (0x1 << 15)
+#define RT5677_I2S_O_CP_MASK                    (0x3 << 10)
+#define RT5677_I2S_O_CP_SFT                     10
+#define RT5677_I2S_O_CP_OFF                     (0x0 << 10)
+#define RT5677_I2S_O_CP_U_LAW                   (0x1 << 10)
+#define RT5677_I2S_O_CP_A_LAW                   (0x2 << 10)
+#define RT5677_I2S_I_CP_MASK                    (0x3 << 8)
+#define RT5677_I2S_I_CP_SFT                     8
+#define RT5677_I2S_I_CP_OFF                     (0x0 << 8)
+#define RT5677_I2S_I_CP_U_LAW                   (0x1 << 8)
+#define RT5677_I2S_I_CP_A_LAW                   (0x2 << 8)
+#define RT5677_I2S_BP_MASK                      (0x1 << 7)
+#define RT5677_I2S_BP_SFT                       7
+#define RT5677_I2S_BP_NOR                       (0x0 << 7)
+#define RT5677_I2S_BP_INV                       (0x1 << 7)
+#define RT5677_I2S_DL_MASK                      (0x3 << 2)
+#define RT5677_I2S_DL_SFT                       2
+#define RT5677_I2S_DL_16                        (0x0 << 2)
+#define RT5677_I2S_DL_20                        (0x1 << 2)
+#define RT5677_I2S_DL_24                        (0x2 << 2)
+#define RT5677_I2S_DL_8                         (0x3 << 2)
+#define RT5677_I2S_DF_MASK                      (0x3 << 0)
+#define RT5677_I2S_DF_SFT                       0
+#define RT5677_I2S_DF_I2S                       (0x0 << 0)
+#define RT5677_I2S_DF_LEFT                      (0x1 << 0)
+#define RT5677_I2S_DF_PCM_A                     (0x2 << 0)
+#define RT5677_I2S_DF_PCM_B                     (0x3 << 0)
+/* Clock Tree Control 1 (0x73) */
+#define RT5677_I2S_PD1_MASK                     (0x7 << 12)
+#define RT5677_I2S_PD1_SFT                      12
+#define RT5677_I2S_PD1_1                        (0x0 << 12)
+#define RT5677_I2S_PD1_2                        (0x1 << 12)
+#define RT5677_I2S_PD1_3                        (0x2 << 12)
+#define RT5677_I2S_PD1_4                        (0x3 << 12)
+#define RT5677_I2S_PD1_6                        (0x4 << 12)
+#define RT5677_I2S_PD1_8                        (0x5 << 12)
+#define RT5677_I2S_PD1_12                       (0x6 << 12)
+#define RT5677_I2S_PD1_16                       (0x7 << 12)
+#define RT5677_I2S_BCLK_MS2_MASK                (0x1 << 11)
+#define RT5677_I2S_BCLK_MS2_SFT                 11
+#define RT5677_I2S_BCLK_MS2_32                  (0x0 << 11)
+#define RT5677_I2S_BCLK_MS2_64                  (0x1 << 11)
+#define RT5677_I2S_PD2_MASK                     (0x7 << 8)
+#define RT5677_I2S_PD2_SFT                      8
+#define RT5677_I2S_PD2_1                        (0x0 << 8)
+#define RT5677_I2S_PD2_2                        (0x1 << 8)
+#define RT5677_I2S_PD2_3                        (0x2 << 8)
+#define RT5677_I2S_PD2_4                        (0x3 << 8)
+#define RT5677_I2S_PD2_6                        (0x4 << 8)
+#define RT5677_I2S_PD2_8                        (0x5 << 8)
+#define RT5677_I2S_PD2_12                       (0x6 << 8)
+#define RT5677_I2S_PD2_16                       (0x7 << 8)
+#define RT5677_I2S_BCLK_MS3_MASK                (0x1 << 7)
+#define RT5677_I2S_BCLK_MS3_SFT                 7
+#define RT5677_I2S_BCLK_MS3_32                  (0x0 << 7)
+#define RT5677_I2S_BCLK_MS3_64                  (0x1 << 7)
+#define RT5677_I2S_PD3_MASK                     (0x7 << 4)
+#define RT5677_I2S_PD3_SFT                      4
+#define RT5677_I2S_PD3_1                        (0x0 << 4)
+#define RT5677_I2S_PD3_2                        (0x1 << 4)
+#define RT5677_I2S_PD3_3                        (0x2 << 4)
+#define RT5677_I2S_PD3_4                        (0x3 << 4)
+#define RT5677_I2S_PD3_6                        (0x4 << 4)
+#define RT5677_I2S_PD3_8                        (0x5 << 4)
+#define RT5677_I2S_PD3_12                       (0x6 << 4)
+#define RT5677_I2S_PD3_16                       (0x7 << 4)
+#define RT5677_I2S_BCLK_MS4_MASK                (0x1 << 3)
+#define RT5677_I2S_BCLK_MS4_SFT                 3
+#define RT5677_I2S_BCLK_MS4_32                  (0x0 << 3)
+#define RT5677_I2S_BCLK_MS4_64                  (0x1 << 3)
+#define RT5677_I2S_PD4_MASK                     (0x7 << 0)
+#define RT5677_I2S_PD4_SFT                      0
+#define RT5677_I2S_PD4_1                        (0x0 << 0)
+#define RT5677_I2S_PD4_2                        (0x1 << 0)
+#define RT5677_I2S_PD4_3                        (0x2 << 0)
+#define RT5677_I2S_PD4_4                        (0x3 << 0)
+#define RT5677_I2S_PD4_6                        (0x4 << 0)
+#define RT5677_I2S_PD4_8                        (0x5 << 0)
+#define RT5677_I2S_PD4_12                       (0x6 << 0)
+#define RT5677_I2S_PD4_16                       (0x7 << 0)
+/* Clock Tree Control 2 (0x74) */
+#define RT5677_I2S_PD5_MASK                     (0x7 << 12)
+#define RT5677_I2S_PD5_SFT                      12
+#define RT5677_I2S_PD5_1                        (0x0 << 12)
+#define RT5677_I2S_PD5_2                        (0x1 << 12)
+#define RT5677_I2S_PD5_3                        (0x2 << 12)
+#define RT5677_I2S_PD5_4                        (0x3 << 12)
+#define RT5677_I2S_PD5_6                        (0x4 << 12)
+#define RT5677_I2S_PD5_8                        (0x5 << 12)
+#define RT5677_I2S_PD5_12                       (0x6 << 12)
+#define RT5677_I2S_PD5_16                       (0x7 << 12)
+#define RT5677_I2S_PD6_MASK                     (0x7 << 8)
+#define RT5677_I2S_PD6_SFT                      8
+#define RT5677_I2S_PD6_1                        (0x0 << 8)
+#define RT5677_I2S_PD6_2                        (0x1 << 8)
+#define RT5677_I2S_PD6_3                        (0x2 << 8)
+#define RT5677_I2S_PD6_4                        (0x3 << 8)
+#define RT5677_I2S_PD6_6                        (0x4 << 8)
+#define RT5677_I2S_PD6_8                        (0x5 << 8)
+#define RT5677_I2S_PD6_12                       (0x6 << 8)
+#define RT5677_I2S_PD6_16                       (0x7 << 8)
+#define RT5677_I2S_PD7_MASK                     (0x7 << 4)
+#define RT5677_I2S_PD7_SFT                      4
+#define RT5677_I2S_PD7_1                        (0x0 << 4)
+#define RT5677_I2S_PD7_2                        (0x1 << 4)
+#define RT5677_I2S_PD7_3                        (0x2 << 4)
+#define RT5677_I2S_PD7_4                        (0x3 << 4)
+#define RT5677_I2S_PD7_6                        (0x4 << 4)
+#define RT5677_I2S_PD7_8                        (0x5 << 4)
+#define RT5677_I2S_PD7_12                       (0x6 << 4)
+#define RT5677_I2S_PD7_16                       (0x7 << 4)
+#define RT5677_I2S_PD8_MASK                     (0x7 << 0)
+#define RT5677_I2S_PD8_SFT                      0
+#define RT5677_I2S_PD8_1                        (0x0 << 0)
+#define RT5677_I2S_PD8_2                        (0x1 << 0)
+#define RT5677_I2S_PD8_3                        (0x2 << 0)
+#define RT5677_I2S_PD8_4                        (0x3 << 0)
+#define RT5677_I2S_PD8_6                        (0x4 << 0)
+#define RT5677_I2S_PD8_8                        (0x5 << 0)
+#define RT5677_I2S_PD8_12                       (0x6 << 0)
+#define RT5677_I2S_PD8_16                       (0x7 << 0)
+/* Clock Tree Control 3 (0x75) */
+#define RT5677_DSP_ASRC_O_MASK                  (0x3 << 6)
+#define RT5677_DSP_ASRC_O_SFT                   6
+#define RT5677_DSP_ASRC_O_1_0                   (0x0 << 6)
+#define RT5677_DSP_ASRC_O_1_5                   (0x1 << 6)
+#define RT5677_DSP_ASRC_O_2_0                   (0x2 << 6)
+#define RT5677_DSP_ASRC_O_3_0                   (0x3 << 6)
+#define RT5677_DSP_ASRC_I_MASK                  (0x3 << 4)
+#define RT5677_DSP_ASRC_I_SFT                   4
+#define RT5677_DSP_ASRC_I_1_0                   (0x0 << 4)
+#define RT5677_DSP_ASRC_I_1_5                   (0x1 << 4)
+#define RT5677_DSP_ASRC_I_2_0                   (0x2 << 4)
+#define RT5677_DSP_ASRC_I_3_0                   (0x3 << 4)
+#define RT5677_DSP_BUS_PD_MASK                  (0x7 << 0)
+#define RT5677_DSP_BUS_PD_SFT                   0
+#define RT5677_DSP_BUS_PD_1                     (0x0 << 0)
+#define RT5677_DSP_BUS_PD_2                     (0x1 << 0)
+#define RT5677_DSP_BUS_PD_3                     (0x2 << 0)
+#define RT5677_DSP_BUS_PD_4                     (0x3 << 0)
+#define RT5677_DSP_BUS_PD_6                     (0x4 << 0)
+#define RT5677_DSP_BUS_PD_8                     (0x5 << 0)
+#define RT5677_DSP_BUS_PD_12                    (0x6 << 0)
+#define RT5677_DSP_BUS_PD_16                    (0x7 << 0)
+#define RT5677_PLL_INP_MAX                      40000000
+#define RT5677_PLL_INP_MIN                      2048000
+/* PLL M/N/K Code Control 1 (0x7a 0x7c) */
+#define RT5677_PLL_N_MAX                        0x1ff
+#define RT5677_PLL_N_MASK                       (RT5677_PLL_N_MAX << 7)
+#define RT5677_PLL_N_SFT                        7
+#define RT5677_PLL_K_BP                         (0x1 << 5)
+#define RT5677_PLL_K_BP_SFT                     5
+#define RT5677_PLL_K_MAX                        0x1f
+#define RT5677_PLL_K_MASK                       (RT5677_PLL_K_MAX)
+#define RT5677_PLL_K_SFT                        0
+/* PLL M/N/K Code Control 2 (0x7b 0x7d) */
+#define RT5677_PLL_M_MAX                        0xf
+#define RT5677_PLL_M_MASK                       (RT5677_PLL_M_MAX << 12)
+#define RT5677_PLL_M_SFT                        12
+#define RT5677_PLL_M_BP                         (0x1 << 11)
+#define RT5677_PLL_M_BP_SFT                     11
+/* Global Clock Control 1 (0x80) */
+#define RT5677_SCLK_SRC_MASK                    (0x3 << 14)
+#define RT5677_SCLK_SRC_SFT                     14
+#define RT5677_SCLK_SRC_MCLK                    (0x0 << 14)
+#define RT5677_SCLK_SRC_PLL1                    (0x1 << 14)
+#define RT5677_SCLK_SRC_RCCLK                   (0x2 << 14) /* 25MHz */
+#define RT5677_SCLK_SRC_SLIM                    (0x3 << 14)
+#define RT5677_PLL1_SRC_MASK                    (0x7 << 11)
+#define RT5677_PLL1_SRC_SFT                     11
+#define RT5677_PLL1_SRC_MCLK                    (0x0 << 11)
+#define RT5677_PLL1_SRC_BCLK1                   (0x1 << 11)
+#define RT5677_PLL1_SRC_BCLK2                   (0x2 << 11)
+#define RT5677_PLL1_SRC_BCLK3                   (0x3 << 11)
+#define RT5677_PLL1_SRC_BCLK4                   (0x4 << 11)
+#define RT5677_PLL1_SRC_RCCLK                   (0x5 << 11)
+#define RT5677_PLL1_SRC_SLIM                    (0x6 << 11)
+#define RT5677_MCLK_SRC_MASK                    (0x1 << 10)
+#define RT5677_MCLK_SRC_SFT                     10
+#define RT5677_MCLK1_SRC                        (0x0 << 10)
+#define RT5677_MCLK2_SRC                        (0x1 << 10)
+#define RT5677_PLL1_PD_MASK                     (0x1 << 8)
+#define RT5677_PLL1_PD_SFT                      8
+#define RT5677_PLL1_PD_1                        (0x0 << 8)
+#define RT5677_PLL1_PD_2                        (0x1 << 8)
+#define RT5671_DAC_OSR_MASK                     (0x3 << 6)
+#define RT5671_DAC_OSR_SFT                      6
+#define RT5671_DAC_OSR_128                      (0x0 << 6)
+#define RT5671_DAC_OSR_64                       (0x1 << 6)
+#define RT5671_DAC_OSR_32                       (0x2 << 6)
+#define RT5671_ADC_OSR_MASK                     (0x3 << 4)
+#define RT5671_ADC_OSR_SFT                      4
+#define RT5671_ADC_OSR_128                      (0x0 << 4)
+#define RT5671_ADC_OSR_64                       (0x1 << 4)
+#define RT5671_ADC_OSR_32                       (0x2 << 4)
+/* Global Clock Control 2 (0x81) */
+#define RT5677_PLL2_PR_SRC_MASK                 (0x1 << 15)
+#define RT5677_PLL2_PR_SRC_SFT                  15
+#define RT5677_PLL2_PR_SRC_MCLK1                (0x0 << 15)
+#define RT5677_PLL2_PR_SRC_MCLK2                (0x1 << 15)
+#define RT5677_PLL2_SRC_MASK                    (0x7 << 12)
+#define RT5677_PLL2_SRC_SFT                     12
+#define RT5677_PLL2_SRC_MCLK                    (0x0 << 12)
+#define RT5677_PLL2_SRC_BCLK1                   (0x1 << 12)
+#define RT5677_PLL2_SRC_BCLK2                   (0x2 << 12)
+#define RT5677_PLL2_SRC_BCLK3                   (0x3 << 12)
+#define RT5677_PLL2_SRC_BCLK4                   (0x4 << 12)
+#define RT5677_PLL2_SRC_RCCLK                   (0x5 << 12)
+#define RT5677_PLL2_SRC_SLIM                    (0x6 << 12)
+#define RT5671_DSP_ASRC_O_SRC                   (0x3 << 10)
+#define RT5671_DSP_ASRC_O_SRC_SFT               10
+#define RT5671_DSP_ASRC_O_MCLK                  (0x0 << 10)
+#define RT5671_DSP_ASRC_O_PLL1                  (0x1 << 10)
+#define RT5671_DSP_ASRC_O_SLIM                  (0x2 << 10)
+#define RT5671_DSP_ASRC_O_RCCLK                 (0x3 << 10)
+#define RT5671_DSP_ASRC_I_SRC                   (0x3 << 8)
+#define RT5671_DSP_ASRC_I_SRC_SFT               8
+#define RT5671_DSP_ASRC_I_MCLK                  (0x0 << 8)
+#define RT5671_DSP_ASRC_I_PLL1                  (0x1 << 8)
+#define RT5671_DSP_ASRC_I_SLIM                  (0x2 << 8)
+#define RT5671_DSP_ASRC_I_RCCLK                 (0x3 << 8)
+#define RT5677_DSP_CLK_SRC_MASK                 (0x1 << 7)
+#define RT5677_DSP_CLK_SRC_SFT                  7
+#define RT5677_DSP_CLK_SRC_PLL2                 (0x0 << 7)
+#define RT5677_DSP_CLK_SRC_BYPASS               (0x1 << 7)
+/* VAD Function Control 4 (0x9f) */
+#define RT5677_VAD_SRC_MASK                     (0x7 << 8)
+#define RT5677_VAD_SRC_SFT                      8
+/* DSP InBound Control (0xa3) */
+#define RT5677_IB01_SRC_MASK                    (0x7 << 12)
+#define RT5677_IB01_SRC_SFT                     12
+#define RT5677_IB23_SRC_MASK                    (0x7 << 8)
+#define RT5677_IB23_SRC_SFT                     8
+#define RT5677_IB45_SRC_MASK                    (0x7 << 4)
+#define RT5677_IB45_SRC_SFT                     4
+#define RT5677_IB6_SRC_MASK                     (0x7 << 0)
+#define RT5677_IB6_SRC_SFT                      0
+/* DSP InBound Control (0xa4) */
+#define RT5677_IB7_SRC_MASK                     (0x7 << 12)
+#define RT5677_IB7_SRC_SFT                      12
+#define RT5677_IB8_SRC_MASK                     (0x7 << 8)
+#define RT5677_IB8_SRC_SFT                      8
+#define RT5677_IB9_SRC_MASK                     (0x7 << 4)
+#define RT5677_IB9_SRC_SFT                      4
+/* DSP In/OutBound Control (0xa5) */
+#define RT5677_SEL_SRC_OB23                     (0x1 << 4)
+#define RT5677_SEL_SRC_OB23_SFT                 4
+#define RT5677_SEL_SRC_OB01                     (0x1 << 3)
+#define RT5677_SEL_SRC_OB01_SFT                 3
+#define RT5677_SEL_SRC_IB45                     (0x1 << 2)
+#define RT5677_SEL_SRC_IB45_SFT                 2
+#define RT5677_SEL_SRC_IB23                     (0x1 << 1)
+#define RT5677_SEL_SRC_IB23_SFT                 1
+#define RT5677_SEL_SRC_IB01                     (0x1 << 0)
+#define RT5677_SEL_SRC_IB01_SFT                 0
+/* Virtual DSP Mixer Control (0xf7 0xf8 0xf9) */
+#define RT5677_DSP_IB_01_H                      (0x1 << 15)
+#define RT5677_DSP_IB_01_H_SFT                  15
+#define RT5677_DSP_IB_23_H                      (0x1 << 14)
+#define RT5677_DSP_IB_23_H_SFT                  14
+#define RT5677_DSP_IB_45_H                      (0x1 << 13)
+#define RT5677_DSP_IB_45_H_SFT                  13
+#define RT5677_DSP_IB_6_H                       (0x1 << 12)
+#define RT5677_DSP_IB_6_H_SFT                   12
+#define RT5677_DSP_IB_7_H                       (0x1 << 11)
+#define RT5677_DSP_IB_7_H_SFT                   11
+#define RT5677_DSP_IB_8_H                       (0x1 << 10)
+#define RT5677_DSP_IB_8_H_SFT                   10
+#define RT5677_DSP_IB_9_H                       (0x1 << 9)
+#define RT5677_DSP_IB_9_H_SFT                   9
+#define RT5677_DSP_IB_01_L                      (0x1 << 7)
+#define RT5677_DSP_IB_01_L_SFT                  7
+#define RT5677_DSP_IB_23_L                      (0x1 << 6)
+#define RT5677_DSP_IB_23_L_SFT                  6
+#define RT5677_DSP_IB_45_L                      (0x1 << 5)
+#define RT5677_DSP_IB_45_L_SFT                  5
+#define RT5677_DSP_IB_6_L                       (0x1 << 4)
+#define RT5677_DSP_IB_6_L_SFT                   4
+#define RT5677_DSP_IB_7_L                       (0x1 << 3)
+#define RT5677_DSP_IB_7_L_SFT                   3
+#define RT5677_DSP_IB_8_L                       (0x1 << 2)
+#define RT5677_DSP_IB_8_L_SFT                   2
+#define RT5677_DSP_IB_9_L                       (0x1 << 1)
+#define RT5677_DSP_IB_9_L_SFT                   1
+/* Debug String Length */
+#define RT5677_REG_DISP_LEN 23
+#define RT5677_NO_JACK          BIT(0)
+#define RT5677_HEADSET_DET      BIT(1)
+#define RT5677_HEADPHO_DET      BIT(2)
+/* System Clock Source */
+enum {
+        RT5677_SCLK_S_MCLK,
+        RT5677_SCLK_S_PLL1,
+        RT5677_SCLK_S_RCCLK,
+};
+/* PLL1 Source */
+enum {
+        RT5677_PLL1_S_MCLK,
+        RT5677_PLL1_S_BCLK1,
+        RT5677_PLL1_S_BCLK2,
+        RT5677_PLL1_S_BCLK3,
+        RT5677_PLL1_S_BCLK4,
+};
+enum {
+        RT5677_AIF1,
+        RT5677_AIF2,
+        RT5677_AIF3,
+        RT5677_AIF4,
+        RT5677_AIF5,
+        RT5677_AIFS,
+};
+struct rt5677_pll_code {
+        bool m_bp; /* Indicates bypass m code or not. */
+        bool k_bp; /* Indicates bypass k code or not. */
+        int m_code;
+        int n_code;
+        int k_code;
+};
+struct rt5677_priv {
+        struct snd_soc_codec *codec;
+        struct rt5677_platform_data pdata;
+        struct regmap *regmap;
+        int sysclk;
+        int sysclk_src;
+        int lrck[RT5677_AIFS];
+        int bclk[RT5677_AIFS];
+        int master[RT5677_AIFS];
+        int pll_src;
+        int pll_in;
+        int pll_out;
+};
+#endif /* __RT5677_H__ */
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 9626ee0417cd..3d39f0b5b4a8 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -36,18 +36,32 @@
 /* default value of sgtl5000 registers */
 static const struct reg_default sgtl5000_reg_defaults[] = {
+        { SGTL5000_CHIP_DIG_POWER,              0x0000 },
        { SGTL5000_CHIP_CLK_CTRL,               0x0008 },
        { SGTL5000_CHIP_I2S_CTRL,               0x0010 },
        { SGTL5000_CHIP_SSS_CTRL,               0x0010 },
+        { SGTL5000_CHIP_ADCDAC_CTRL,            0x020c },
        { SGTL5000_CHIP_DAC_VOL,                0x3c3c },
        { SGTL5000_CHIP_PAD_STRENGTH,           0x015f },
+        { SGTL5000_CHIP_ANA_ADC_CTRL,           0x0000 },
        { SGTL5000_CHIP_ANA_HP_CTRL,            0x1818 },
        { SGTL5000_CHIP_ANA_CTRL,               0x0111 },
+        { SGTL5000_CHIP_LINREG_CTRL,            0x0000 },
+        { SGTL5000_CHIP_REF_CTRL,               0x0000 },
+        { SGTL5000_CHIP_MIC_CTRL,               0x0000 },
+        { SGTL5000_CHIP_LINE_OUT_CTRL,          0x0000 },
        { SGTL5000_CHIP_LINE_OUT_VOL,           0x0404 },
        { SGTL5000_CHIP_ANA_POWER,              0x7060 },
        { SGTL5000_CHIP_PLL_CTRL,               0x5000 },
+        { SGTL5000_CHIP_CLK_TOP_CTRL,           0x0000 },
+        { SGTL5000_CHIP_ANA_STATUS,             0x0000 },
+        { SGTL5000_CHIP_SHORT_CTRL,             0x0000 },
+        { SGTL5000_CHIP_ANA_TEST2,              0x0000 },
+        { SGTL5000_DAP_CTRL,                    0x0000 },
+        { SGTL5000_DAP_PEQ,                     0x0000 },
        { SGTL5000_DAP_BASS_ENHANCE,            0x0040 },
        { SGTL5000_DAP_BASS_ENHANCE_CTRL,       0x051f },
+        { SGTL5000_DAP_AUDIO_EQ,                0x0000 },
        { SGTL5000_DAP_SURROUND,                0x0040 },
        { SGTL5000_DAP_EQ_BASS_BAND0,           0x002f },
        { SGTL5000_DAP_EQ_BASS_BAND1,           0x002f },
@@ -55,6 +69,7 @@ static const struct reg_default sgtl5000_reg_defaults[] = {
        { SGTL5000_DAP_EQ_BASS_BAND3,           0x002f },
        { SGTL5000_DAP_EQ_BASS_BAND4,           0x002f },
        { SGTL5000_DAP_MAIN_CHAN,               0x8000 },
+        { SGTL5000_DAP_MIX_CHAN,                0x0000 },
        { SGTL5000_DAP_AVC_CTRL,                0x0510 },
        { SGTL5000_DAP_AVC_THRESHOLD,           0x1473 },
        { SGTL5000_DAP_AVC_ATTACK,              0x0028 },
@@ -1068,71 +1083,11 @@ static int sgtl5000_suspend(struct snd_soc_codec *codec)
        return 0;
 }
-/*
- * restore all sgtl5000 registers,
- * since a big hole between dap and regular registers,
- * we will restore them respectively.
- */
-static int sgtl5000_restore_regs(struct snd_soc_codec *codec)
-{
-        u16 *cache = codec->reg_cache;
-        u16 reg;
-        /* restore regular registers */
-        for (reg = 0; reg <= SGTL5000_CHIP_SHORT_CTRL; reg += 2) {
-                /* These regs should restore in particular order */
-                if (reg == SGTL5000_CHIP_ANA_POWER ||
-                        reg == SGTL5000_CHIP_CLK_CTRL ||
-                        reg == SGTL5000_CHIP_LINREG_CTRL ||
-                        reg == SGTL5000_CHIP_LINE_OUT_CTRL ||
-                        reg == SGTL5000_CHIP_REF_CTRL)
-                        continue;
-                snd_soc_write(codec, reg, cache[reg]);
-        }
-        /* restore dap registers */
-        for (reg = SGTL5000_DAP_REG_OFFSET; reg < SGTL5000_MAX_REG_OFFSET; reg += 2)
-                snd_soc_write(codec, reg, cache[reg]);
-        /*
-         * restore these regs according to the power setting sequence in
-         * sgtl5000_set_power_regs() and clock setting sequence in
-         * sgtl5000_set_clock().
-         *
-         * The order of restore is:
-         * 1. SGTL5000_CHIP_CLK_CTRL MCLK_FREQ bits (1:0) should be restore after
-         *    SGTL5000_CHIP_ANA_POWER PLL bits set
-         * 2. SGTL5000_CHIP_LINREG_CTRL should be set before
-         *    SGTL5000_CHIP_ANA_POWER LINREG_D restored
-         * 3. SGTL5000_CHIP_REF_CTRL controls Analog Ground Voltage,
-         *    prefer to resotre it after SGTL5000_CHIP_ANA_POWER restored
-         */
-        snd_soc_write(codec, SGTL5000_CHIP_LINREG_CTRL,
-                        cache[SGTL5000_CHIP_LINREG_CTRL]);
-        snd_soc_write(codec, SGTL5000_CHIP_ANA_POWER,
-                        cache[SGTL5000_CHIP_ANA_POWER]);
-        snd_soc_write(codec, SGTL5000_CHIP_CLK_CTRL,
-                        cache[SGTL5000_CHIP_CLK_CTRL]);
-        snd_soc_write(codec, SGTL5000_CHIP_REF_CTRL,
-                        cache[SGTL5000_CHIP_REF_CTRL]);
-        snd_soc_write(codec, SGTL5000_CHIP_LINE_OUT_CTRL,
-                        cache[SGTL5000_CHIP_LINE_OUT_CTRL]);
-        return 0;
-}
 static int sgtl5000_resume(struct snd_soc_codec *codec)
 {
        /* Bring the codec back up to standby to enable regulators */
        sgtl5000_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        /* Restore registers by cached in memory */
-        sgtl5000_restore_regs(codec);
        return 0;
 }
 #else
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c
index c5177bc5df82..d90cb0fafcb2 100644
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@ -109,7 +109,7 @@ static void enable_and_reset_codec(struct regmap *regmap,
 {
        regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1,
                        codec_enable_bits | codec_reset_bits,
-                        codec_enable_bits | ~codec_reset_bits);
+                        codec_enable_bits);
        msleep(20);
        regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1,
                        codec_reset_bits, codec_reset_bits);
@@ -128,8 +128,7 @@ static int atlas6_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w,
                break;
        case SND_SOC_DAPM_POST_PMD:
                regmap_update_bits(sirf_audio_codec->regmap,
-                        AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS,
+                        AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS, 0);
-                        ~ATLAS6_CODEC_ENABLE_BITS);
                break;
        default:
                break;
@@ -151,8 +150,7 @@ static int prima2_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w,
                break;
        case SND_SOC_DAPM_POST_PMD:
                regmap_update_bits(sirf_audio_codec->regmap,
-                        AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS,
+                        AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS, 0);
-                        ~PRIMA2_CODEC_ENABLE_BITS);
                break;
        default:
                break;
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index d7349bc89ad3..e12fafbb1e09 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
        mask <<= shift;
        val <<= shift;
-        change = snd_soc_test_bits(codec, val, mask, reg);
+        change = snd_soc_test_bits(codec, reg, mask, val);
        if (change) {
                update.kcontrol = kcontrol;
                update.reg = reg;
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index bbcad9ff3c98..d96e5963ee35 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -63,6 +63,7 @@ struct wm8804_priv {
        struct regmap *regmap;
        struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES];
        struct notifier_block disable_nb[WM8804_NUM_SUPPLIES];
+        int mclk_div;
 };
 static int txsrc_get(struct snd_kcontrol *kcontrol,
@@ -318,7 +319,7 @@ static struct {
 #define FIXED_PLL_SIZE ((1ULL << 22) * 10)
 static int pll_factors(struct pll_div *pll_div, unsigned int target,
-                       unsigned int source)
+                       unsigned int source, unsigned int mclk_div)
 {
        u64 Kpart;
        unsigned long int K, Ndiv, Nmod, tmp;
@@ -330,7 +331,8 @@ static int pll_factors(struct pll_div *pll_div, unsigned int target,
         */
        for (i = 0; i < ARRAY_SIZE(post_table); i++) {
                tmp = target * post_table[i].div;
-                if (tmp >= 90000000 && tmp <= 100000000) {
+                if ((tmp >= 90000000 && tmp <= 100000000) &&
+                    (mclk_div == post_table[i].mclkdiv)) {
                        pll_div->freqmode = post_table[i].freqmode;
                        pll_div->mclkdiv = post_table[i].mclkdiv;
                        target *= post_table[i].div;
@@ -387,8 +389,12 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
        } else {
                int ret;
                struct pll_div pll_div;
+                struct wm8804_priv *wm8804;
-                ret = pll_factors(&pll_div, freq_out, freq_in);
+                wm8804 = snd_soc_codec_get_drvdata(codec);
+                ret = pll_factors(&pll_div, freq_out, freq_in,
+                                  wm8804->mclk_div);
                if (ret)
                        return ret;
@@ -452,6 +458,7 @@ static int wm8804_set_clkdiv(struct snd_soc_dai *dai,
                             int div_id, int div)
 {
        struct snd_soc_codec *codec;
+        struct wm8804_priv *wm8804;
        codec = dai->codec;
        switch (div_id) {
@@ -459,6 +466,10 @@ static int wm8804_set_clkdiv(struct snd_soc_dai *dai,
                snd_soc_update_bits(codec, WM8804_PLL5, 0x30,
                                    (div & 0x3) << 4);
                break;
+        case WM8804_MCLK_DIV:
+                wm8804 = snd_soc_codec_get_drvdata(codec);
+                wm8804->mclk_div = div;
+                break;
        default:
                dev_err(dai->dev, "Unknown clock divider: %d\n", div_id);
                return -EINVAL;
diff --git a/sound/soc/codecs/wm8804.h b/sound/soc/codecs/wm8804.h
index 8ec14f5573cb..e72d4f4ba6b1 100644
--- a/sound/soc/codecs/wm8804.h
+++ b/sound/soc/codecs/wm8804.h
@@ -57,5 +57,9 @@
 #define WM8804_CLKOUT_SRC_OSCCLK                4
 #define WM8804_CLKOUT_DIV                       1
+#define WM8804_MCLK_DIV                         2
+#define WM8804_MCLKDIV_256FS                    0
+#define WM8804_MCLKDIV_128FS                    1
 #endif  /* _WM8804_H */
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index acea8927905b..2a9c6d11330c 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -74,8 +74,7 @@ static const char *wm9713_rec_src[] =
        "Mono Out", "Zh"};
 static const char *wm9713_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"};
 static const char *wm9713_alc_select[] = {"None", "Left", "Right", "Stereo"};
-static const char *wm9713_mono_pga[] = {"Vmid", "Zh", "Mono", "Inv",
+static const char *wm9713_mono_pga[] = {"Vmid", "Zh", "Mono", "Inv"};
-        "Mono Vmid", "Inv Vmid"};
 static const char *wm9713_spk_pga[] =
        {"Vmid", "Zh", "Headphone", "Speaker", "Inv", "Headphone Vmid",
        "Speaker Vmid", "Inv Vmid"};
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index ff15eec3ab2f..060027182dcb 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1543,16 +1543,16 @@ static void wm_adsp2_boot_work(struct work_struct *work)
                ret = regmap_read(dsp->regmap,
                                  dsp->base + ADSP2_CLOCKING, &val);
                if (ret != 0) {
-                        dev_err(dsp->dev, "Failed to read clocking: %d\n", ret);
+                        adsp_err(dsp, "Failed to read clocking: %d\n", ret);
                        return;
                }
                if ((val & ADSP2_CLK_SEL_MASK) >= 3) {
                        ret = regulator_enable(dsp->dvfs);
                        if (ret != 0) {
-                                dev_err(dsp->dev,
+                                adsp_err(dsp,
-                                        "Failed to enable supply: %d\n",
+                                         "Failed to enable supply: %d\n",
-                                        ret);
+                                         ret);
                                return;
                        }
@@ -1560,9 +1560,9 @@ static void wm_adsp2_boot_work(struct work_struct *work)
                                                    1800000,
                                                    1800000);
                        if (ret != 0) {
-                                dev_err(dsp->dev,
+                                adsp_err(dsp,
-                                        "Failed to raise supply: %d\n",
+                                         "Failed to raise supply: %d\n",
-                                        ret);
+                                         ret);
                                return;
                        }
                }
@@ -1672,15 +1672,15 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                        ret = regulator_set_voltage(dsp->dvfs, 1200000,
                                                    1800000);
                        if (ret != 0)
-                                dev_warn(dsp->dev,
+                                adsp_warn(dsp,
-                                         "Failed to lower supply: %d\n",
+                                          "Failed to lower supply: %d\n",
-                                         ret);
+                                          ret);
                        ret = regulator_disable(dsp->dvfs);
                        if (ret != 0)
-                                dev_err(dsp->dev,
+                                adsp_err(dsp,
-                                        "Failed to enable supply: %d\n",
+                                         "Failed to enable supply: %d\n",
-                                        ret);
+                                         ret);
                }
                list_for_each_entry(ctl, &dsp->ctl_list, list)
@@ -1732,28 +1732,25 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs)
                adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD");
                if (IS_ERR(adsp->dvfs)) {
                        ret = PTR_ERR(adsp->dvfs);
-                        dev_err(adsp->dev, "Failed to get DCVDD: %d\n", ret);
+                        adsp_err(adsp, "Failed to get DCVDD: %d\n", ret);
                        return ret;
                }
                ret = regulator_enable(adsp->dvfs);
                if (ret != 0) {
-                        dev_err(adsp->dev, "Failed to enable DCVDD: %d\n",
+                        adsp_err(adsp, "Failed to enable DCVDD: %d\n", ret);
-                                ret);
                        return ret;
                }
                ret = regulator_set_voltage(adsp->dvfs, 1200000, 1800000);
                if (ret != 0) {
-                        dev_err(adsp->dev, "Failed to initialise DVFS: %d\n",
+                        adsp_err(adsp, "Failed to initialise DVFS: %d\n", ret);
-                                ret);
                        return ret;
                }
                ret = regulator_disable(adsp->dvfs);
                if (ret != 0) {
-                        dev_err(adsp->dev, "Failed to disable DCVDD: %d\n",
+                        adsp_err(adsp, "Failed to disable DCVDD: %d\n", ret);
-                                ret);
                        return ret;
                }
        }
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index cab98a580053..a50010e2891f 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -38,7 +38,7 @@ struct snd_soc_card_drvdata_davinci {
 static int evm_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_card *soc_card = rtd->codec->card;
+        struct snd_soc_card *soc_card = rtd->card;
        struct snd_soc_card_drvdata_davinci *drvdata =
                snd_soc_card_get_drvdata(soc_card);
@@ -51,7 +51,7 @@ static int evm_startup(struct snd_pcm_substream *substream)
 static void evm_shutdown(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_card *soc_card = rtd->codec->card;
+        struct snd_soc_card *soc_card = rtd->card;
        struct snd_soc_card_drvdata_davinci *drvdata =
                snd_soc_card_get_drvdata(soc_card);
@@ -65,8 +65,7 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_card *soc_card = rtd->card;
-        struct snd_soc_card *soc_card = codec->card;
        int ret = 0;
        unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
                           snd_soc_card_get_drvdata(soc_card))->sysclk;
@@ -125,7 +124,7 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
        struct snd_soc_codec *codec = rtd->codec;
-        struct device_node *np = codec->card->dev->of_node;
+        struct device_node *np = card->dev->of_node;
        int ret;
        /* Add davinci-evm specific widgets */
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 14058dc6eaf8..9afb14629a17 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -33,10 +33,10 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
+#include <sound/omap-pcm.h>
 #include "davinci-pcm.h"
 #include "davinci-mcasp.h"
-#include "../omap/omap-pcm.h"
 #define MCASP_MAX_AFIFO_DEPTH   64
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d262ec0653d3..37933629cbed 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -16,6 +16,7 @@ config SND_SOC_FSL_SSI
        tristate "Synchronous Serial Interface module support"
        select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
        select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
+        select REGMAP_MMIO
        help
          Say Y if you want to add Synchronous Serial Interface (SSI)
          support for the Freescale CPUs.
@@ -207,12 +208,7 @@ config SND_SOC_PHYCORE_AC97
 config SND_SOC_EUKREA_TLV320
        tristate "Eukrea TLV320"
-        depends on MACH_EUKREA_MBIMX27_BASEBOARD \
+        depends on ARCH_MXC && I2C
-                || MACH_EUKREA_MBIMXSD25_BASEBOARD \
-                || MACH_EUKREA_MBIMXSD35_BASEBOARD \
-                || MACH_EUKREA_MBIMXSD51_BASEBOARD \
-                || (OF && ARM)
-        depends on I2C
        select SND_SOC_TLV320AIC23_I2C
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_IMX_SSI
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f233d915b7e4..9bfef55d77d1 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -54,25 +54,6 @@
 #include "fsl_ssi.h"
 #include "imx-pcm.h"
-#ifdef PPC
-#define read_ssi(addr)                   in_be32(addr)
-#define write_ssi(val, addr)             out_be32(addr, val)
-#define write_ssi_mask(addr, clear, set) clrsetbits_be32(addr, clear, set)
-#else
-#define read_ssi(addr)                   readl(addr)
-#define write_ssi(val, addr)             writel(val, addr)
-/*
- * FIXME: Proper locking should be added at write_ssi_mask caller level
- * to ensure this register read/modify/write sequence is race free.
- */
-static inline void write_ssi_mask(u32 __iomem *addr, u32 clear, u32 set)
-{
-        u32 val = readl(addr);
-        val = (val & ~clear) | set;
-        writel(val, addr);
-}
-#endif
 /**
 * FSLSSI_I2S_RATES: sample rates supported by the I2S
 *
@@ -132,72 +113,86 @@ struct fsl_ssi_rxtx_reg_val {
        struct fsl_ssi_reg_val rx;
        struct fsl_ssi_reg_val tx;
 };
+static const struct regmap_config fsl_ssi_regconfig = {
+        .max_register = CCSR_SSI_SACCDIS,
+        .reg_bits = 32,
+        .val_bits = 32,
+        .reg_stride = 4,
+        .val_format_endian = REGMAP_ENDIAN_NATIVE,
+};
+struct fsl_ssi_soc_data {
+        bool imx;
+        bool offline_config;
+        u32 sisr_write_mask;
+};
 /**
 * fsl_ssi_private: per-SSI private data
 *
- * @ssi: pointer to the SSI's registers
+ * @reg: Pointer to the regmap registers
- * @ssi_phys: physical address of the SSI registers
 * @irq: IRQ of this SSI
- * @playback: the number of playback streams opened
+ * @cpu_dai_drv: CPU DAI driver for this device
- * @capture: the number of capture streams opened
+ *
- * @cpu_dai: the CPU DAI for this device
+ * @dai_fmt: DAI configuration this device is currently used with
- * @dev_attr: the sysfs device attribute structure
+ * @i2s_mode: i2s and network mode configuration of the device. Is used to
- * @stats: SSI statistics
+ * switch between normal and i2s/network mode
+ * mode depending on the number of channels
+ * @use_dma: DMA is used or FIQ with stream filter
+ * @use_dual_fifo: DMA with support for both FIFOs used
+ * @fifo_deph: Depth of the SSI FIFOs
+ * @rxtx_reg_val: Specific register settings for receive/transmit configuration
+ *
+ * @clk: SSI clock
+ * @baudclk: SSI baud clock for master mode
+ * @baudclk_streams: Active streams that are using baudclk
+ * @bitclk_freq: bitclock frequency set by .set_dai_sysclk
+ *
+ * @dma_params_tx: DMA transmit parameters
+ * @dma_params_rx: DMA receive parameters
+ * @ssi_phys: physical address of the SSI registers
+ *
+ * @fiq_params: FIQ stream filtering parameters
+ *
+ * @pdev: Pointer to pdev used for deprecated fsl-ssi sound card
+ *
+ * @dbg_stats: Debugging statistics
+ *
+ * @soc: SoC specifc data
 */
 struct fsl_ssi_private {
-        struct ccsr_ssi __iomem *ssi;
+        struct regmap *regs;
-        dma_addr_t ssi_phys;
        unsigned int irq;
-        unsigned int fifo_depth;
        struct snd_soc_dai_driver cpu_dai_drv;
-        struct platform_device *pdev;
-        unsigned int dai_fmt;
-        enum fsl_ssi_type hw_type;
+        unsigned int dai_fmt;
+        u8 i2s_mode;
        bool use_dma;
-        bool baudclk_locked;
        bool use_dual_fifo;
-        u8 i2s_mode;
+        unsigned int fifo_depth;
-        spinlock_t baudclk_lock;
+        struct fsl_ssi_rxtx_reg_val rxtx_reg_val;
-        struct clk *baudclk;
        struct clk *clk;
+        struct clk *baudclk;
+        unsigned int baudclk_streams;
+        unsigned int bitclk_freq;
+        /* DMA params */
        struct snd_dmaengine_dai_dma_data dma_params_tx;
        struct snd_dmaengine_dai_dma_data dma_params_rx;
+        dma_addr_t ssi_phys;
+        /* params for non-dma FIQ stream filtered mode */
        struct imx_pcm_fiq_params fiq_params;
-        /* Register values for rx/tx configuration */
-        struct fsl_ssi_rxtx_reg_val rxtx_reg_val;
+        /* Used when using fsl-ssi as sound-card. This is only used by ppc and
+         * should be replaced with simple-sound-card. */
+        struct platform_device *pdev;
        struct fsl_ssi_dbg dbg_stats;
-};
-static const struct of_device_id fsl_ssi_ids[] = {
+        const struct fsl_ssi_soc_data *soc;
-        { .compatible = "fsl,mpc8610-ssi", .data = (void *) FSL_SSI_MCP8610},
-        { .compatible = "fsl,imx51-ssi", .data = (void *) FSL_SSI_MX51},
-        { .compatible = "fsl,imx35-ssi", .data = (void *) FSL_SSI_MX35},
-        { .compatible = "fsl,imx21-ssi", .data = (void *) FSL_SSI_MX21},
-        {}
 };
-MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
-static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private)
-{
-        return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97);
-}
-static bool fsl_ssi_on_imx(struct fsl_ssi_private *ssi_private)
-{
-        switch (ssi_private->hw_type) {
-        case FSL_SSI_MX21:
-        case FSL_SSI_MX35:
-        case FSL_SSI_MX51:
-                return true;
-        case FSL_SSI_MCP8610:
-                return false;
-        }
-        return false;
-}
 /*
 * imx51 and later SoCs have a slightly different IP that allows the
@@ -214,18 +209,54 @@ static bool fsl_ssi_on_imx(struct fsl_ssi_private *ssi_private)
 * while the SSI unit is running (SSIEN). So we support the necessary
 * online configuration of fsl-ssi starting at imx51.
 */
-static bool fsl_ssi_offline_config(struct fsl_ssi_private *ssi_private)
+static struct fsl_ssi_soc_data fsl_ssi_mpc8610 = {
+        .imx = false,
+        .offline_config = true,
+        .sisr_write_mask = CCSR_SSI_SISR_RFRC | CCSR_SSI_SISR_TFRC |
+                        CCSR_SSI_SISR_ROE0 | CCSR_SSI_SISR_ROE1 |
+                        CCSR_SSI_SISR_TUE0 | CCSR_SSI_SISR_TUE1,
+};
+static struct fsl_ssi_soc_data fsl_ssi_imx21 = {
+        .imx = true,
+        .offline_config = true,
+        .sisr_write_mask = 0,
+};
+static struct fsl_ssi_soc_data fsl_ssi_imx35 = {
+        .imx = true,
+        .offline_config = true,
+        .sisr_write_mask = CCSR_SSI_SISR_RFRC | CCSR_SSI_SISR_TFRC |
+                        CCSR_SSI_SISR_ROE0 | CCSR_SSI_SISR_ROE1 |
+                        CCSR_SSI_SISR_TUE0 | CCSR_SSI_SISR_TUE1,
+};
+static struct fsl_ssi_soc_data fsl_ssi_imx51 = {
+        .imx = true,
+        .offline_config = false,
+        .sisr_write_mask = CCSR_SSI_SISR_ROE0 | CCSR_SSI_SISR_ROE1 |
+                CCSR_SSI_SISR_TUE0 | CCSR_SSI_SISR_TUE1,
+};
+static const struct of_device_id fsl_ssi_ids[] = {
+        { .compatible = "fsl,mpc8610-ssi", .data = &fsl_ssi_mpc8610 },
+        { .compatible = "fsl,imx51-ssi", .data = &fsl_ssi_imx51 },
+        { .compatible = "fsl,imx35-ssi", .data = &fsl_ssi_imx35 },
+        { .compatible = "fsl,imx21-ssi", .data = &fsl_ssi_imx21 },
+        {}
+};
+MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
+static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private)
 {
-        switch (ssi_private->hw_type) {
+        return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97);
-        case FSL_SSI_MCP8610:
+}
-        case FSL_SSI_MX21:
-        case FSL_SSI_MX35:
-                return true;
-        case FSL_SSI_MX51:
-                return false;
-        }
-        return true;
+static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private)
+{
+        return (ssi_private->dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) ==
+                SND_SOC_DAIFMT_CBS_CFS;
 }
 /**
@@ -243,39 +274,20 @@ static bool fsl_ssi_offline_config(struct fsl_ssi_private *ssi_private)
 static irqreturn_t fsl_ssi_isr(int irq, void *dev_id)
 {
        struct fsl_ssi_private *ssi_private = dev_id;
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        __be32 sisr;
        __be32 sisr2;
-        __be32 sisr_write_mask = 0;
-        switch (ssi_private->hw_type) {
-        case FSL_SSI_MX21:
-                sisr_write_mask = 0;
-                break;
-        case FSL_SSI_MCP8610:
-        case FSL_SSI_MX35:
-                sisr_write_mask = CCSR_SSI_SISR_RFRC | CCSR_SSI_SISR_TFRC |
-                        CCSR_SSI_SISR_ROE0 | CCSR_SSI_SISR_ROE1 |
-                        CCSR_SSI_SISR_TUE0 | CCSR_SSI_SISR_TUE1;
-                break;
-        case FSL_SSI_MX51:
-                sisr_write_mask = CCSR_SSI_SISR_ROE0 | CCSR_SSI_SISR_ROE1 |
-                        CCSR_SSI_SISR_TUE0 | CCSR_SSI_SISR_TUE1;
-                break;
-        }
        /* We got an interrupt, so read the status register to see what we
           were interrupted for.  We mask it with the Interrupt Enable register
           so that we only check for events that we're interested in.
         */
-        sisr = read_ssi(&ssi->sisr);
+        regmap_read(regs, CCSR_SSI_SISR, &sisr);
-        sisr2 = sisr & sisr_write_mask;
+        sisr2 = sisr & ssi_private->soc->sisr_write_mask;
        /* Clear the bits that we set */
        if (sisr2)
-                write_ssi(sisr2, &ssi->sisr);
+                regmap_write(regs, CCSR_SSI_SISR, sisr2);
        fsl_ssi_dbg_isr(&ssi_private->dbg_stats, sisr);
@@ -288,17 +300,26 @@ static irqreturn_t fsl_ssi_isr(int irq, void *dev_id)
 static void fsl_ssi_rxtx_config(struct fsl_ssi_private *ssi_private,
                bool enable)
 {
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        struct fsl_ssi_rxtx_reg_val *vals = &ssi_private->rxtx_reg_val;
        if (enable) {
-                write_ssi_mask(&ssi->sier, 0, vals->rx.sier | vals->tx.sier);
+                regmap_update_bits(regs, CCSR_SSI_SIER,
-                write_ssi_mask(&ssi->srcr, 0, vals->rx.srcr | vals->tx.srcr);
+                                vals->rx.sier | vals->tx.sier,
-                write_ssi_mask(&ssi->stcr, 0, vals->rx.stcr | vals->tx.stcr);
+                                vals->rx.sier | vals->tx.sier);
+                regmap_update_bits(regs, CCSR_SSI_SRCR,
+                                vals->rx.srcr | vals->tx.srcr,
+                                vals->rx.srcr | vals->tx.srcr);
+                regmap_update_bits(regs, CCSR_SSI_STCR,
+                                vals->rx.stcr | vals->tx.stcr,
+                                vals->rx.stcr | vals->tx.stcr);
        } else {
-                write_ssi_mask(&ssi->srcr, vals->rx.srcr | vals->tx.srcr, 0);
+                regmap_update_bits(regs, CCSR_SSI_SRCR,
-                write_ssi_mask(&ssi->stcr, vals->rx.stcr | vals->tx.stcr, 0);
+                                vals->rx.srcr | vals->tx.srcr, 0);
-                write_ssi_mask(&ssi->sier, vals->rx.sier | vals->tx.sier, 0);
+                regmap_update_bits(regs, CCSR_SSI_STCR,
+                                vals->rx.stcr | vals->tx.stcr, 0);
+                regmap_update_bits(regs, CCSR_SSI_SIER,
+                                vals->rx.sier | vals->tx.sier, 0);
        }
 }
@@ -329,13 +350,17 @@ static void fsl_ssi_rxtx_config(struct fsl_ssi_private *ssi_private,
 static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
                struct fsl_ssi_reg_val *vals)
 {
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        struct fsl_ssi_reg_val *avals;
-        u32 scr_val = read_ssi(&ssi->scr);
+        int nr_active_streams;
-        int nr_active_streams = !!(scr_val & CCSR_SSI_SCR_TE) +
+        u32 scr_val;
-                                !!(scr_val & CCSR_SSI_SCR_RE);
        int keep_active;
+        regmap_read(regs, CCSR_SSI_SCR, &scr_val);
+        nr_active_streams = !!(scr_val & CCSR_SSI_SCR_TE) +
+                                !!(scr_val & CCSR_SSI_SCR_RE);
        if (nr_active_streams - 1 > 0)
                keep_active = 1;
        else
@@ -352,7 +377,7 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
        if (!enable) {
                u32 scr = fsl_ssi_disable_val(vals->scr, avals->scr,
                                keep_active);
-                write_ssi_mask(&ssi->scr, scr, 0);
+                regmap_update_bits(regs, CCSR_SSI_SCR, scr, 0);
        }
        /*
@@ -360,7 +385,7 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
         * reconfiguration, so we have to enable all necessary flags at once
         * even if we do not use them later (capture and playback configuration)
         */
-        if (fsl_ssi_offline_config(ssi_private)) {
+        if (ssi_private->soc->offline_config) {
                if ((enable && !nr_active_streams) ||
                                (!enable && !keep_active))
                        fsl_ssi_rxtx_config(ssi_private, enable);
@@ -373,9 +398,9 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
         * (online configuration)
         */
        if (enable) {
-                write_ssi_mask(&ssi->sier, 0, vals->sier);
+                regmap_update_bits(regs, CCSR_SSI_SIER, vals->sier, vals->sier);
-                write_ssi_mask(&ssi->srcr, 0, vals->srcr);
+                regmap_update_bits(regs, CCSR_SSI_SRCR, vals->srcr, vals->srcr);
-                write_ssi_mask(&ssi->stcr, 0, vals->stcr);
+                regmap_update_bits(regs, CCSR_SSI_STCR, vals->stcr, vals->stcr);
        } else {
                u32 sier;
                u32 srcr;
@@ -398,15 +423,15 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
                stcr = fsl_ssi_disable_val(vals->stcr, avals->stcr,
                                keep_active);
-                write_ssi_mask(&ssi->srcr, srcr, 0);
+                regmap_update_bits(regs, CCSR_SSI_SRCR, srcr, 0);
-                write_ssi_mask(&ssi->stcr, stcr, 0);
+                regmap_update_bits(regs, CCSR_SSI_STCR, stcr, 0);
-                write_ssi_mask(&ssi->sier, sier, 0);
+                regmap_update_bits(regs, CCSR_SSI_SIER, sier, 0);
        }
 config_done:
        /* Enabling of subunits is done after configuration */
        if (enable)
-                write_ssi_mask(&ssi->scr, 0, vals->scr);
+                regmap_update_bits(regs, CCSR_SSI_SCR, vals->scr, vals->scr);
 }
@@ -457,32 +482,33 @@ static void fsl_ssi_setup_reg_vals(struct fsl_ssi_private *ssi_private)
 static void fsl_ssi_setup_ac97(struct fsl_ssi_private *ssi_private)
 {
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        /*
         * Setup the clock control register
         */
-        write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),
+        regmap_write(regs, CCSR_SSI_STCCR,
-                        &ssi->stccr);
+                        CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13));
-        write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),
+        regmap_write(regs, CCSR_SSI_SRCCR,
-                        &ssi->srccr);
+                        CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13));
        /*
         * Enable AC97 mode and startup the SSI
         */
-        write_ssi(CCSR_SSI_SACNT_AC97EN | CCSR_SSI_SACNT_FV,
+        regmap_write(regs, CCSR_SSI_SACNT,
-                        &ssi->sacnt);
+                        CCSR_SSI_SACNT_AC97EN | CCSR_SSI_SACNT_FV);
-        write_ssi(0xff, &ssi->saccdis);
+        regmap_write(regs, CCSR_SSI_SACCDIS, 0xff);
-        write_ssi(0x300, &ssi->saccen);
+        regmap_write(regs, CCSR_SSI_SACCEN, 0x300);
        /*
         * Enable SSI, Transmit and Receive. AC97 has to communicate with the
         * codec before a stream is started.
         */
-        write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_SSIEN |
+        regmap_update_bits(regs, CCSR_SSI_SCR,
-                        CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE);
+                        CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE,
+                        CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE);
-        write_ssi(CCSR_SSI_SOR_WAIT(3), &ssi->sor);
+        regmap_write(regs, CCSR_SSI_SOR, CCSR_SSI_SOR_WAIT(3));
 }
 /**
@@ -499,13 +525,6 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct fsl_ssi_private *ssi_private =
                snd_soc_dai_get_drvdata(rtd->cpu_dai);
-        unsigned long flags;
-        if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) {
-                spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
-                ssi_private->baudclk_locked = false;
-                spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
-        }
        /* When using dual fifo mode, it is safer to ensure an even period
         * size. If appearing to an odd number while DMA always starts its
@@ -520,7 +539,7 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
 }
 /**
- * fsl_ssi_set_dai_sysclk - configure Digital Audio Interface bit clock
+ * fsl_ssi_set_bclk - configure Digital Audio Interface bit clock
 *
 * Note: This function can be only called when using SSI as DAI master
 *
@@ -528,20 +547,31 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
 * freq: Output BCLK frequency = samplerate * 32 (fixed) * channels
 * dir: SND_SOC_CLOCK_OUT -> TxBCLK, SND_SOC_CLOCK_IN -> RxBCLK.
 */
-static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
+static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
-                                  int clk_id, unsigned int freq, int dir)
+                struct snd_soc_dai *cpu_dai,
+                struct snd_pcm_hw_params *hw_params)
 {
        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        int synchronous = ssi_private->cpu_dai_drv.symmetric_rates, ret;
        u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
-        unsigned long flags, clkrate, baudrate, tmprate;
+        unsigned long clkrate, baudrate, tmprate;
        u64 sub, savesub = 100000;
+        unsigned int freq;
+        bool baudclk_is_used;
+        /* Prefer the explicitly set bitclock frequency */
+        if (ssi_private->bitclk_freq)
+                freq = ssi_private->bitclk_freq;
+        else
+                freq = params_channels(hw_params) * 32 * params_rate(hw_params);
        /* Don't apply it to any non-baudclk circumstance */
        if (IS_ERR(ssi_private->baudclk))
                return -EINVAL;
+        baudclk_is_used = ssi_private->baudclk_streams & ~(BIT(substream->stream));
        /* It should be already enough to divide clock by setting pm alone */
        psr = 0;
        div2 = 0;
@@ -554,7 +584,11 @@ static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                        continue;
                tmprate = freq * factor * (i + 2);
-                clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
+                if (baudclk_is_used)
+                        clkrate = clk_get_rate(ssi_private->baudclk);
+                else
+                        clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
                do_div(clkrate, factor);
                afreq = (u32)clkrate / (i + 1);
@@ -594,23 +628,28 @@ static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
        mask = CCSR_SSI_SxCCR_PM_MASK | CCSR_SSI_SxCCR_DIV2 |
                CCSR_SSI_SxCCR_PSR;
-        if (dir == SND_SOC_CLOCK_OUT || synchronous)
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK || synchronous)
-                write_ssi_mask(&ssi->stccr, mask, stccr);
+                regmap_update_bits(regs, CCSR_SSI_STCCR, mask, stccr);
        else
-                write_ssi_mask(&ssi->srccr, mask, stccr);
+                regmap_update_bits(regs, CCSR_SSI_SRCCR, mask, stccr);
-        spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
+        if (!baudclk_is_used) {
-        if (!ssi_private->baudclk_locked) {
                ret = clk_set_rate(ssi_private->baudclk, baudrate);
                if (ret) {
-                        spin_unlock_irqrestore(&ssi_private->baudclk_lock,
-                                        flags);
                        dev_err(cpu_dai->dev, "failed to set baudclk rate\n");
                        return -EINVAL;
                }
-                ssi_private->baudclk_locked = true;
        }
-        spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
+        return 0;
+}
+static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
+        ssi_private->bitclk_freq = freq;
        return 0;
 }
@@ -632,12 +671,17 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *hw_params, struct snd_soc_dai *cpu_dai)
 {
        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        unsigned int channels = params_channels(hw_params);
        unsigned int sample_size =
                snd_pcm_format_width(params_format(hw_params));
        u32 wl = CCSR_SSI_SxCCR_WL(sample_size);
-        int enabled = read_ssi(&ssi->scr) & CCSR_SSI_SCR_SSIEN;
+        int ret;
+        u32 scr_val;
+        int enabled;
+        regmap_read(regs, CCSR_SSI_SCR, &scr_val);
+        enabled = scr_val & CCSR_SSI_SCR_SSIEN;
        /*
         * If we're in synchronous mode, and the SSI is already enabled,
@@ -646,6 +690,21 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
        if (enabled && ssi_private->cpu_dai_drv.symmetric_rates)
                return 0;
+        if (fsl_ssi_is_i2s_master(ssi_private)) {
+                ret = fsl_ssi_set_bclk(substream, cpu_dai, hw_params);
+                if (ret)
+                        return ret;
+                /* Do not enable the clock if it is already enabled */
+                if (!(ssi_private->baudclk_streams & BIT(substream->stream))) {
+                        ret = clk_prepare_enable(ssi_private->baudclk);
+                        if (ret)
+                                return ret;
+                        ssi_private->baudclk_streams |= BIT(substream->stream);
+                }
+        }
        /*
         * FIXME: The documentation says that SxCCR[WL] should not be
         * modified while the SSI is enabled.  The only time this can
@@ -659,40 +718,63 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
        /* In synchronous mode, the SSI uses STCCR for capture */
        if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ||
            ssi_private->cpu_dai_drv.symmetric_rates)
-                write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_WL_MASK, wl);
+                regmap_update_bits(regs, CCSR_SSI_STCCR, CCSR_SSI_SxCCR_WL_MASK,
+                                wl);
        else
-                write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_WL_MASK, wl);
+                regmap_update_bits(regs, CCSR_SSI_SRCCR, CCSR_SSI_SxCCR_WL_MASK,
+                                wl);
        if (!fsl_ssi_is_ac97(ssi_private))
-                write_ssi_mask(&ssi->scr,
+                regmap_update_bits(regs, CCSR_SSI_SCR,
                                CCSR_SSI_SCR_NET | CCSR_SSI_SCR_I2S_MODE_MASK,
                                channels == 1 ? 0 : ssi_private->i2s_mode);
        return 0;
 }
-/**
+static int fsl_ssi_hw_free(struct snd_pcm_substream *substream,
- * fsl_ssi_set_dai_fmt - configure Digital Audio Interface Format.
+                struct snd_soc_dai *cpu_dai)
- */
-static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 {
-        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct fsl_ssi_private *ssi_private =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        if (fsl_ssi_is_i2s_master(ssi_private) &&
+                        ssi_private->baudclk_streams & BIT(substream->stream)) {
+                clk_disable_unprepare(ssi_private->baudclk);
+                ssi_private->baudclk_streams &= ~BIT(substream->stream);
+        }
+        return 0;
+}
+static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
+                unsigned int fmt)
+{
+        struct regmap *regs = ssi_private->regs;
        u32 strcr = 0, stcr, srcr, scr, mask;
        u8 wm;
        ssi_private->dai_fmt = fmt;
+        if (fsl_ssi_is_i2s_master(ssi_private) && IS_ERR(ssi_private->baudclk)) {
+                dev_err(&ssi_private->pdev->dev, "baudclk is missing which is necessary for master mode\n");
+                return -EINVAL;
+        }
        fsl_ssi_setup_reg_vals(ssi_private);
-        scr = read_ssi(&ssi->scr) & ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK);
+        regmap_read(regs, CCSR_SSI_SCR, &scr);
+        scr &= ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK);
        scr |= CCSR_SSI_SCR_SYNC_TX_FS;
        mask = CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFDIR | CCSR_SSI_STCR_TXDIR |
                CCSR_SSI_STCR_TSCKP | CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TFSL |
                CCSR_SSI_STCR_TEFS;
-        stcr = read_ssi(&ssi->stcr) & ~mask;
+        regmap_read(regs, CCSR_SSI_STCR, &stcr);
-        srcr = read_ssi(&ssi->srcr) & ~mask;
+        regmap_read(regs, CCSR_SSI_SRCR, &srcr);
+        stcr &= ~mask;
+        srcr &= ~mask;
        ssi_private->i2s_mode = CCSR_SSI_SCR_NET;
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -700,6 +782,12 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
                case SND_SOC_DAIFMT_CBS_CFS:
                        ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER;
+                        regmap_update_bits(regs, CCSR_SSI_STCCR,
+                                        CCSR_SSI_SxCCR_DC_MASK,
+                                        CCSR_SSI_SxCCR_DC(2));
+                        regmap_update_bits(regs, CCSR_SSI_SRCCR,
+                                        CCSR_SSI_SxCCR_DC_MASK,
+                                        CCSR_SSI_SxCCR_DC(2));
                        break;
                case SND_SOC_DAIFMT_CBM_CFM:
                        ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
@@ -778,9 +866,9 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                scr |= CCSR_SSI_SCR_SYN;
        }
-        write_ssi(stcr, &ssi->stcr);
+        regmap_write(regs, CCSR_SSI_STCR, stcr);
-        write_ssi(srcr, &ssi->srcr);
+        regmap_write(regs, CCSR_SSI_SRCR, srcr);
-        write_ssi(scr, &ssi->scr);
+        regmap_write(regs, CCSR_SSI_SCR, scr);
        /*
         * Set the watermark for transmit FIFI 0 and receive FIFO 0. We don't
@@ -798,16 +886,16 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
        else
                wm = ssi_private->fifo_depth;
-        write_ssi(CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) |
+        regmap_write(regs, CCSR_SSI_SFCSR,
-                        CCSR_SSI_SFCSR_TFWM1(wm) | CCSR_SSI_SFCSR_RFWM1(wm),
+                        CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) |
-                        &ssi->sfcsr);
+                        CCSR_SSI_SFCSR_TFWM1(wm) | CCSR_SSI_SFCSR_RFWM1(wm));
        if (ssi_private->use_dual_fifo) {
-                write_ssi_mask(&ssi->srcr, CCSR_SSI_SRCR_RFEN1,
+                regmap_update_bits(regs, CCSR_SSI_SRCR, CCSR_SSI_SRCR_RFEN1,
                                CCSR_SSI_SRCR_RFEN1);
-                write_ssi_mask(&ssi->stcr, CCSR_SSI_STCR_TFEN1,
+                regmap_update_bits(regs, CCSR_SSI_STCR, CCSR_SSI_STCR_TFEN1,
                                CCSR_SSI_STCR_TFEN1);
-                write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_TCH_EN,
+                regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_TCH_EN,
                                CCSR_SSI_SCR_TCH_EN);
        }
@@ -815,6 +903,17 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                fsl_ssi_setup_ac97(ssi_private);
        return 0;
+}
+/**
+ * fsl_ssi_set_dai_fmt - configure Digital Audio Interface Format.
+ */
+static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
+{
+        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
+        return _fsl_ssi_set_dai_fmt(ssi_private, fmt);
 }
 /**
@@ -826,31 +925,34 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
                                u32 rx_mask, int slots, int slot_width)
 {
        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
        u32 val;
        /* The slot number should be >= 2 if using Network mode or I2S mode */
-        val = read_ssi(&ssi->scr) & (CCSR_SSI_SCR_I2S_MODE_MASK | CCSR_SSI_SCR_NET);
+        regmap_read(regs, CCSR_SSI_SCR, &val);
+        val &= CCSR_SSI_SCR_I2S_MODE_MASK | CCSR_SSI_SCR_NET;
        if (val && slots < 2) {
                dev_err(cpu_dai->dev, "slot number should be >= 2 in I2S or NET\n");
                return -EINVAL;
        }
-        write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK,
+        regmap_update_bits(regs, CCSR_SSI_STCCR, CCSR_SSI_SxCCR_DC_MASK,
                        CCSR_SSI_SxCCR_DC(slots));
-        write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK,
+        regmap_update_bits(regs, CCSR_SSI_SRCCR, CCSR_SSI_SxCCR_DC_MASK,
                        CCSR_SSI_SxCCR_DC(slots));
        /* The register SxMSKs needs SSI to provide essential clock due to
         * hardware design. So we here temporarily enable SSI to set them.
         */
-        val = read_ssi(&ssi->scr) & CCSR_SSI_SCR_SSIEN;
+        regmap_read(regs, CCSR_SSI_SCR, &val);
-        write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_SSIEN);
+        val &= CCSR_SSI_SCR_SSIEN;
+        regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN,
+                        CCSR_SSI_SCR_SSIEN);
-        write_ssi(tx_mask, &ssi->stmsk);
+        regmap_write(regs, CCSR_SSI_STMSK, tx_mask);
-        write_ssi(rx_mask, &ssi->srmsk);
+        regmap_write(regs, CCSR_SSI_SRMSK, rx_mask);
-        write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, val);
+        regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val);
        return 0;
 }
@@ -869,11 +971,11 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai);
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        struct regmap *regs = ssi_private->regs;
-        unsigned long flags;
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                        fsl_ssi_tx_config(ssi_private, true);
@@ -882,18 +984,12 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
                break;
        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                        fsl_ssi_tx_config(ssi_private, false);
                else
                        fsl_ssi_rx_config(ssi_private, false);
-                if (!fsl_ssi_is_ac97(ssi_private) && (read_ssi(&ssi->scr) &
-                                        (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) {
-                        spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
-                        ssi_private->baudclk_locked = false;
-                        spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
-                }
                break;
        default:
@@ -902,9 +998,9 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
        if (fsl_ssi_is_ac97(ssi_private)) {
                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        write_ssi(CCSR_SSI_SOR_TX_CLR, &ssi->sor);
+                        regmap_write(regs, CCSR_SSI_SOR, CCSR_SSI_SOR_TX_CLR);
                else
-                        write_ssi(CCSR_SSI_SOR_RX_CLR, &ssi->sor);
+                        regmap_write(regs, CCSR_SSI_SOR, CCSR_SSI_SOR_RX_CLR);
        }
        return 0;
@@ -914,7 +1010,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
 {
        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(dai);
-        if (fsl_ssi_on_imx(ssi_private) && ssi_private->use_dma) {
+        if (ssi_private->soc->imx && ssi_private->use_dma) {
                dai->playback_dma_data = &ssi_private->dma_params_tx;
                dai->capture_dma_data = &ssi_private->dma_params_rx;
        }
@@ -925,6 +1021,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
 static const struct snd_soc_dai_ops fsl_ssi_dai_ops = {
        .startup        = fsl_ssi_startup,
        .hw_params      = fsl_ssi_hw_params,
+        .hw_free        = fsl_ssi_hw_free,
        .set_fmt        = fsl_ssi_set_dai_fmt,
        .set_sysclk     = fsl_ssi_set_dai_sysclk,
        .set_tdm_slot   = fsl_ssi_set_dai_tdm_slot,
@@ -978,7 +1075,7 @@ static struct fsl_ssi_private *fsl_ac97_data;
 static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
                unsigned short val)
 {
-        struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
+        struct regmap *regs = fsl_ac97_data->regs;
        unsigned int lreg;
        unsigned int lval;
@@ -987,12 +1084,12 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
        lreg = reg <<  12;
-        write_ssi(lreg, &ssi->sacadd);
+        regmap_write(regs, CCSR_SSI_SACADD, lreg);
        lval = val << 4;
-        write_ssi(lval , &ssi->sacdat);
+        regmap_write(regs, CCSR_SSI_SACDAT, lval);
-        write_ssi_mask(&ssi->sacnt, CCSR_SSI_SACNT_RDWR_MASK,
+        regmap_update_bits(regs, CCSR_SSI_SACNT, CCSR_SSI_SACNT_RDWR_MASK,
                        CCSR_SSI_SACNT_WR);
        udelay(100);
 }
@@ -1000,19 +1097,21 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
 static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
                unsigned short reg)
 {
-        struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
+        struct regmap *regs = fsl_ac97_data->regs;
        unsigned short val = -1;
+        u32 reg_val;
        unsigned int lreg;
        lreg = (reg & 0x7f) <<  12;
-        write_ssi(lreg, &ssi->sacadd);
+        regmap_write(regs, CCSR_SSI_SACADD, lreg);
-        write_ssi_mask(&ssi->sacnt, CCSR_SSI_SACNT_RDWR_MASK,
+        regmap_update_bits(regs, CCSR_SSI_SACNT, CCSR_SSI_SACNT_RDWR_MASK,
                        CCSR_SSI_SACNT_RD);
        udelay(100);
-        val = (read_ssi(&ssi->sacdat) >> 4) & 0xffff;
+        regmap_read(regs, CCSR_SSI_SACDAT, &reg_val);
+        val = (reg_val >> 4) & 0xffff;
        return val;
 }
@@ -1064,8 +1163,6 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev,
        if (IS_ERR(ssi_private->baudclk))
                dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
                         PTR_ERR(ssi_private->baudclk));
-        else
-                clk_prepare_enable(ssi_private->baudclk);
        /*
         * We have burstsize be "fifo_depth - 2" to match the SSI
@@ -1073,10 +1170,8 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev,
         */
        ssi_private->dma_params_tx.maxburst = ssi_private->fifo_depth - 2;
        ssi_private->dma_params_rx.maxburst = ssi_private->fifo_depth - 2;
-        ssi_private->dma_params_tx.addr = ssi_private->ssi_phys +
+        ssi_private->dma_params_tx.addr = ssi_private->ssi_phys + CCSR_SSI_STX0;
-                        offsetof(struct ccsr_ssi, stx0);
+        ssi_private->dma_params_rx.addr = ssi_private->ssi_phys + CCSR_SSI_SRX0;
-        ssi_private->dma_params_rx.addr = ssi_private->ssi_phys +
-                        offsetof(struct ccsr_ssi, srx0);
        ret = !of_property_read_u32_array(np, "dmas", dmas, 4);
        if (ssi_private->use_dma && !ret && dmas[2] == IMX_DMATYPE_SSI_DUAL) {
@@ -1116,9 +1211,6 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev,
        return 0;
 error_pcm:
-        if (!IS_ERR(ssi_private->baudclk))
-                clk_disable_unprepare(ssi_private->baudclk);
        clk_disable_unprepare(ssi_private->clk);
        return ret;
@@ -1129,8 +1221,6 @@ static void fsl_ssi_imx_clean(struct platform_device *pdev,
 {
        if (!ssi_private->use_dma)
                imx_pcm_fiq_exit(pdev);
-        if (!IS_ERR(ssi_private->baudclk))
-                clk_disable_unprepare(ssi_private->baudclk);
        clk_disable_unprepare(ssi_private->clk);
 }
@@ -1140,12 +1230,11 @@ static int fsl_ssi_probe(struct platform_device *pdev)
        int ret = 0;
        struct device_node *np = pdev->dev.of_node;
        const struct of_device_id *of_id;
-        enum fsl_ssi_type hw_type;
        const char *p, *sprop;
        const uint32_t *iprop;
        struct resource res;
+        void __iomem *iomem;
        char name[64];
-        bool ac97 = false;
        /* SSIs that are not connected on the board should have a
         *      status = "disabled"
@@ -1155,17 +1244,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                return -ENODEV;
        of_id = of_match_device(fsl_ssi_ids, &pdev->dev);
-        if (!of_id)
+        if (!of_id || !of_id->data)
-                return -EINVAL;
-        hw_type = (enum fsl_ssi_type) of_id->data;
-        sprop = of_get_property(np, "fsl,mode", NULL);
-        if (!sprop) {
-                dev_err(&pdev->dev, "fsl,mode property is necessary\n");
                return -EINVAL;
-        }
-        if (!strcmp(sprop, "ac97-slave"))
-                ac97 = true;
        ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),
                        GFP_KERNEL);
@@ -1174,11 +1254,21 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
+        ssi_private->soc = of_id->data;
+        sprop = of_get_property(np, "fsl,mode", NULL);
+        if (sprop) {
+                if (!strcmp(sprop, "ac97-slave"))
+                        ssi_private->dai_fmt = SND_SOC_DAIFMT_AC97;
+                else if (!strcmp(sprop, "i2s-slave"))
+                        ssi_private->dai_fmt = SND_SOC_DAIFMT_I2S |
+                                SND_SOC_DAIFMT_CBM_CFM;
+        }
        ssi_private->use_dma = !of_property_read_bool(np,
                        "fsl,fiq-stream-filter");
-        ssi_private->hw_type = hw_type;
-        if (ac97) {
+        if (fsl_ssi_is_ac97(ssi_private)) {
                memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_ac97_dai,
                                sizeof(fsl_ssi_ac97_dai));
@@ -1198,12 +1288,20 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "could not determine device resources\n");
                return ret;
        }
-        ssi_private->ssi = of_iomap(np, 0);
+        ssi_private->ssi_phys = res.start;
-        if (!ssi_private->ssi) {
+        iomem = devm_ioremap(&pdev->dev, res.start, resource_size(&res));
+        if (!iomem) {
                dev_err(&pdev->dev, "could not map device resources\n");
                return -ENOMEM;
        }
-        ssi_private->ssi_phys = res.start;
+        ssi_private->regs = devm_regmap_init_mmio(&pdev->dev, iomem,
+                        &fsl_ssi_regconfig);
+        if (IS_ERR(ssi_private->regs)) {
+                dev_err(&pdev->dev, "Failed to init register map\n");
+                return PTR_ERR(ssi_private->regs);
+        }
        ssi_private->irq = irq_of_parse_and_map(np, 0);
        if (!ssi_private->irq) {
@@ -1226,13 +1324,10 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                /* Older 8610 DTs didn't have the fifo-depth property */
                ssi_private->fifo_depth = 8;
-        ssi_private->baudclk_locked = false;
-        spin_lock_init(&ssi_private->baudclk_lock);
        dev_set_drvdata(&pdev->dev, ssi_private);
-        if (fsl_ssi_on_imx(ssi_private)) {
+        if (ssi_private->soc->imx) {
-                ret = fsl_ssi_imx_probe(pdev, ssi_private, ssi_private->ssi);
+                ret = fsl_ssi_imx_probe(pdev, ssi_private, iomem);
                if (ret)
                        goto error_irqmap;
        }
@@ -1289,6 +1384,9 @@ static int fsl_ssi_probe(struct platform_device *pdev)
        }
 done:
+        if (ssi_private->dai_fmt)
+                _fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);
        return 0;
 error_sound_card:
@@ -1298,7 +1396,7 @@ error_irq:
        snd_soc_unregister_component(&pdev->dev);
 error_asoc_register:
-        if (fsl_ssi_on_imx(ssi_private))
+        if (ssi_private->soc->imx)
                fsl_ssi_imx_clean(pdev, ssi_private);
 error_irqmap:
@@ -1318,7 +1416,7 @@ static int fsl_ssi_remove(struct platform_device *pdev)
                platform_device_unregister(ssi_private->pdev);
        snd_soc_unregister_component(&pdev->dev);
-        if (fsl_ssi_on_imx(ssi_private))
+        if (ssi_private->soc->imx)
                fsl_ssi_imx_clean(pdev, ssi_private);
        if (ssi_private->use_dma)
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index 71c3e7e4340d..506510540d0a 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -12,32 +12,30 @@
 #ifndef _MPC8610_I2S_H
 #define _MPC8610_I2S_H
-/* SSI Register Map */
+/* SSI registers */
-struct ccsr_ssi {
+#define CCSR_SSI_STX0                   0x00
-        __be32 stx0;    /* 0x.0000 - SSI Transmit Data Register 0 */
+#define CCSR_SSI_STX1                   0x04
-        __be32 stx1;    /* 0x.0004 - SSI Transmit Data Register 1 */
+#define CCSR_SSI_SRX0                   0x08
-        __be32 srx0;    /* 0x.0008 - SSI Receive Data Register 0 */
+#define CCSR_SSI_SRX1                   0x0c
-        __be32 srx1;    /* 0x.000C - SSI Receive Data Register 1 */
+#define CCSR_SSI_SCR                    0x10
-        __be32 scr;     /* 0x.0010 - SSI Control Register */
+#define CCSR_SSI_SISR                   0x14
-        __be32 sisr;    /* 0x.0014 - SSI Interrupt Status Register Mixed */
+#define CCSR_SSI_SIER                   0x18
-        __be32 sier;    /* 0x.0018 - SSI Interrupt Enable Register */
+#define CCSR_SSI_STCR                   0x1c
-        __be32 stcr;    /* 0x.001C - SSI Transmit Configuration Register */
+#define CCSR_SSI_SRCR                   0x20
-        __be32 srcr;    /* 0x.0020 - SSI Receive Configuration Register */
+#define CCSR_SSI_STCCR                  0x24
-        __be32 stccr;   /* 0x.0024 - SSI Transmit Clock Control Register */
+#define CCSR_SSI_SRCCR                  0x28
-        __be32 srccr;   /* 0x.0028 - SSI Receive Clock Control Register */
+#define CCSR_SSI_SFCSR                  0x2c
-        __be32 sfcsr;   /* 0x.002C - SSI FIFO Control/Status Register */
+#define CCSR_SSI_STR                    0x30
-        __be32 str;     /* 0x.0030 - SSI Test Register */
+#define CCSR_SSI_SOR                    0x34
-        __be32 sor;     /* 0x.0034 - SSI Option Register */
+#define CCSR_SSI_SACNT                  0x38
-        __be32 sacnt;   /* 0x.0038 - SSI AC97 Control Register */
+#define CCSR_SSI_SACADD                 0x3c
-        __be32 sacadd;  /* 0x.003C - SSI AC97 Command Address Register */
+#define CCSR_SSI_SACDAT                 0x40
-        __be32 sacdat;  /* 0x.0040 - SSI AC97 Command Data Register */
+#define CCSR_SSI_SATAG                  0x44
-        __be32 satag;   /* 0x.0044 - SSI AC97 Tag Register */
+#define CCSR_SSI_STMSK                  0x48
-        __be32 stmsk;   /* 0x.0048 - SSI Transmit Time Slot Mask Register */
+#define CCSR_SSI_SRMSK                  0x4c
-        __be32 srmsk;   /* 0x.004C - SSI Receive Time Slot Mask Register */
+#define CCSR_SSI_SACCST                 0x50
-        __be32 saccst;  /* 0x.0050 - SSI AC97 Channel Status Register */
+#define CCSR_SSI_SACCEN                 0x54
-        __be32 saccen;  /* 0x.0054 - SSI AC97 Channel Enable Register */
+#define CCSR_SSI_SACCDIS                0x58
-        __be32 saccdis; /* 0x.0058 - SSI AC97 Channel Disable Register */
-};
 #define CCSR_SSI_SCR_SYNC_TX_FS         0x00001000
 #define CCSR_SSI_SCR_RFR_CLK_DIS        0x00000800
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 98f97e543c29..03a7fdcdf114 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -24,9 +24,32 @@ struct simple_card_data {
                struct asoc_simple_dai cpu_dai;
                struct asoc_simple_dai codec_dai;
        } *dai_props;
+        unsigned int mclk_fs;
        struct snd_soc_dai_link dai_link[];     /* dynamically allocated */
 };
+static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+        unsigned int mclk;
+        int ret = 0;
+        if (priv->mclk_fs) {
+                mclk = params_rate(params) * priv->mclk_fs;
+                ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+                                             SND_SOC_CLOCK_IN);
+        }
+        return ret;
+}
+static struct snd_soc_ops asoc_simple_card_ops = {
+        .hw_params = asoc_simple_card_hw_params,
+};
 static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
                                       struct asoc_simple_dai *set)
 {
@@ -144,7 +167,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
 static int simple_card_dai_link_of(struct device_node *node,
                                   struct device *dev,
                                   struct snd_soc_dai_link *dai_link,
-                                   struct simple_dai_props *dai_props)
+                                   struct simple_dai_props *dai_props,
+                                   bool is_top_level_node)
 {
        struct device_node *np = NULL;
        struct device_node *bitclkmaster = NULL;
@@ -155,7 +179,8 @@ static int simple_card_dai_link_of(struct device_node *node,
        char *prefix = "";
        int ret;
-        prefix = "simple-audio-card,";
+        if (is_top_level_node)
+                prefix = "simple-audio-card,";
        daifmt = snd_soc_of_parse_daifmt(node, prefix,
                                         &bitclkmaster, &framemaster);
@@ -249,6 +274,7 @@ static int simple_card_dai_link_of(struct device_node *node,
        sprintf(name, "%s-%s", dai_link->cpu_dai_name,
                                dai_link->codec_dai_name);
        dai_link->name = dai_link->stream_name = name;
+        dai_link->ops = &asoc_simple_card_ops;
        dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
        dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
@@ -298,6 +324,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                        return ret;
        }
+        /* Factor to mclk, used in hw_params() */
+        of_property_read_u32(node, "simple-audio-card,mclk-fs",
+                             &priv->mclk_fs);
        dev_dbg(dev, "New simple-card: %s\n", priv->snd_card.name ?
                priv->snd_card.name : "");
@@ -307,14 +337,15 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                for (i = 0; (np = of_get_next_child(node, np)); i++) {
                        dev_dbg(dev, "\tlink %d:\n", i);
                        ret = simple_card_dai_link_of(np, dev, dai_link + i,
-                                                      dai_props + i);
+                                                      dai_props + i, false);
                        if (ret < 0) {
                                of_node_put(np);
                                return ret;
                        }
                }
        } else {
-                ret = simple_card_dai_link_of(node, dev, dai_link, dai_props);
+                ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,
+                                              true);
                if (ret < 0)
                        return ret;
        }
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 3c81b3891209..c30fedb3e149 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -49,3 +49,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
        help
          This adds audio driver for Intel Baytrail platform based boards
          with the RT5640 audio codec.
+config SND_SOC_INTEL_BYT_MAX98090_MACH
+        tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
+        depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C
+        select SND_SOC_INTEL_BAYTRAIL
+        select SND_SOC_MAX98090
+        help
+          This adds audio driver for Intel Baytrail platform based boards
+          with the MAX98090 audio codec.
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index 0db4e2f336dc..4bfca79a42ba 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -23,6 +23,8 @@ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
 # Machine support
 snd-soc-sst-haswell-objs := haswell.o
 snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
+snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
+obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c
new file mode 100644
index 000000000000..5fc98c64a3f4
--- /dev/null
+++ b/sound/soc/intel/byt-max98090.c
@@ -0,0 +1,203 @@
+/*
+ * Intel Baytrail SST MAX98090 machine driver
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
+#include <linux/slab.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+#include "../codecs/max98090.h"
+struct byt_max98090_private {
+        struct snd_soc_jack jack;
+};
+static const struct snd_soc_dapm_widget byt_max98090_widgets[] = {
+        SND_SOC_DAPM_HP("Headphone", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+        SND_SOC_DAPM_MIC("Int Mic", NULL),
+        SND_SOC_DAPM_SPK("Ext Spk", NULL),
+};
+static const struct snd_soc_dapm_route byt_max98090_audio_map[] = {
+        {"IN34", NULL, "Headset Mic"},
+        {"IN34", NULL, "MICBIAS"},
+        {"MICBIAS", NULL, "Headset Mic"},
+        {"DMICL", NULL, "Int Mic"},
+        {"Headphone", NULL, "HPL"},
+        {"Headphone", NULL, "HPR"},
+        {"Ext Spk", NULL, "SPKL"},
+        {"Ext Spk", NULL, "SPKR"},
+};
+static const struct snd_kcontrol_new byt_max98090_controls[] = {
+        SOC_DAPM_PIN_SWITCH("Headphone"),
+        SOC_DAPM_PIN_SWITCH("Headset Mic"),
+        SOC_DAPM_PIN_SWITCH("Int Mic"),
+        SOC_DAPM_PIN_SWITCH("Ext Spk"),
+};
+static struct snd_soc_jack_pin hs_jack_pins[] = {
+        {
+                .pin    = "Headphone",
+                .mask   = SND_JACK_HEADPHONE,
+        },
+        {
+                .pin    = "Headset Mic",
+                .mask   = SND_JACK_MICROPHONE,
+        },
+        {
+                .pin    = "Ext Spk",
+                .mask   = SND_JACK_LINEOUT,
+        },
+        {
+                .pin    = "Int Mic",
+                .mask   = SND_JACK_LINEIN,
+        },
+};
+static struct snd_soc_jack_gpio hs_jack_gpios[] = {
+        {
+                .name           = "hp-gpio",
+                .idx            = 0,
+                .report         = SND_JACK_HEADPHONE | SND_JACK_LINEOUT,
+                .debounce_time  = 200,
+        },
+        {
+                .name           = "mic-gpio",
+                .idx            = 1,
+                .report         = SND_JACK_MICROPHONE | SND_JACK_LINEIN,
+                .debounce_time  = 200,
+        },
+};
+static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime)
+{
+        int ret;
+        struct snd_soc_codec *codec = runtime->codec;
+        struct snd_soc_card *card = runtime->card;
+        struct byt_max98090_private *drv = snd_soc_card_get_drvdata(card);
+        struct snd_soc_jack *jack = &drv->jack;
+        card->dapm.idle_bias_off = true;
+        ret = snd_soc_dai_set_sysclk(runtime->codec_dai,
+                                     M98090_REG_SYSTEM_CLOCK,
+                                     25000000, SND_SOC_CLOCK_IN);
+        if (ret < 0) {
+                dev_err(card->dev, "Can't set codec clock %d\n", ret);
+                return ret;
+        }
+        /* Enable jack detection */
+        ret = snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, jack);
+        if (ret)
+                return ret;
+        ret = snd_soc_jack_add_pins(jack, ARRAY_SIZE(hs_jack_pins),
+                                    hs_jack_pins);
+        if (ret)
+                return ret;
+        ret = snd_soc_jack_add_gpiods(card->dev->parent, jack,
+                                      ARRAY_SIZE(hs_jack_gpios),
+                                      hs_jack_gpios);
+        if (ret)
+                return ret;
+        return max98090_mic_detect(codec, jack);
+}
+static struct snd_soc_dai_link byt_max98090_dais[] = {
+        {
+                .name = "Baytrail Audio",
+                .stream_name = "Audio",
+                .cpu_dai_name = "baytrail-pcm-audio",
+                .codec_dai_name = "HiFi",
+                .codec_name = "i2c-193C9890:00",
+                .platform_name = "baytrail-pcm-audio",
+                .init = byt_max98090_init,
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                           SND_SOC_DAIFMT_CBS_CFS,
+        },
+};
+static struct snd_soc_card byt_max98090_card = {
+        .name = "byt-max98090",
+        .dai_link = byt_max98090_dais,
+        .num_links = ARRAY_SIZE(byt_max98090_dais),
+        .dapm_widgets = byt_max98090_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(byt_max98090_widgets),
+        .dapm_routes = byt_max98090_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(byt_max98090_audio_map),
+        .controls = byt_max98090_controls,
+        .num_controls = ARRAY_SIZE(byt_max98090_controls),
+};
+static int byt_max98090_probe(struct platform_device *pdev)
+{
+        int ret_val = 0;
+        struct byt_max98090_private *priv;
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC);
+        if (!priv) {
+                dev_err(&pdev->dev, "allocation failed\n");
+                return -ENOMEM;
+        }
+        byt_max98090_card.dev = &pdev->dev;
+        snd_soc_card_set_drvdata(&byt_max98090_card, priv);
+        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_max98090_card);
+        if (ret_val) {
+                dev_err(&pdev->dev,
+                        "snd_soc_register_card failed %d\n", ret_val);
+                return ret_val;
+        }
+        return ret_val;
+}
+static int byt_max98090_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+        struct byt_max98090_private *priv = snd_soc_card_get_drvdata(card);
+        snd_soc_jack_free_gpios(&priv->jack, ARRAY_SIZE(hs_jack_gpios),
+                                hs_jack_gpios);
+        return 0;
+}
+static struct platform_driver byt_max98090_driver = {
+        .probe = byt_max98090_probe,
+        .remove = byt_max98090_remove,
+        .driver = {
+                .name = "byt-max98090",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+};
+module_platform_driver(byt_max98090_driver)
+MODULE_DESCRIPTION("ASoC Intel(R) Baytrail Machine driver");
+MODULE_AUTHOR("Omair Md Abdullah, Jarkko Nikula");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:byt-max98090");
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index 5535c3fb7922..53d160d39972 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -132,43 +132,20 @@ static struct snd_soc_card byt_rt5640_card = {
        .num_dapm_routes = ARRAY_SIZE(byt_rt5640_audio_map),
 };
-#ifdef CONFIG_PM_SLEEP
-static const struct dev_pm_ops byt_rt5640_pm_ops = {
-        .suspend = snd_soc_suspend,
-        .resume = snd_soc_resume,
-};
-#define BYT_RT5640_PM_OPS       (&byt_rt5640_pm_ops)
-#else
-#define BYT_RT5640_PM_OPS       NULL
-#endif
 static int byt_rt5640_probe(struct platform_device *pdev)
 {
        struct snd_soc_card *card = &byt_rt5640_card;
-        struct device *dev = &pdev->dev;
        card->dev = &pdev->dev;
-        dev_set_drvdata(dev, card);
+        return devm_snd_soc_register_card(&pdev->dev, card);
-        return snd_soc_register_card(card);
-}
-static int byt_rt5640_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
-        snd_soc_unregister_card(card);
-        return 0;
 }
 static struct platform_driver byt_rt5640_audio = {
        .probe = byt_rt5640_probe,
-        .remove = byt_rt5640_remove,
        .driver = {
                .name = "byt-rt5640",
                .owner = THIS_MODULE,
-                .pm = BYT_RT5640_PM_OPS,
+                .pm = &snd_soc_pm_ops,
        },
 };
 module_platform_driver(byt_rt5640_audio)
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c
index 94c2c33ffe49..3981982674ac 100644
--- a/sound/soc/intel/haswell.c
+++ b/sound/soc/intel/haswell.c
@@ -202,18 +202,11 @@ static int haswell_audio_probe(struct platform_device *pdev)
 {
        haswell_rt5640.dev = &pdev->dev;
-        return snd_soc_register_card(&haswell_rt5640);
+        return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640);
-}
-static int haswell_audio_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&haswell_rt5640);
-        return 0;
 }
 static struct platform_driver haswell_audio = {
        .probe = haswell_audio_probe,
-        .remove = haswell_audio_remove,
        .driver = {
                .name = "haswell-audio",
                .owner = THIS_MODULE,
diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c
index 18aee77f8d4a..42edc6f4fc4a 100644
--- a/sound/soc/intel/sst-acpi.c
+++ b/sound/soc/intel/sst-acpi.c
@@ -247,6 +247,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = {
 static struct sst_acpi_mach baytrail_machines[] = {
        { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-i2s_master" },
+        { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-i2s_master" },
        {}
 };
diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c
index 7c1ec003d55d..d207b22ea330 100644
--- a/sound/soc/intel/sst-baytrail-ipc.c
+++ b/sound/soc/intel/sst-baytrail-ipc.c
@@ -22,7 +22,6 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/list.h>
 #include <linux/platform_device.h>
 #include <linux/kthread.h>
 #include <linux/firmware.h>
@@ -892,7 +891,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
        /* start the IPC message thread */
        init_kthread_worker(&byt->kworker);
        byt->tx_thread = kthread_run(kthread_worker_fn,
-                                     &byt->kworker,
+                                     &byt->kworker, "%s",
                                     dev_name(byt->dev));
        if (IS_ERR(byt->tx_thread)) {
                err = PTR_ERR(byt->tx_thread);
@@ -907,7 +906,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
        byt->dsp = sst_dsp_new(dev, &byt_dev, pdata);
        if (byt->dsp == NULL) {
                err = -ENODEV;
-                goto err_free_msg;
+                goto dsp_err;
        }
        /* keep the DSP in reset state for base FW loading */
@@ -940,6 +939,8 @@ boot_err:
        sst_fw_free(byt_sst_fw);
 fw_err:
        sst_dsp_free(byt->dsp);
+dsp_err:
+        kthread_stop(byt->tx_thread);
 err_free_msg:
        kfree(byt->msg);
@@ -954,6 +955,7 @@ void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata)
        sst_dsp_reset(byt->dsp);
        sst_fw_free_all(byt->dsp);
        sst_dsp_free(byt->dsp);
+        kthread_stop(byt->tx_thread);
        kfree(byt->msg);
 }
 EXPORT_SYMBOL_GPL(sst_byt_dsp_free);
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 3af38576e91e..8eab97368ea7 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -180,6 +180,7 @@ static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
+                pcm_data->hw_ptr = 0;
                sst_byt_stream_start(byt, pcm_data->stream, 0);
                break;
        case SNDRV_PCM_TRIGGER_RESUME:
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index e7996b39a484..434236343ddf 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/list.h>
 #include <linux/platform_device.h>
 #include <linux/kthread.h>
 #include <linux/firmware.h>
@@ -1730,17 +1729,17 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
        ret = msg_empty_list_init(hsw);
        if (ret < 0)
-                goto list_err;
+                return -ENOMEM;
        /* start the IPC message thread */
        init_kthread_worker(&hsw->kworker);
        hsw->tx_thread = kthread_run(kthread_worker_fn,
-                                           &hsw->kworker,
+                                           &hsw->kworker, "%s",
                                           dev_name(hsw->dev));
        if (IS_ERR(hsw->tx_thread)) {
                ret = PTR_ERR(hsw->tx_thread);
                dev_err(hsw->dev, "error: failed to create message TX task\n");
-                goto list_err;
+                goto err_free_msg;
        }
        init_kthread_work(&hsw->kwork, ipc_tx_msgs);
@@ -1750,7 +1749,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
        hsw->dsp = sst_dsp_new(dev, &hsw_dev, pdata);
        if (hsw->dsp == NULL) {
                ret = -ENODEV;
-                goto list_err;
+                goto dsp_err;
        }
        /* keep the DSP in reset state for base FW loading */
@@ -1794,8 +1793,11 @@ boot_err:
        sst_fw_free(hsw_sst_fw);
 fw_err:
        sst_dsp_free(hsw->dsp);
+dsp_err:
+        kthread_stop(hsw->tx_thread);
+err_free_msg:
        kfree(hsw->msg);
-list_err:
        return ret;
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_init);
@@ -1808,6 +1810,7 @@ void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata)
        sst_fw_free_all(hsw->dsp);
        sst_dsp_free(hsw->dsp);
        kfree(hsw->scratch);
+        kthread_stop(hsw->tx_thread);
        kfree(hsw->msg);
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_free);
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index ce27b507d5ef..058efb17c568 100644
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index bb243c663e6b..1f41951d8b7f 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -527,6 +527,15 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int ams_delta_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&ams_delta_hook_switch,
+                        ARRAY_SIZE(ams_delta_hook_switch_gpios),
+                        ams_delta_hook_switch_gpios);
+        return 0;
+}
 /* DAI glue - connects codec <--> CPU */
 static struct snd_soc_dai_link ams_delta_dai_link = {
        .name = "CX20442",
@@ -543,6 +552,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
 static struct snd_soc_card ams_delta_audio_card = {
        .name = "AMS_DELTA",
        .owner = THIS_MODULE,
+        .remove = ams_delta_card_remove,
        .dai_link = &ams_delta_dai_link,
        .num_links = 1,
@@ -579,10 +589,6 @@ static int ams_delta_remove(struct platform_device *pdev)
                dev_warn(&pdev->dev,
                        "failed to unregister V253 line discipline\n");
-        snd_soc_jack_free_gpios(&ams_delta_hook_switch,
-                        ARRAY_SIZE(ams_delta_hook_switch_gpios),
-                        ams_delta_hook_switch_gpios);
        snd_soc_unregister_card(card);
        card->dev = NULL;
        return 0;
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 53da041896c4..6925d7141215 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -40,9 +40,9 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
+#include <sound/omap-pcm.h>
 #include "omap-dmic.h"
-#include "omap-pcm.h"
 struct omap_dmic {
        struct device *dev;
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 537a1ec8ad61..eb9c39299f81 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -34,9 +34,9 @@
 #include <sound/asoundef.h>
 #include <sound/dmaengine_pcm.h>
 #include <video/omapdss.h>
+#include <sound/omap-pcm.h>
 #include "omap-hdmi.h"
-#include "omap-pcm.h"
 #define DRV_NAME "omap-hdmi-audio-dai"
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 71d226626f7c..efe2cd699b77 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -34,11 +34,11 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
+#include <sound/omap-pcm.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 #define OMAP_MCBSP_RATES        (SNDRV_PCM_RATE_8000_96000)
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index d8ebb52645a9..f0e2ebeab02b 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,9 +40,9 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
+#include <sound/omap-pcm.h>
 #include "omap-mcpdm.h"
-#include "omap-pcm.h"
 struct mcpdm_link_config {
        u32 link_mask; /* channel mask for the direction */
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 64141db311b2..b4e282871658 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -231,6 +231,19 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        return ret;
 }
+static int omap_twl4030_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_card *card = rtd->card;
+        struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
+        if (priv->jack_detect > 0)
+                snd_soc_jack_free_gpios(&priv->hs_jack,
+                                        ARRAY_SIZE(hs_jack_gpios),
+                                        hs_jack_gpios);
+        return 0;
+}
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
        {
@@ -258,6 +271,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
 /* Audio machine driver */
 static struct snd_soc_card omap_twl4030_card = {
        .owner = THIS_MODULE,
+        .remove = omap_twl4030_card_remove,
        .dai_link = omap_twl4030_dai_links,
        .num_links = ARRAY_SIZE(omap_twl4030_dai_links),
@@ -353,19 +367,6 @@ static int omap_twl4030_probe(struct platform_device *pdev)
        return 0;
 }
-static int omap_twl4030_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
-        struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
-        if (priv->jack_detect > 0)
-                snd_soc_jack_free_gpios(&priv->hs_jack,
-                                        ARRAY_SIZE(hs_jack_gpios),
-                                        hs_jack_gpios);
-        return 0;
-}
 static const struct of_device_id omap_twl4030_of_match[] = {
        {.compatible = "ti,omap-twl4030", },
        { },
@@ -380,7 +381,6 @@ static struct platform_driver omap_twl4030_driver = {
                .of_match_table = omap_twl4030_of_match,
        },
        .probe = omap_twl4030_probe,
-        .remove = omap_twl4030_remove,
 };
 module_platform_driver(omap_twl4030_driver);
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 6951dc812055..47a10290535b 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -334,6 +334,14 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
        return err;
 }
+static int rx51_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
+                                rx51_av_jack_gpios);
+        return 0;
+}
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link rx51_dai[] = {
        {
@@ -368,6 +376,7 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {
 static struct snd_soc_card rx51_sound_card = {
        .name = "RX-51",
        .owner = THIS_MODULE,
+        .remove = rx51_card_remove,
        .dai_link = rx51_dai,
        .num_links = ARRAY_SIZE(rx51_dai),
        .aux_dev = rx51_aux_dev,
@@ -499,14 +508,6 @@ static int rx51_soc_probe(struct platform_device *pdev)
        return 0;
 }
-static int rx51_soc_remove(struct platform_device *pdev)
-{
-        snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
-                                rx51_av_jack_gpios);
-        return 0;
-}
 #if defined(CONFIG_OF)
 static const struct of_device_id rx51_audio_of_match[] = {
        { .compatible = "nokia,n900-audio", },
@@ -522,7 +523,6 @@ static struct platform_driver rx51_soc_driver = {
                .of_match_table = of_match_ptr(rx51_audio_of_match),
        },
        .probe = rx51_soc_probe,
-        .remove = rx51_soc_remove,
 };
 module_platform_driver(rx51_soc_driver);
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index dcc9b04bd92c..6b81acaffddd 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -152,6 +152,13 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)
        return err;
 }
+static int hx4700_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio);
+        return 0;
+}
 /* hx4700 digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link hx4700_dai = {
        .name = "ak4641",
@@ -170,6 +177,7 @@ static struct snd_soc_dai_link hx4700_dai = {
 static struct snd_soc_card snd_soc_card_hx4700 = {
        .name                   = "iPAQ hx4700",
        .owner                  = THIS_MODULE,
+        .remove                 = hx4700_card_remove,
        .dai_link               = &hx4700_dai,
        .num_links              = 1,
        .dapm_widgets           = hx4700_dapm_widgets,
@@ -206,7 +214,6 @@ static int hx4700_audio_probe(struct platform_device *pdev)
 static int hx4700_audio_remove(struct platform_device *pdev)
 {
-        snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio);
        snd_soc_unregister_card(&snd_soc_card_hx4700);
        gpio_set_value(GPIO92_HX4700_HP_DRIVER, 0);
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 9b19ee70291f..199a8b377553 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -808,6 +808,7 @@ static const struct snd_soc_component_driver pxa_ssp_component = {
 #ifdef CONFIG_OF
 static const struct of_device_id pxa_ssp_of_ids[] = {
        { .compatible = "mrvl,pxa-ssp-dai" },
+        {}
 };
 #endif
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 9f2fb69dbaae..720357f11a7f 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -189,6 +189,14 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int h1940_uda1380_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
+                hp_jack_gpios);
+        return 0;
+}
 /* s3c24xx digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link h1940_uda1380_dai[] = {
        {
@@ -206,6 +214,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
 static struct snd_soc_card h1940_asoc = {
        .name = "h1940",
        .owner = THIS_MODULE,
+        .remove = h1940_uda1380_card_remove,
        .dai_link = h1940_uda1380_dai,
        .num_links = ARRAY_SIZE(h1940_uda1380_dai),
@@ -257,8 +266,6 @@ err_out:
 static void __exit h1940_exit(void)
 {
        platform_device_unregister(s3c24xx_snd_device);
-        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
-                hp_jack_gpios);
        gpio_free(S3C_GPIO_END + 9);
 }
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 07ff3e7cb890..2ac76fa3e742 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -488,7 +488,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                        clk_id = 1;
                if (!any_active(i2s)) {
-                        if (i2s->op_clk) {
+                        if (i2s->op_clk && !IS_ERR(i2s->op_clk)) {
                                if ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||
                                        (!clk_id && (mod & MOD_IMS_SYSMUX))) {
                                        clk_disable_unprepare(i2s->op_clk);
@@ -506,6 +506,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                        else
                                i2s->op_clk = clk_get(&i2s->pdev->dev,
                                                "i2s_opclk0");
+                        if (WARN_ON(IS_ERR(i2s->op_clk)))
+                                return PTR_ERR(i2s->op_clk);
                        clk_prepare_enable(i2s->op_clk);
                        i2s->rclk_srcrate = clk_get_rate(i2s->op_clk);
@@ -672,8 +676,8 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
        if (is_manager(i2s))
                mod &= ~MOD_BLC_MASK;
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        case 8:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_8BIT;
                else
@@ -681,7 +685,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                if (is_manager(i2s))
                        mod |= MOD_BLC_8BIT;
                break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_16BIT;
                else
@@ -689,7 +693,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                if (is_manager(i2s))
                        mod |= MOD_BLC_16BIT;
                break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_24BIT;
                else
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index a3c9c9cba3b0..4c5f97fe45c8 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -283,8 +283,8 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream,
        dev_dbg(pcm->dev, "Entered %s\n", __func__);
        /* Strictly check for sample size */
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                break;
        default:
                return -EINVAL;
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 5b3e504d3a32..192aa9fc102f 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -31,6 +31,7 @@
 #include "s3c24xx-i2s.h"
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd);
+static int rx1950_uda1380_card_remove(struct snd_soc_pcm_runtime *rtd);
 static int rx1950_startup(struct snd_pcm_substream *substream);
 static int rx1950_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params);
@@ -116,6 +117,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static struct snd_soc_card rx1950_asoc = {
        .name = "rx1950",
        .owner = THIS_MODULE,
+        .remove = rx1950_uda1380_card_remove,
        .dai_link = rx1950_uda1380_dai,
        .num_links = ARRAY_SIZE(rx1950_uda1380_dai),
@@ -234,6 +236,14 @@ static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int rx1950_uda1380_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
+                hp_jack_gpios);
+        return 0;
+}
 static int __init rx1950_init(void)
 {
        int ret;
@@ -278,8 +288,6 @@ err_gpio:
 static void __exit rx1950_exit(void)
 {
        platform_device_unregister(s3c24xx_snd_device);
-        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
-                hp_jack_gpios);
        gpio_free(S3C2410_GPA(1));
 }
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 77a2ae50dc94..0ff4bbe23af3 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -322,13 +322,13 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,
        iismod &= ~S3C64XX_IISMOD_BLC_MASK;
        /* Sample size */
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        case 8:
                iismod |= S3C64XX_IISMOD_BLC_8BIT;
                break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                iismod |= S3C64XX_IISMOD_BLC_24BIT;
                break;
        }
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 843f315dcb3a..08c059be9104 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -120,11 +120,11 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
        iismod = readl(i2s->regs + S3C2412_IISMOD);
        pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        case 8:
                iismod |= S3C2412_IISMOD_8BIT;
                break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                iismod &= ~S3C2412_IISMOD_8BIT;
                break;
        }
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 4a6d206db222..9aba9fb7df0e 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -248,12 +248,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
        iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
        pr_debug("hw_params r: IISMOD: %x\n", iismod);
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        case 8:
                iismod &= ~S3C2410_IISMOD_16BIT;
                dma_data->dma_size = 1;
                break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                iismod |= S3C2410_IISMOD_16BIT;
                dma_data->dma_size = 2;
                break;
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
index df55db5d3554..271a904277a1 100644
--- a/sound/soc/samsung/smartq_wm8987.c
+++ b/sound/soc/samsung/smartq_wm8987.c
@@ -182,6 +182,14 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
        return err;
 }
+static int smartq_wm8987_card_remove(struct snd_soc_pcm_runtime *rtd)
+{
+        snd_soc_jack_free_gpios(&smartq_jack, ARRAY_SIZE(smartq_jack_gpios),
+                                smartq_jack_gpios);
+        return 0;
+}
 static struct snd_soc_dai_link smartq_dai[] = {
        {
                .name           = "wm8987",
@@ -198,6 +206,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
 static struct snd_soc_card snd_soc_smartq = {
        .name = "SmartQ",
        .owner = THIS_MODULE,
+        .remove = smartq_wm8987_card_remove,
        .dai_link = smartq_dai,
        .num_links = ARRAY_SIZE(smartq_dai),
@@ -259,8 +268,6 @@ err_unregister_device:
 static void __exit smartq_exit(void)
 {
        gpio_free(S3C64XX_GPK(12));
-        snd_soc_jack_free_gpios(&smartq_jack, ARRAY_SIZE(smartq_jack_gpios),
-                                smartq_jack_gpios);
        platform_device_unregister(smartq_snd_device);
 }
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 7a16b32ed673..b1a519f83b29 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -37,13 +37,11 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
        unsigned int pll_out;
        int bfs, rfs, ret;
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_U8:
+        case 8:
-        case SNDRV_PCM_FORMAT_S8:
                bfs = 16;
                break;
-        case SNDRV_PCM_FORMAT_U16_LE:
+        case 16:
-        case SNDRV_PCM_FORMAT_S16_LE:
                bfs = 32;
                break;
        default:
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index fc25cc00f0f2..3d6272a8cad2 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -57,7 +57,7 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
        int ret;
        /* AIF1CLK should be >=3MHz for optimal performance */
-        if (params_format(params) == SNDRV_PCM_FORMAT_S24_LE)
+        if (params_width(params) == 24)
                pll_out = params_rate(params) * 384;
        else if (params_rate(params) == 8000 || params_rate(params) == 11025)
                pll_out = params_rate(params) * 512;
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index e93a93e296f4..d9ffc48fce5e 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -211,8 +211,8 @@ static int spdif_hw_params(struct snd_pcm_substream *substream,
        con |= CON_PCM_DATA;
        con &= ~CON_PCM_MASK;
-        switch (params_format(params)) {
+        switch (params_width(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                con |= CON_PCM_16BIT;
                break;
        default:
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 964463dada87..91880156e1ae 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -255,11 +255,81 @@ int rsnd_dma_available(struct rsnd_dma *dma)
        return !!dma->chan;
 }
+#define DMA_NAME_SIZE 16
+#define MOD_MAX 4 /* MEM/SSI/SRC/DVC */
+static int _rsnd_dma_of_name(char *dma_name, struct rsnd_mod *mod)
+{
+        if (mod)
+                return snprintf(dma_name, DMA_NAME_SIZE / 2, "%s%d",
+                         rsnd_mod_name(mod), rsnd_mod_id(mod));
+        else
+                return snprintf(dma_name, DMA_NAME_SIZE / 2, "mem");
+}
+static void rsnd_dma_of_name(struct rsnd_dma *dma,
+                             int is_play, char *dma_name)
+{
+        struct rsnd_mod *this = rsnd_dma_to_mod(dma);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(this);
+        struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
+        struct rsnd_mod *src = rsnd_io_to_mod_src(io);
+        struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
+        struct rsnd_mod *mod[MOD_MAX];
+        struct rsnd_mod *src_mod, *dst_mod;
+        int i, index;
+        for (i = 0; i < MOD_MAX; i++)
+                mod[i] = NULL;
+        /*
+         * in play case...
+         *
+         * src -> dst
+         *
+         * mem -> SSI
+         * mem -> SRC -> SSI
+         * mem -> SRC -> DVC -> SSI
+         */
+        mod[0] = NULL; /* for "mem" */
+        index = 1;
+        for (i = 1; i < MOD_MAX; i++) {
+                if (!src) {
+                        mod[i] = ssi;
+                        break;
+                } else if (!dvc) {
+                        mod[i] = src;
+                        src = NULL;
+                } else {
+                        mod[i] = dvc;
+                        dvc = NULL;
+                }
+                if (mod[i] == this)
+                        index = i;
+        }
+        if (is_play) {
+                src_mod = mod[index - 1];
+                dst_mod = mod[index];
+        } else {
+                src_mod = mod[index];
+                dst_mod = mod[index + 1];
+        }
+        index = 0;
+        index = _rsnd_dma_of_name(dma_name + index, src_mod);
+        *(dma_name + index++) = '_';
+        index = _rsnd_dma_of_name(dma_name + index, dst_mod);
+}
 int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
                  int is_play, int id)
 {
        struct device *dev = rsnd_priv_to_dev(priv);
        struct dma_slave_config cfg;
+        char dma_name[DMA_NAME_SIZE];
        dma_cap_mask_t mask;
        int ret;
@@ -271,18 +341,23 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
        dma_cap_zero(mask);
        dma_cap_set(DMA_SLAVE, mask);
+        if (dev->of_node)
+                rsnd_dma_of_name(dma, is_play, dma_name);
+        else
+                snprintf(dma_name, DMA_NAME_SIZE,
+                         is_play ? "tx" : "rx");
+        dev_dbg(dev, "dma name : %s\n", dma_name);
        dma->chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
                                                     (void *)id, dev,
-                                                     is_play ? "tx" : "rx");
+                                                     dma_name);
        if (!dma->chan) {
                dev_err(dev, "can't get dma channel\n");
                return -EIO;
        }
-        cfg.slave_id    = id;
+        rsnd_gen_dma_addr(priv, dma, &cfg, is_play, id);
-        cfg.dst_addr    = 0; /* use default addr when playback */
-        cfg.src_addr    = 0; /* use default addr when capture */
-        cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
        ret = dmaengine_slave_config(dma->chan, &cfg);
        if (ret < 0)
@@ -956,7 +1031,7 @@ static int rsnd_probe(struct platform_device *pdev)
                return -ENODEV;
        }
-        priv->dev       = dev;
+        priv->pdev      = pdev;
        priv->info      = info;
        spin_lock_init(&priv->lock);
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 74769b1be005..ed0007006899 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -13,6 +13,9 @@
 #define RSND_DVC_NAME_SIZE      16
 #define RSND_DVC_VOLUME_MAX     100
 #define RSND_DVC_VOLUME_NUM     2
+#define DVC_NAME "dvc"
 struct rsnd_dvc {
        struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
        struct rsnd_mod mod;
@@ -43,6 +46,17 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
        rsnd_mod_write(mod, DVC_VOL1R, vol[1]);
 }
+static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
+                               struct rsnd_dai *rdai)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        dev_dbg(dev, "%s (Gen2) is probed\n", rsnd_mod_name(mod));
+        return 0;
+}
 static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
                         struct rsnd_dai *rdai)
 {
@@ -208,7 +222,8 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
 }
 static struct rsnd_mod_ops rsnd_dvc_ops = {
-        .name           = "dvc (gen2)",
+        .name           = DVC_NAME,
+        .probe          = rsnd_dvc_probe_gen2,
        .init           = rsnd_dvc_init,
        .quit           = rsnd_dvc_quit,
        .start          = rsnd_dvc_start,
@@ -255,7 +270,8 @@ int rsnd_dvc_probe(struct platform_device *pdev,
        priv->dvc       = dvc;
        for_each_rsnd_dvc(dvc, priv, i) {
-                snprintf(name, RSND_DVC_NAME_SIZE, "dvc.%d", i);
+                snprintf(name, RSND_DVC_NAME_SIZE, "%s.%d",
+                         DVC_NAME, i);
                clk = devm_clk_get(dev, name);
                if (IS_ERR(clk))
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index a1583b57bf8d..1dd2b7d38c2c 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -156,6 +156,101 @@ static int rsnd_gen_regmap_init(struct rsnd_priv *priv,
 }
 /*
+ *      DMA read/write register offset
+ *
+ *      RSND_xxx_I_N    for Audio DMAC input
+ *      RSND_xxx_O_N    for Audio DMAC output
+ *      RSND_xxx_I_P    for Audio DMAC peri peri input
+ *      RSND_xxx_O_P    for Audio DMAC peri peri output
+ *
+ *      ex) R-Car H2 case
+ *            mod        / DMAC in    / DMAC out   / DMAC PP in / DMAC pp out
+ *      SSI : 0xec541000 / 0xec241008 / 0xec24100c / 0xec400000 / 0xec400000
+ *      SCU : 0xec500000 / 0xec000000 / 0xec004000 / 0xec300000 / 0xec304000
+ *      CMD : 0xec500000 / 0xec008000                             0xec308000
+ */
+#define RDMA_SSI_I_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0x8)
+#define RDMA_SSI_O_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0xc)
+#define RDMA_SSI_I_P(addr, i)   (addr ##_reg - 0x00141000 + (0x1000 * i))
+#define RDMA_SSI_O_P(addr, i)   (addr ##_reg - 0x00141000 + (0x1000 * i))
+#define RDMA_SRC_I_N(addr, i)   (addr ##_reg - 0x00500000 + (0x400 * i))
+#define RDMA_SRC_O_N(addr, i)   (addr ##_reg - 0x004fc000 + (0x400 * i))
+#define RDMA_SRC_I_P(addr, i)   (addr ##_reg - 0x00200000 + (0x400 * i))
+#define RDMA_SRC_O_P(addr, i)   (addr ##_reg - 0x001fc000 + (0x400 * i))
+#define RDMA_CMD_O_N(addr, i)   (addr ##_reg - 0x004f8000 + (0x400 * i))
+#define RDMA_CMD_O_P(addr, i)   (addr ##_reg - 0x001f8000 + (0x400 * i))
+void rsnd_gen_dma_addr(struct rsnd_priv *priv,
+                       struct rsnd_dma *dma,
+                       struct dma_slave_config *cfg,
+                       int is_play, int slave_id)
+{
+        struct platform_device *pdev = rsnd_priv_to_pdev(priv);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        dma_addr_t ssi_reg = platform_get_resource(pdev,
+                                IORESOURCE_MEM, RSND_GEN2_SSI)->start;
+        dma_addr_t src_reg = platform_get_resource(pdev,
+                                IORESOURCE_MEM, RSND_GEN2_SCU)->start;
+        int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
+        int use_src = !!rsnd_io_to_mod_src(io);
+        int use_dvc = !!rsnd_io_to_mod_dvc(io);
+        int id = rsnd_mod_id(mod);
+        struct dma_addr {
+                dma_addr_t src_addr;
+                dma_addr_t dst_addr;
+        } dma_addrs[2][2][3] = {
+                { /* SRC */
+                        /* Capture */
+                        {{ 0,                           0 },
+                         { RDMA_SRC_O_N(src, id),       0 },
+                         { RDMA_CMD_O_N(src, id),       0 }},
+                        /* Playback */
+                        {{ 0,                           0, },
+                         { 0,                           RDMA_SRC_I_N(src, id) },
+                         { 0,                           RDMA_SRC_I_N(src, id) }}
+                }, { /* SSI */
+                        /* Capture */
+                        {{ RDMA_SSI_O_N(ssi, id),       0 },
+                         { RDMA_SSI_O_P(ssi, id),       RDMA_SRC_I_P(src, id) },
+                         { RDMA_SSI_O_P(ssi, id),       RDMA_SRC_I_P(src, id) }},
+                        /* Playback */
+                        {{ 0,                           RDMA_SSI_I_N(ssi, id) },
+                         { RDMA_SRC_O_P(src, id),       RDMA_SSI_I_P(ssi, id) },
+                         { RDMA_CMD_O_P(src, id),       RDMA_SSI_I_P(ssi, id) }}
+                }
+        };
+        cfg->slave_id   = slave_id;
+        cfg->src_addr   = 0;
+        cfg->dst_addr   = 0;
+        cfg->direction  = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
+        /*
+         * gen1 uses default DMA addr
+         */
+        if (rsnd_is_gen1(priv))
+                return;
+        /* it shouldn't happen */
+        if (use_dvc & !use_src) {
+                dev_err(dev, "DVC is selected without SRC\n");
+                return;
+        }
+        cfg->src_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].src_addr;
+        cfg->dst_addr = dma_addrs[is_ssi][is_play][use_src + use_dvc].dst_addr;
+        dev_dbg(dev, "dma%d addr - src : %x / dst : %x\n",
+                id, cfg->src_addr, cfg->dst_addr);
+}
+/*
 *              Gen2
 */
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 5aa790170b01..39d98af5ee05 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -281,6 +281,11 @@ int rsnd_gen_probe(struct platform_device *pdev,
 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
                               struct rsnd_mod *mod,
                               enum rsnd_reg reg);
+void rsnd_gen_dma_addr(struct rsnd_priv *priv,
+                       struct rsnd_dma *dma,
+                       struct dma_slave_config *cfg,
+                       int is_play,  int slave_id);
 #define rsnd_is_gen1(s)         (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
 #define rsnd_is_gen2(s)         (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
@@ -317,7 +322,7 @@ struct rsnd_of_data {
 struct rsnd_priv {
-        struct device *dev;
+        struct platform_device *pdev;
        struct rcar_snd_info *info;
        spinlock_t lock;
@@ -357,7 +362,8 @@ struct rsnd_priv {
        int rdai_nr;
 };
-#define rsnd_priv_to_dev(priv)  ((priv)->dev)
+#define rsnd_priv_to_pdev(priv) ((priv)->pdev)
+#define rsnd_priv_to_dev(priv)  (&(rsnd_priv_to_pdev(priv)->dev))
 #define rsnd_priv_to_info(priv) ((priv)->info)
 #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags)
 #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags)
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index e3b078e7c3aa..200eda019bc7 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -10,6 +10,8 @@
 */
 #include "rsnd.h"
+#define SRC_NAME "src"
 struct rsnd_src {
        struct rsnd_src_platform_info *info; /* rcar_snd.h */
        struct rsnd_mod mod;
@@ -268,10 +270,6 @@ static int rsnd_src_stop(struct rsnd_mod *mod,
        return 0;
 }
-static struct rsnd_mod_ops rsnd_src_non_ops = {
-        .name   = "src (non)",
-};
 /*
 *              Gen1 functions
 */
@@ -393,6 +391,17 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
        return 0;
 }
+static int rsnd_src_probe_gen1(struct rsnd_mod *mod,
+                              struct rsnd_dai *rdai)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        dev_dbg(dev, "%s (Gen1) is probed\n", rsnd_mod_name(mod));
+        return 0;
+}
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
                              struct rsnd_dai *rdai)
 {
@@ -438,7 +447,8 @@ static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
 }
 static struct rsnd_mod_ops rsnd_src_gen1_ops = {
-        .name   = "sru (gen1)",
+        .name   = SRC_NAME,
+        .probe  = rsnd_src_probe_gen1,
        .init   = rsnd_src_init_gen1,
        .quit   = rsnd_src_quit,
        .start  = rsnd_src_start_gen1,
@@ -502,6 +512,8 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
        if (ret < 0)
                dev_err(dev, "SRC DMA failed\n");
+        dev_dbg(dev, "%s (Gen2) is probed\n", rsnd_mod_name(mod));
        return ret;
 }
@@ -562,7 +574,7 @@ static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
 }
 static struct rsnd_mod_ops rsnd_src_gen2_ops = {
-        .name   = "src (gen2)",
+        .name   = SRC_NAME,
        .probe  = rsnd_src_probe_gen2,
        .remove = rsnd_src_remove_gen2,
        .init   = rsnd_src_init_gen2,
@@ -598,18 +610,21 @@ static void rsnd_of_parse_src(struct platform_device *pdev,
        nr = of_get_child_count(src_node);
        if (!nr)
-                return;
+                goto rsnd_of_parse_src_end;
        src_info = devm_kzalloc(dev,
                                sizeof(struct rsnd_src_platform_info) * nr,
                                GFP_KERNEL);
        if (!src_info) {
                dev_err(dev, "src info allocation error\n");
-                return;
+                goto rsnd_of_parse_src_end;
        }
        info->src_info          = src_info;
        info->src_info_nr       = nr;
+rsnd_of_parse_src_end:
+        of_node_put(src_node);
 }
 int rsnd_src_probe(struct platform_device *pdev,
@@ -624,6 +639,16 @@ int rsnd_src_probe(struct platform_device *pdev,
        char name[RSND_SRC_NAME_SIZE];
        int i, nr;
+        ops = NULL;
+        if (rsnd_is_gen1(priv))
+                ops = &rsnd_src_gen1_ops;
+        if (rsnd_is_gen2(priv))
+                ops = &rsnd_src_gen2_ops;
+        if (!ops) {
+                dev_err(dev, "unknown Generation\n");
+                return -EIO;
+        }
        rsnd_of_parse_src(pdev, of_data, priv);
        /*
@@ -643,7 +668,8 @@ int rsnd_src_probe(struct platform_device *pdev,
        priv->src       = src;
        for_each_rsnd_src(src, priv, i) {
-                snprintf(name, RSND_SRC_NAME_SIZE, "src.%d", i);
+                snprintf(name, RSND_SRC_NAME_SIZE, "%s.%d",
+                         SRC_NAME, i);
                clk = devm_clk_get(dev, name);
                if (IS_ERR(clk))
@@ -652,12 +678,6 @@ int rsnd_src_probe(struct platform_device *pdev,
                src->info = &info->src_info[i];
                src->clk = clk;
-                ops = &rsnd_src_non_ops;
-                if (rsnd_is_gen1(priv))
-                        ops = &rsnd_src_gen1_ops;
-                if (rsnd_is_gen2(priv))
-                        ops = &rsnd_src_gen2_ops;
                rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);
                dev_dbg(dev, "SRC%d probed\n", i);
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 36654bd4e428..2df723df5d19 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -57,6 +57,8 @@
 */
 #define CONT            (1 << 8)        /* WS Continue Function */
+#define SSI_NAME "ssi"
 struct rsnd_ssi {
        struct clk *clk;
        struct rsnd_ssi_platform_info *info; /* rcar_snd.h */
@@ -373,6 +375,8 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
        if (ret)
                dev_err(dev, "SSI request interrupt failed\n");
+        dev_dbg(dev, "%s (PIO) is probed\n", rsnd_mod_name(mod));
        return ret;
 }
@@ -405,7 +409,7 @@ static int rsnd_ssi_pio_stop(struct rsnd_mod *mod,
 }
 static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
-        .name   = "ssi (pio)",
+        .name   = SSI_NAME,
        .probe  = rsnd_ssi_pio_probe,
        .init   = rsnd_ssi_init,
        .quit   = rsnd_ssi_quit,
@@ -430,6 +434,8 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
        if (ret < 0)
                dev_err(dev, "SSI DMA failed\n");
+        dev_dbg(dev, "%s (DMA) is probed\n", rsnd_mod_name(mod));
        return ret;
 }
@@ -480,7 +486,7 @@ static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
 }
 static struct rsnd_mod_ops rsnd_ssi_dma_ops = {
-        .name   = "ssi (dma)",
+        .name   = SSI_NAME,
        .probe  = rsnd_ssi_dma_probe,
        .remove = rsnd_ssi_dma_remove,
        .init   = rsnd_ssi_init,
@@ -493,7 +499,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops = {
 *              Non SSI
 */
 static struct rsnd_mod_ops rsnd_ssi_non_ops = {
-        .name   = "ssi (non)",
+        .name   = SSI_NAME,
 };
 /*
@@ -554,14 +560,14 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
        nr = of_get_child_count(node);
        if (!nr)
-                return;
+                goto rsnd_of_parse_ssi_end;
        ssi_info = devm_kzalloc(dev,
                                sizeof(struct rsnd_ssi_platform_info) * nr,
                                GFP_KERNEL);
        if (!ssi_info) {
                dev_err(dev, "ssi info allocation error\n");
-                return;
+                goto rsnd_of_parse_ssi_end;
        }
        info->ssi_info          = ssi_info;
@@ -583,7 +589,16 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
                 * irq
                 */
                ssi_info->pio_irq = irq_of_parse_and_map(np, 0);
+                /*
+                 * DMA
+                 */
+                ssi_info->dma_id = of_get_property(np, "pio-transfer", NULL) ?
+                        0 : 1;
        }
+rsnd_of_parse_ssi_end:
+        of_node_put(node);
 }
 int rsnd_ssi_probe(struct platform_device *pdev,
@@ -617,7 +632,8 @@ int rsnd_ssi_probe(struct platform_device *pdev,
        for_each_rsnd_ssi(ssi, priv, i) {
                pinfo = &info->ssi_info[i];
-                snprintf(name, RSND_SSI_NAME_SIZE, "ssi.%d", i);
+                snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d",
+                         SSI_NAME, i);
                clk = devm_clk_get(dev, name);
                if (IS_ERR(clk))
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 3fa77d5f9b75..00e70b6c7da2 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -72,6 +72,9 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)
        reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
+        if (!reg_size)
+                return 0;
        mutex_init(&codec->cache_rw_mutex);
        dev_dbg(codec->dev, "ASoC: Initializing cache for %s codec\n",
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index b903f822d1b2..d0d98810af91 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -14,6 +14,7 @@
 #include <sound/jack.h>
 #include <sound/soc.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
@@ -240,7 +241,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
        int enable;
        int report;
-        enable = gpio_get_value_cansleep(gpio->gpio);
+        enable = gpiod_get_value_cansleep(gpio->desc);
        if (gpio->invert)
                enable = !enable;
@@ -297,31 +298,50 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
        int i, ret;
        for (i = 0; i < count; i++) {
-                if (!gpio_is_valid(gpios[i].gpio)) {
-                        dev_err(jack->codec->dev, "ASoC: Invalid gpio %d\n",
-                                gpios[i].gpio);
-                        ret = -EINVAL;
-                        goto undo;
-                }
                if (!gpios[i].name) {
-                        dev_err(jack->codec->dev, "ASoC: No name for gpio %d\n",
+                        dev_err(jack->codec->dev,
-                                gpios[i].gpio);
+                                "ASoC: No name for gpio at index %d\n", i);
                        ret = -EINVAL;
                        goto undo;
                }
-                ret = gpio_request(gpios[i].gpio, gpios[i].name);
+                if (gpios[i].gpiod_dev) {
-                if (ret)
+                        /* GPIO descriptor */
-                        goto undo;
+                        gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev,
+                                                        gpios[i].name,
+                                                        gpios[i].idx);
+                        if (IS_ERR(gpios[i].desc)) {
+                                ret = PTR_ERR(gpios[i].desc);
+                                dev_err(gpios[i].gpiod_dev,
+                                        "ASoC: Cannot get gpio at index %d: %d",
+                                        i, ret);
+                                goto undo;
+                        }
+                } else {
+                        /* legacy GPIO number */
+                        if (!gpio_is_valid(gpios[i].gpio)) {
+                                dev_err(jack->codec->dev,
+                                        "ASoC: Invalid gpio %d\n",
+                                        gpios[i].gpio);
+                                ret = -EINVAL;
+                                goto undo;
+                        }
+                        ret = gpio_request(gpios[i].gpio, gpios[i].name);
+                        if (ret)
+                                goto undo;
+                        gpios[i].desc = gpio_to_desc(gpios[i].gpio);
+                }
-                ret = gpio_direction_input(gpios[i].gpio);
+                ret = gpiod_direction_input(gpios[i].desc);
                if (ret)
                        goto err;
                INIT_DELAYED_WORK(&gpios[i].work, gpio_work);
                gpios[i].jack = jack;
-                ret = request_any_context_irq(gpio_to_irq(gpios[i].gpio),
+                ret = request_any_context_irq(gpiod_to_irq(gpios[i].desc),
                                              gpio_handler,
                                              IRQF_TRIGGER_RISING |
                                              IRQF_TRIGGER_FALLING,
@@ -331,15 +351,15 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                        goto err;
                if (gpios[i].wake) {
-                        ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
+                        ret = irq_set_irq_wake(gpiod_to_irq(gpios[i].desc), 1);
                        if (ret != 0)
-                                dev_err(jack->codec->dev, "ASoC: "
+                                dev_err(jack->codec->dev,
-                                  "Failed to mark GPIO %d as wake source: %d\n",
+                                        "ASoC: Failed to mark GPIO at index %d as wake source: %d\n",
-                                        gpios[i].gpio, ret);
+                                        i, ret);
                }
                /* Expose GPIO value over sysfs for diagnostic purposes */
-                gpio_export(gpios[i].gpio, false);
+                gpiod_export(gpios[i].desc, false);
                /* Update initial jack status */
                schedule_delayed_work(&gpios[i].work,
@@ -358,6 +378,30 @@ undo:
 EXPORT_SYMBOL_GPL(snd_soc_jack_add_gpios);
 /**
+ * snd_soc_jack_add_gpiods - Associate GPIO descriptor pins with an ASoC jack
+ *
+ * @gpiod_dev: GPIO consumer device
+ * @jack:      ASoC jack
+ * @count:     number of pins
+ * @gpios:     array of gpio pins
+ *
+ * This function will request gpio, set data direction and request irq
+ * for each gpio in the array.
+ */
+int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
+                            struct snd_soc_jack *jack,
+                            int count, struct snd_soc_jack_gpio *gpios)
+{
+        int i;
+        for (i = 0; i < count; i++)
+                gpios[i].gpiod_dev = gpiod_dev;
+        return snd_soc_jack_add_gpios(jack, count, gpios);
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_add_gpiods);
+/**
 * snd_soc_jack_free_gpios - Release GPIO pins' resources of an ASoC jack
 *
 * @jack:  ASoC jack
@@ -372,10 +416,10 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
        int i;
        for (i = 0; i < count; i++) {
-                gpio_unexport(gpios[i].gpio);
+                gpiod_unexport(gpios[i].desc);
-                free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
+                free_irq(gpiod_to_irq(gpios[i].desc), &gpios[i]);
                cancel_delayed_work_sync(&gpios[i].work);
-                gpio_free(gpios[i].gpio);
+                gpiod_put(gpios[i].desc);
                gpios[i].jack = NULL;
        }
 }
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index c61ea3a1030f..02734bd4f09b 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -125,6 +125,18 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int tegra_alc5632_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, 1,
+                                        &tegra_alc5632_hp_jack_gpio);
+        }
+        return 0;
+}
 static struct snd_soc_dai_link tegra_alc5632_dai = {
        .name = "ALC5632",
        .stream_name = "ALC5632 PCM",
@@ -139,6 +151,7 @@ static struct snd_soc_dai_link tegra_alc5632_dai = {
 static struct snd_soc_card snd_soc_tegra_alc5632 = {
        .name = "tegra-alc5632",
        .owner = THIS_MODULE,
+        .remove = tegra_alc5632_card_remove,
        .dai_link = &tegra_alc5632_dai,
        .num_links = 1,
        .controls = tegra_alc5632_controls,
@@ -223,9 +236,6 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
        struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
-        snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, 1,
-                                &tegra_alc5632_hp_jack_gpio);
        snd_soc_unregister_card(card);
        tegra_asoc_utils_fini(&machine->util_data);
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index 0283cfb7c031..ce73e1f62c4b 100644
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -145,6 +145,18 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int tegra_max98090_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
+                                        &tegra_max98090_hp_jack_gpio);
+        }
+        return 0;
+}
 static struct snd_soc_dai_link tegra_max98090_dai = {
        .name = "max98090",
        .stream_name = "max98090 PCM",
@@ -158,6 +170,7 @@ static struct snd_soc_dai_link tegra_max98090_dai = {
 static struct snd_soc_card snd_soc_tegra_max98090 = {
        .name = "tegra-max98090",
        .owner = THIS_MODULE,
+        .remove = tegra_max98090_card_remove,
        .dai_link = &tegra_max98090_dai,
        .num_links = 1,
        .controls = tegra_max98090_controls,
@@ -241,9 +254,6 @@ static int tegra_max98090_remove(struct platform_device *pdev)
        struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
-        snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
-                                &tegra_max98090_hp_jack_gpio);
        snd_soc_unregister_card(card);
        tegra_asoc_utils_fini(&machine->util_data);
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 4511c5a875ec..4feb16a99e02 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -128,6 +128,18 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
+static int tegra_rt5640_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
+                                        &tegra_rt5640_hp_jack_gpio);
+        }
+        return 0;
+}
 static struct snd_soc_dai_link tegra_rt5640_dai = {
        .name = "RT5640",
        .stream_name = "RT5640 PCM",
@@ -141,6 +153,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
 static struct snd_soc_card snd_soc_tegra_rt5640 = {
        .name = "tegra-rt5640",
        .owner = THIS_MODULE,
+        .remove = tegra_rt5640_card_remove,
        .dai_link = &tegra_rt5640_dai,
        .num_links = 1,
        .controls = tegra_rt5640_controls,
@@ -224,9 +237,6 @@ static int tegra_rt5640_remove(struct platform_device *pdev)
        struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
-        snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
-                                &tegra_rt5640_hp_jack_gpio);
        snd_soc_unregister_card(card);
        tegra_asoc_utils_fini(&machine->util_data);
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 4ac73730d79a..0939661df60b 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -206,6 +206,12 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
        struct snd_soc_pcm_runtime *rtd = &(card->rtd[0]);
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        struct snd_soc_codec *codec = codec_dai->codec;
+        struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack, 1,
+                                        &tegra_wm8903_hp_jack_gpio);
+        }
        wm8903_mic_detect(codec, NULL, 0, 0);
@@ -228,9 +234,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
        .owner = THIS_MODULE,
        .dai_link = &tegra_wm8903_dai,
        .num_links = 1,
        .remove = tegra_wm8903_remove,
        .controls = tegra_wm8903_controls,
        .num_controls = ARRAY_SIZE(tegra_wm8903_controls),
        .dapm_widgets = tegra_wm8903_dapm_widgets,
@@ -368,9 +372,6 @@ static int tegra_wm8903_driver_remove(struct platform_device *pdev)
        struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
-        snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack, 1,
-                                &tegra_wm8903_hp_jack_gpio);
        snd_soc_unregister_card(card);
        tegra_asoc_utils_fini(&machine->util_data);
author	Takashi Iwai <tiwai@suse.de>	2014-06-03 05:51:14 -0400
committer	Takashi Iwai <tiwai@suse.de>	2014-06-03 05:51:14 -0400
commit	8743dcd6639c28204ac03fb3e9db7932e3d85418 (patch)
tree	53b80846cf6731ddb196d522ed2bbf0f76da8344
parent	efd4b76ef789541e7046e873b3546209352cdb59 (diff)
parent	e1d4d3c854f25cff6c6c139588570e124d5e8fa4 (diff)