Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc...
authorMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:44:34 +0000 (12:44 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:44:34 +0000 (12:44 -0700)
Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt [new file with mode: 0644]
sound/soc/codecs/rt5616.c
sound/soc/qcom/apq8016_sbc.c
sound/soc/rockchip/Kconfig
sound/soc/rockchip/Makefile
sound/soc/rockchip/rk3399_gru_sound.c [new file with mode: 0644]
sound/soc/rockchip/rockchip_i2s.c
sound/soc/rockchip/rockchip_spdif.c

index 4812936..d9d8635 100644 (file)
@@ -16,6 +16,24 @@ Required properties:
                                * "spkr-iomux"
 - qcom,model           : Name of the sound card.
 
+- qcom,audio-routing   : A list of the connections between audio components.
+                         Each entry is a pair of strings, the first being the
+                         connection's sink, the second being the connection's
+                         source. Valid names could be power supplies, MicBias
+                         of msm8x16_wcd codec and the jacks on the board:
+
+                         Power supplies:
+                         * MIC BIAS External1
+                         * MIC BIAS External2
+                         * MIC BIAS Internal1
+                         * MIC BIAS Internal2
+
+                         Board connectors:
+                         * Headset Mic
+                         * Secondary Mic",
+                         * DMIC
+                         * Ext Spk
+
 Dai-link subnode properties and subnodes:
 
 Required dai-link subnodes:
@@ -37,6 +55,18 @@ sound: sound {
        reg-names = "mic-iomux", "spkr-iomux";
        qcom,model = "DB410c";
 
+       qcom,audio-routing =
+               "MIC BIAS External1", "Handset Mic",
+               "MIC BIAS Internal2", "Headset Mic",
+               "MIC BIAS External1", "Secondary Mic",
+               "AMIC1", "MIC BIAS External1",
+               "AMIC2", "MIC BIAS Internal2",
+               "AMIC3", "MIC BIAS External1",
+               "DMIC1", "MIC BIAS Internal1",
+               "MIC BIAS Internal1", "Digital Mic1",
+               "DMIC2", "MIC BIAS Internal1",
+               "MIC BIAS Internal1", "Digital Mic2";
+
        /* I2S - Internal codec */
        internal-dai-link@0 {
                cpu { /* PRIMARY */
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
new file mode 100644 (file)
index 0000000..eac91db
--- /dev/null
@@ -0,0 +1,22 @@
+ROCKCHIP with MAX98357A/RT5514/DA7219 codecs on GRU boards
+
+Required properties:
+- compatible: "rockchip,rk3399-gru-sound"
+- rockchip,cpu: The phandle of the Rockchip I2S controller that's
+  connected to the codecs
+- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs
+
+Optional properties:
+- dmic-wakeup-delay-ms : specify delay time (ms) for DMIC ready.
+  If this option is specified, which means it's required dmic need
+  delay for DMIC to ready so that rt5514 can avoid recording before
+  DMIC send valid data
+
+Example:
+
+sound {
+       compatible = "rockchip,rk3399-gru-sound";
+       rockchip,cpu = <&i2s0>;
+       rockchip,codec = <&max98357a &rt5514 &da7219>;
+       dmic-wakeup-delay-ms = <20>;
+};
index e92a149..d1f273b 100644 (file)
@@ -294,8 +294,7 @@ 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),
+static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(bst_tlv,
        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),
@@ -303,7 +302,7 @@ static unsigned int bst_tlv[] = {
        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 rt5616_snd_controls[] = {
        /* Headphone Output Volume */
@@ -1267,14 +1266,14 @@ static int rt5616_resume(struct snd_soc_codec *codec)
 #define RT5616_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
 
-struct snd_soc_dai_ops rt5616_aif_dai_ops = {
+static struct snd_soc_dai_ops rt5616_aif_dai_ops = {
        .hw_params = rt5616_hw_params,
        .set_fmt = rt5616_set_dai_fmt,
        .set_sysclk = rt5616_set_dai_sysclk,
        .set_pll = rt5616_set_dai_pll,
 };
 
-struct snd_soc_dai_driver rt5616_dai[] = {
+static struct snd_soc_dai_driver rt5616_dai[] = {
        {
                .name = "rt5616-aif1",
                .id = RT5616_AIF1,
index 1289543..07f91e9 100644 (file)
@@ -85,6 +85,15 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
                return ERR_PTR(ret);
        }
 
+       /* DAPM routes */
+       if (of_property_read_bool(node, "qcom,audio-routing")) {
+               ret = snd_soc_of_parse_audio_routing(card,
+                                       "qcom,audio-routing");
+               if (ret)
+                       return ERR_PTR(ret);
+       }
+
+
        /* Populate links */
        num_links = of_get_child_count(node);
 
@@ -147,6 +156,15 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
        return data;
 }
 
+static const struct snd_soc_dapm_widget apq8016_sbc_dapm_widgets[] = {
+
+       SND_SOC_DAPM_MIC("Handset Mic", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+       SND_SOC_DAPM_MIC("Secondary Mic", NULL),
+       SND_SOC_DAPM_MIC("Digital Mic1", NULL),
+       SND_SOC_DAPM_MIC("Digital Mic2", NULL),
+};
+
 static int apq8016_sbc_platform_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -159,6 +177,8 @@ static int apq8016_sbc_platform_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        card->dev = dev;
+       card->dapm_widgets = apq8016_sbc_dapm_widgets;
+       card->num_dapm_widgets = ARRAY_SIZE(apq8016_sbc_dapm_widgets);
        data = apq8016_sbc_parse_of(card);
        if (IS_ERR(data)) {
                dev_err(&pdev->dev, "Error resolving dai links: %ld\n",
index f1e0c70..c783f9a 100644 (file)
@@ -41,3 +41,15 @@ config SND_SOC_ROCKCHIP_RT5645
        help
          Say Y or M here if you want to add support for SoC audio on Rockchip
          boards using the RT5645/RT5650 codec, such as Veyron.
+
+config SND_SOC_RK3399_GRU_SOUND
+       tristate "ASoC support multiple codecs for Rockchip RK3399 GRU boards"
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI
+       select SND_SOC_ROCKCHIP_I2S
+       select SND_SOC_MAX98357A
+       select SND_SOC_RT5514
+       select SND_SOC_DA7219
+       select SND_SOC_RT5514_SPI
+       help
+         Say Y or M here if you want to add support multiple codecs for SoC
+         audio on Rockchip RK3399 GRU boards.
index c0bf560..84e5c7c 100644 (file)
@@ -7,6 +7,8 @@ obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o
 
 snd-soc-rockchip-max98090-objs := rockchip_max98090.o
 snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o
+snd-soc-rk3399-gru-sound-objs := rk3399_gru_sound.o
 
 obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o
 obj-$(CONFIG_SND_SOC_ROCKCHIP_RT5645) += snd-soc-rockchip-rt5645.o
+obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
new file mode 100644 (file)
index 0000000..9ed735a
--- /dev/null
@@ -0,0 +1,397 @@
+/*
+ * Rockchip machine ASoC driver for boards using MAX98357A/RT5514/DA7219
+ *
+ * Copyright (c) 2016, ROCKCHIP CORPORATION.  All rights reserved.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/delay.h>
+#include <linux/spi/spi.h>
+#include <linux/input.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include "rockchip_i2s.h"
+#include "../codecs/da7219.h"
+#include "../codecs/da7219-aad.h"
+#include "../codecs/rt5514.h"
+
+#define DRV_NAME "rk3399-gru-sound"
+
+#define SOUND_FS       256
+
+unsigned int rt5514_dmic_delay;
+
+static struct snd_soc_jack rockchip_sound_jack;
+
+static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = {
+       SND_SOC_DAPM_HP("Headphones", NULL),
+       SND_SOC_DAPM_SPK("Speakers", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+       SND_SOC_DAPM_MIC("Int Mic", NULL),
+};
+
+static const struct snd_soc_dapm_route rockchip_dapm_routes[] = {
+       /* Input Lines */
+       {"MIC", NULL, "Headset Mic"},
+       {"DMIC1L", NULL, "Int Mic"},
+       {"DMIC1R", NULL, "Int Mic"},
+
+       /* Output Lines */
+       {"Headphones", NULL, "HPL"},
+       {"Headphones", NULL, "HPR"},
+       {"Speakers", NULL, "Speaker"},
+};
+
+static const struct snd_kcontrol_new rockchip_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Headphones"),
+       SOC_DAPM_PIN_SWITCH("Speakers"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
+       SOC_DAPM_PIN_SWITCH("Int Mic"),
+};
+
+static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream,
+                            struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       unsigned int mclk;
+       int ret;
+
+       /* max98357a supports these sample rates */
+       switch (params_rate(params)) {
+       case 8000:
+       case 16000:
+       case 48000:
+       case 96000:
+               mclk = params_rate(params) * SOUND_FS;
+               break;
+       default:
+               dev_err(rtd->card->dev, "%s() doesn't support this sample rate: %d\n",
+                               __func__, params_rate(params));
+               return -EINVAL;
+       }
+
+       ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0);
+       if (ret) {
+               dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n",
+                               __func__, mclk, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int rockchip_sound_rt5514_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 *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       unsigned int mclk;
+       int ret;
+
+       mclk = params_rate(params) * SOUND_FS;
+
+       ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk,
+                                    SND_SOC_CLOCK_OUT);
+       if (ret < 0) {
+               dev_err(rtd->card->dev, "Can't set cpu clock out %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, RT5514_SCLK_S_MCLK,
+                                    mclk, SND_SOC_CLOCK_IN);
+       if (ret) {
+               dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n",
+                               __func__, params_rate(params) * 512, ret);
+               return ret;
+       }
+
+       /* Wait for DMIC stable */
+       msleep(rt5514_dmic_delay);
+
+       return 0;
+}
+
+static int rockchip_sound_da7219_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 *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       int mclk, ret;
+
+       /* in bypass mode, the mclk has to be one of the frequencies below */
+       switch (params_rate(params)) {
+       case 8000:
+       case 16000:
+       case 24000:
+       case 32000:
+       case 48000:
+       case 64000:
+       case 96000:
+               mclk = 12288000;
+               break;
+       case 11025:
+       case 22050:
+       case 44100:
+       case 88200:
+               mclk = 11289600;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk,
+                                    SND_SOC_CLOCK_OUT);
+       if (ret < 0) {
+               dev_err(codec_dai->dev, "Can't set cpu clock out %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+                                    SND_SOC_CLOCK_IN);
+       if (ret < 0) {
+               dev_err(codec_dai->dev, "Can't set codec clock in %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0);
+       if (ret < 0) {
+               dev_err(codec_dai->dev, "Can't set pll sysclk mclk %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_codec *codec = rtd->codec_dais[0]->codec;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       int ret;
+
+       /* We need default MCLK and PLL settings for the accessory detection */
+       ret = snd_soc_dai_set_sysclk(codec_dai, 0, 12288000,
+                                    SND_SOC_CLOCK_IN);
+       if (ret < 0) {
+               dev_err(codec_dai->dev, "Init can't set codec clock in %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0);
+       if (ret < 0) {
+               dev_err(codec_dai->dev, "Init can't set pll sysclk mclk %d\n", ret);
+               return ret;
+       }
+
+       /* Enable Headset and 4 Buttons Jack detection */
+       ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
+                                   SND_JACK_HEADSET | SND_JACK_LINEOUT |
+                                   SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                   SND_JACK_BTN_2 | SND_JACK_BTN_3,
+                                   &rockchip_sound_jack, NULL, 0);
+
+       if (ret) {
+               dev_err(rtd->card->dev, "New Headset Jack failed! (%d)\n", ret);
+               return ret;
+       }
+
+       snd_jack_set_key(rockchip_sound_jack.jack, SND_JACK_BTN_0, KEY_MEDIA);
+       snd_jack_set_key(
+               rockchip_sound_jack.jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
+       snd_jack_set_key(
+               rockchip_sound_jack.jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
+       snd_jack_set_key(
+               rockchip_sound_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
+
+       da7219_aad_jack_det(codec, &rockchip_sound_jack);
+
+       return 0;
+}
+
+static struct snd_soc_ops rockchip_sound_max98357a_ops = {
+       .hw_params = rockchip_sound_max98357a_hw_params,
+};
+
+static struct snd_soc_ops rockchip_sound_rt5514_ops = {
+       .hw_params = rockchip_sound_rt5514_hw_params,
+};
+
+static struct snd_soc_ops rockchip_sound_da7219_ops = {
+       .hw_params = rockchip_sound_da7219_hw_params,
+};
+
+enum {
+       DAILINK_MAX98357A,
+       DAILINK_RT5514,
+       DAILINK_DA7219,
+       DAILINK_RT5514_DSP,
+};
+
+#define DAILINK_ENTITIES       (DAILINK_DA7219 + 1)
+
+static struct snd_soc_dai_link rockchip_dailinks[] = {
+       [DAILINK_MAX98357A] = {
+               .name = "MAX98357A",
+               .stream_name = "MAX98357A PCM",
+               .codec_dai_name = "HiFi",
+               .ops = &rockchip_sound_max98357a_ops,
+               /* set max98357a as slave */
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_CBS_CFS,
+       },
+       [DAILINK_RT5514] = {
+               .name = "RT5514",
+               .stream_name = "RT5514 PCM",
+               .codec_dai_name = "rt5514-aif1",
+               .ops = &rockchip_sound_rt5514_ops,
+               /* set rt5514 as slave */
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_CBS_CFS,
+       },
+       [DAILINK_DA7219] = {
+               .name = "DA7219",
+               .stream_name = "DA7219 PCM",
+               .codec_dai_name = "da7219-hifi",
+               .init = rockchip_sound_da7219_init,
+               .ops = &rockchip_sound_da7219_ops,
+               /* set da7219 as slave */
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_CBS_CFS,
+       },
+       /* RT5514 DSP for voice wakeup via spi bus */
+       [DAILINK_RT5514_DSP] = {
+               .name = "RT5514 DSP",
+               .stream_name = "Wake on Voice",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+       },
+};
+
+static struct snd_soc_card rockchip_sound_card = {
+       .name = "rk3399-gru-sound",
+       .owner = THIS_MODULE,
+       .dai_link = rockchip_dailinks,
+       .num_links =  ARRAY_SIZE(rockchip_dailinks),
+       .dapm_widgets = rockchip_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets),
+       .dapm_routes = rockchip_dapm_routes,
+       .num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes),
+       .controls = rockchip_controls,
+       .num_controls = ARRAY_SIZE(rockchip_controls),
+};
+
+static int rockchip_sound_match_stub(struct device *dev, void *data)
+{
+       return 1;
+}
+
+static int rockchip_sound_probe(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = &rockchip_sound_card;
+       struct device_node *cpu_node;
+       struct device *dev;
+       struct device_driver *drv;
+       int i, ret;
+
+       cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0);
+       if (!cpu_node) {
+               dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < DAILINK_ENTITIES; i++) {
+               rockchip_dailinks[i].platform_of_node = cpu_node;
+               rockchip_dailinks[i].cpu_of_node = cpu_node;
+
+               rockchip_dailinks[i].codec_of_node =
+                       of_parse_phandle(pdev->dev.of_node, "rockchip,codec", i);
+               if (!rockchip_dailinks[i].codec_of_node) {
+                       dev_err(&pdev->dev,
+                               "Property[%d] 'rockchip,codec' missing or invalid\n", i);
+                       return -EINVAL;
+               }
+       }
+
+       /**
+        * To acquire the spi driver of the rt5514 and set the dai-links names
+        * for soc_bind_dai_link
+        */
+       drv = driver_find("rt5514", &spi_bus_type);
+       if (!drv) {
+               dev_err(&pdev->dev, "Can not find the rt5514 driver at the spi bus\n");
+               return -EINVAL;
+       }
+
+       dev = driver_find_device(drv, NULL, NULL, rockchip_sound_match_stub);
+       if (!dev) {
+               dev_err(&pdev->dev, "Can not find the rt5514 device\n");
+               return -ENODEV;
+       }
+
+       /* Set DMIC delay */
+       ret = device_property_read_u32(&pdev->dev, "dmic-delay",
+                                       &rt5514_dmic_delay);
+       if (ret) {
+               rt5514_dmic_delay = 0;
+               dev_dbg(&pdev->dev,
+                       "no optional property 'dmic-delay' found, default: no delay\n");
+       }
+
+       rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
+       rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
+       rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
+
+       card->dev = &pdev->dev;
+       platform_set_drvdata(pdev, card);
+
+       ret = devm_snd_soc_register_card(&pdev->dev, card);
+       if (ret)
+               dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
+                       __func__, ret);
+
+       return ret;
+}
+
+static const struct of_device_id rockchip_sound_of_match[] = {
+       { .compatible = "rockchip,rk3399-gru-sound", },
+       {},
+};
+
+static struct platform_driver rockchip_sound_driver = {
+       .probe = rockchip_sound_probe,
+       .driver = {
+               .name = DRV_NAME,
+               .of_match_table = rockchip_sound_of_match,
+#ifdef CONFIG_PM
+               .pm = &snd_soc_pm_ops,
+#endif
+       },
+};
+
+module_platform_driver(rockchip_sound_driver);
+
+MODULE_AUTHOR("Xing Zheng <zhengxing@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip ASoC Machine Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, rockchip_sound_of_match);
index 652e8c5..974915c 100644 (file)
@@ -57,6 +57,7 @@ static int i2s_runtime_suspend(struct device *dev)
 {
        struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
 
+       regcache_cache_only(i2s->regmap, true);
        clk_disable_unprepare(i2s->mclk);
 
        return 0;
@@ -73,7 +74,14 @@ static int i2s_runtime_resume(struct device *dev)
                return ret;
        }
 
-       return 0;
+       regcache_cache_only(i2s->regmap, false);
+       regcache_mark_dirty(i2s->regmap);
+
+       ret = regcache_sync(i2s->regmap);
+       if (ret)
+               clk_disable_unprepare(i2s->mclk);
+
+       return ret;
 }
 
 static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai)
index 4ca2657..fa8101d 100644 (file)
@@ -65,6 +65,7 @@ static int __maybe_unused rk_spdif_runtime_suspend(struct device *dev)
 {
        struct rk_spdif_dev *spdif = dev_get_drvdata(dev);
 
+       regcache_cache_only(spdif->regmap, true);
        clk_disable_unprepare(spdif->mclk);
        clk_disable_unprepare(spdif->hclk);
 
@@ -88,7 +89,16 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev)
                return ret;
        }
 
-       return 0;
+       regcache_cache_only(spdif->regmap, false);
+       regcache_mark_dirty(spdif->regmap);
+
+       ret = regcache_sync(spdif->regmap);
+       if (ret) {
+               clk_disable_unprepare(spdif->mclk);
+               clk_disable_unprepare(spdif->hclk);
+       }
+
+       return ret;
 }
 
 static int rk_spdif_hw_params(struct snd_pcm_substream *substream,