Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rockc...
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:15 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:15 +0000 (16:15 +0100)
13 files changed:
Documentation/devicetree/bindings/sound/rockchip,pdm.txt [new file with mode: 0644]
Documentation/devicetree/bindings/sound/rockchip-spdif.txt
sound/soc/codecs/rt5514.c
sound/soc/codecs/rt5514.h
sound/soc/omap/mcbsp.c
sound/soc/pxa/Kconfig
sound/soc/rockchip/Kconfig
sound/soc/rockchip/Makefile
sound/soc/rockchip/rockchip_i2s.c
sound/soc/rockchip/rockchip_i2s.h
sound/soc/rockchip/rockchip_pdm.c [new file with mode: 0644]
sound/soc/rockchip/rockchip_pdm.h [new file with mode: 0644]
sound/soc/rockchip/rockchip_spdif.c

diff --git a/Documentation/devicetree/bindings/sound/rockchip,pdm.txt b/Documentation/devicetree/bindings/sound/rockchip,pdm.txt
new file mode 100644 (file)
index 0000000..921729d
--- /dev/null
@@ -0,0 +1,39 @@
+* Rockchip PDM controller
+
+Required properties:
+
+- compatible: "rockchip,pdm"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- dmas: DMA specifiers for rx dma. See the DMA client binding,
+       Documentation/devicetree/bindings/dma/dma.txt
+- dma-names: should include "rx".
+- clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
+- clock-names: should contain following:
+   - "pdm_hclk": clock for PDM BUS
+   - "pdm_clk" : clock for PDM controller
+- pinctrl-names: Must contain a "default" entry.
+- pinctrl-N: One property must exist for each entry in
+            pinctrl-names. See ../pinctrl/pinctrl-bindings.txt
+            for details of the property values.
+
+Example for rk3328 PDM controller:
+
+pdm: pdm@ff040000 {
+       compatible = "rockchip,pdm";
+       reg = <0x0 0xff040000 0x0 0x1000>;
+       clocks = <&clk_pdm>, <&clk_gates28 0>;
+       clock-names = "pdm_clk", "pdm_hclk";
+       dmas = <&pdma 16>;
+       #dma-cells = <1>;
+       dma-names = "rx";
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&pdmm0_clk
+                    &pdmm0_fsync
+                    &pdmm0_sdi0
+                    &pdmm0_sdi1
+                    &pdmm0_sdi2
+                    &pdmm0_sdi3>;
+       pinctrl-1 = <&pdmm0_sleep>;
+       status = "disabled";
+};
index 11046429a118a00356850528450c07a680c30a55..4706b96d450bf502991ef58f6793b73f036617b4 100644 (file)
@@ -9,7 +9,9 @@ Required properties:
 - compatible: should be one of the following:
    - "rockchip,rk3066-spdif"
    - "rockchip,rk3188-spdif"
+   - "rockchip,rk3228-spdif"
    - "rockchip,rk3288-spdif"
+   - "rockchip,rk3328-spdif"
    - "rockchip,rk3366-spdif"
    - "rockchip,rk3368-spdif"
    - "rockchip,rk3399-spdif"
index f91221b1ddf0fced68a2815eaaf71f5983fea868..5c30c4d64ebef74f2036193683cfa6bc408a2fe4 100644 (file)
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/acpi.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -906,9 +907,23 @@ static int rt5514_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
        if (rx_mask || tx_mask)
                val |= RT5514_TDM_MODE;
 
-       if (slots == 4)
+       switch (slots) {
+       case 4:
                val |= RT5514_TDMSLOT_SEL_RX_4CH | RT5514_TDMSLOT_SEL_TX_4CH;
+               break;
+
+       case 6:
+               val |= RT5514_TDMSLOT_SEL_RX_6CH | RT5514_TDMSLOT_SEL_TX_6CH;
+               break;
 
+       case 8:
+               val |= RT5514_TDMSLOT_SEL_RX_8CH | RT5514_TDMSLOT_SEL_TX_8CH;
+               break;
+
+       case 2:
+       default:
+               break;
+       }
 
        switch (slot_width) {
        case 20:
@@ -919,6 +934,10 @@ static int rt5514_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                val |= RT5514_CH_LEN_RX_24 | RT5514_CH_LEN_TX_24;
                break;
 
+       case 25:
+               val |= RT5514_TDM_MODE2;
+               break;
+
        case 32:
                val |= RT5514_CH_LEN_RX_32 | RT5514_CH_LEN_TX_32;
                break;
@@ -930,7 +949,8 @@ static int rt5514_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
        regmap_update_bits(rt5514->regmap, RT5514_I2S_CTRL1, RT5514_TDM_MODE |
                RT5514_TDMSLOT_SEL_RX_MASK | RT5514_TDMSLOT_SEL_TX_MASK |
-               RT5514_CH_LEN_RX_MASK | RT5514_CH_LEN_TX_MASK, val);
+               RT5514_CH_LEN_RX_MASK | RT5514_CH_LEN_TX_MASK |
+               RT5514_TDM_MODE2, val);
 
        return 0;
 }
@@ -1076,6 +1096,14 @@ static const struct of_device_id rt5514_of_match[] = {
 MODULE_DEVICE_TABLE(of, rt5514_of_match);
 #endif
 
+#ifdef CONFIG_ACPI
+static struct acpi_device_id rt5514_acpi_match[] = {
+       { "10EC5514", 0},
+       {},
+};
+MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match);
+#endif
+
 static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev)
 {
        device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
@@ -1179,6 +1207,7 @@ static const struct dev_pm_ops rt5514_i2_pm_ops = {
 static struct i2c_driver rt5514_i2c_driver = {
        .driver = {
                .name = "rt5514",
+               .acpi_match_table = ACPI_PTR(rt5514_acpi_match),
                .of_match_table = of_match_ptr(rt5514_of_match),
                .pm = &rt5514_i2_pm_ops,
        },
index 5d343fb6d125d46e8fe463f1b1f7485428911c92..02bc212a86d9c7e2d9559d7ec0b744f3c906a9e2 100644 (file)
 #define RT5514_POW_ADCFEDL_BIT                 0
 
 /* RT5514_I2S_CTRL1 (0x2010) */
+#define RT5514_TDM_MODE2                       (0x1 << 30)
+#define RT5514_TDM_MODE2_SFT                   30
 #define RT5514_TDM_MODE                                (0x1 << 28)
 #define RT5514_TDM_MODE_SFT                    28
 #define RT5514_I2S_LR_MASK                     (0x1 << 26)
 #define RT5514_TDMSLOT_SEL_RX_MASK             (0x3 << 10)
 #define RT5514_TDMSLOT_SEL_RX_SFT              10
 #define RT5514_TDMSLOT_SEL_RX_4CH              (0x1 << 10)
+#define RT5514_TDMSLOT_SEL_RX_6CH              (0x2 << 10)
+#define RT5514_TDMSLOT_SEL_RX_8CH              (0x3 << 10)
 #define RT5514_CH_LEN_RX_MASK                  (0x3 << 8)
 #define RT5514_CH_LEN_RX_SFT                   8
 #define RT5514_CH_LEN_RX_16                    (0x0 << 8)
 #define RT5514_TDMSLOT_SEL_TX_MASK             (0x3 << 6)
 #define RT5514_TDMSLOT_SEL_TX_SFT              6
 #define RT5514_TDMSLOT_SEL_TX_4CH              (0x1 << 6)
+#define RT5514_TDMSLOT_SEL_TX_6CH              (0x2 << 6)
+#define RT5514_TDMSLOT_SEL_TX_8CH              (0x3 << 6)
 #define RT5514_CH_LEN_TX_MASK                  (0x3 << 4)
 #define RT5514_CH_LEN_TX_SFT                   4
 #define RT5514_CH_LEN_TX_16                    (0x0 << 4)
index 06fec5699cc8bd984e110a6b82b115b019e8f576..7a54e30832033eec9527f2750b01fd9e7a3ad4ee 100644 (file)
@@ -835,15 +835,11 @@ static ssize_t dma_op_mode_store(struct device *dev,
                                const char *buf, size_t size)
 {
        struct omap_mcbsp *mcbsp = dev_get_drvdata(dev);
-       const char * const *s;
-       int i = 0;
-
-       for (s = &dma_op_modes[i]; i < ARRAY_SIZE(dma_op_modes); s++, i++)
-               if (sysfs_streq(buf, *s))
-                       break;
+       int i;
 
-       if (i == ARRAY_SIZE(dma_op_modes))
-               return -EINVAL;
+       i = sysfs_match_string(dma_op_modes, buf);
+       if (i < 0)
+               return i;
 
        spin_lock_irq(&mcbsp->lock);
        if (!mcbsp->free) {
index 823b5a236d8dce0943d160a6cd436df2865a76e6..960744e46edc0549854f2ec5e28e68bf8a60a232 100644 (file)
@@ -1,6 +1,6 @@
 config SND_PXA2XX_SOC
        tristate "SoC Audio for the Intel PXA2xx chip"
-       depends on ARCH_PXA
+       depends on ARCH_PXA || COMPILE_TEST
        select SND_PXA2XX_LIB
        help
          Say Y or M if you want to add support for codecs attached to
index e3ca1e973de571062768ff870b0984029e8a150f..c84487805876addf89bb6cd12f71e32a306f94b9 100644 (file)
@@ -15,6 +15,15 @@ config SND_SOC_ROCKCHIP_I2S
          Rockchip I2S device. The device supports upto maximum of
          8 channels each for play and record.
 
+config SND_SOC_ROCKCHIP_PDM
+       tristate "Rockchip PDM Controller Driver"
+       depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
+       select SND_SOC_GENERIC_DMAENGINE_PCM
+       help
+         Say Y or M if you want to add support for PDM driver for
+         Rockchip PDM Controller. The Controller supports up to maximum of
+         8 channels record.
+
 config SND_SOC_ROCKCHIP_SPDIF
        tristate "Rockchip SPDIF Device Driver"
        depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
index 991f91bea9f91ab75bf95e8a70ebea357b26fc9b..105f0e14a4ab2e13a27ac89b97089f0958920ee8 100644 (file)
@@ -1,8 +1,10 @@
 # ROCKCHIP Platform Support
 snd-soc-rockchip-i2s-objs := rockchip_i2s.o
+snd-soc-rockchip-pdm-objs := rockchip_pdm.o
 snd-soc-rockchip-spdif-objs := rockchip_spdif.o
 
 obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o
 obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o
 
 snd-soc-rockchip-max98090-objs := rockchip_max98090.o
index f54843342ee2e3a1cebf4fe3743c1aaa183d6448..199338fdeda0cea1fefedefd02d843fc00d465a7 100644 (file)
@@ -206,7 +206,21 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 
        regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
 
-       mask = I2S_TXCR_IBM_MASK;
+       mask = I2S_CKR_CKP_MASK;
+       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+       case SND_SOC_DAIFMT_NB_NF:
+               val = I2S_CKR_CKP_NEG;
+               break;
+       case SND_SOC_DAIFMT_IB_NF:
+               val = I2S_CKR_CKP_POS;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
+
+       mask = I2S_TXCR_IBM_MASK | I2S_TXCR_TFS_MASK | I2S_TXCR_PBM_MASK;
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_RIGHT_J:
                val = I2S_TXCR_IBM_RSJM;
@@ -217,13 +231,19 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
        case SND_SOC_DAIFMT_I2S:
                val = I2S_TXCR_IBM_NORMAL;
                break;
+       case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */
+               val = I2S_TXCR_TFS_PCM;
+               break;
+       case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */
+               val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1);
+               break;
        default:
                return -EINVAL;
        }
 
        regmap_update_bits(i2s->regmap, I2S_TXCR, mask, val);
 
-       mask = I2S_RXCR_IBM_MASK;
+       mask = I2S_RXCR_IBM_MASK | I2S_RXCR_TFS_MASK | I2S_RXCR_PBM_MASK;
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_RIGHT_J:
                val = I2S_RXCR_IBM_RSJM;
@@ -234,6 +254,12 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
        case SND_SOC_DAIFMT_I2S:
                val = I2S_RXCR_IBM_NORMAL;
                break;
+       case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */
+               val = I2S_RXCR_TFS_PCM;
+               break;
+       case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */
+               val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1);
+               break;
        default:
                return -EINVAL;
        }
@@ -617,12 +643,13 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
                        goto err_pm_disable;
        }
 
-       soc_dai = devm_kzalloc(&pdev->dev,
+       soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai,
                               sizeof(*soc_dai), GFP_KERNEL);
-       if (!soc_dai)
-               return -ENOMEM;
+       if (!soc_dai) {
+               ret = -ENOMEM;
+               goto err_pm_disable;
+       }
 
-       memcpy(soc_dai, &rockchip_i2s_dai, sizeof(*soc_dai));
        if (!of_property_read_u32(node, "rockchip,playback-channels", &val)) {
                if (val >= 2 && val <= 8)
                        soc_dai->playback.channels_max = val;
index 31f11fd25393ac37d0a696bdc3e5de5b37150590..a7b8527d8a731fcaf8ba6327f40f2e4738e1ab22 100644 (file)
@@ -41,6 +41,7 @@
 #define I2S_TXCR_TFS_SHIFT     5
 #define I2S_TXCR_TFS_I2S       (0 << I2S_TXCR_TFS_SHIFT)
 #define I2S_TXCR_TFS_PCM       (1 << I2S_TXCR_TFS_SHIFT)
+#define I2S_TXCR_TFS_MASK      (1 << I2S_TXCR_TFS_SHIFT)
 #define I2S_TXCR_VDW_SHIFT     0
 #define I2S_TXCR_VDW(x)                ((x - 1) << I2S_TXCR_VDW_SHIFT)
 #define I2S_TXCR_VDW_MASK      (0x1f << I2S_TXCR_VDW_SHIFT)
@@ -70,6 +71,7 @@
 #define I2S_RXCR_TFS_SHIFT     5
 #define I2S_RXCR_TFS_I2S       (0 << I2S_RXCR_TFS_SHIFT)
 #define I2S_RXCR_TFS_PCM       (1 << I2S_RXCR_TFS_SHIFT)
+#define I2S_RXCR_TFS_MASK      (1 << I2S_RXCR_TFS_SHIFT)
 #define I2S_RXCR_VDW_SHIFT     0
 #define I2S_RXCR_VDW(x)                ((x - 1) << I2S_RXCR_VDW_SHIFT)
 #define I2S_RXCR_VDW_MASK      (0x1f << I2S_RXCR_VDW_SHIFT)
@@ -91,6 +93,7 @@
 #define I2S_CKR_CKP_SHIFT      26
 #define I2S_CKR_CKP_NEG                (0 << I2S_CKR_CKP_SHIFT)
 #define I2S_CKR_CKP_POS                (1 << I2S_CKR_CKP_SHIFT)
+#define I2S_CKR_CKP_MASK       (1 << I2S_CKR_CKP_SHIFT)
 #define I2S_CKR_RLP_SHIFT      25
 #define I2S_CKR_RLP_NORMAL     (0 << I2S_CKR_RLP_SHIFT)
 #define I2S_CKR_RLP_OPPSITE    (1 << I2S_CKR_RLP_SHIFT)
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
new file mode 100644 (file)
index 0000000..c5ddeed
--- /dev/null
@@ -0,0 +1,516 @@
+/*
+ * Rockchip PDM ALSA SoC Digital Audio Interface(DAI)  driver
+ *
+ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that 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/module.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <sound/dmaengine_pcm.h>
+#include <sound/pcm_params.h>
+
+#include "rockchip_pdm.h"
+
+#define PDM_DMA_BURST_SIZE     (16) /* size * width: 16*4 = 64 bytes */
+
+struct rk_pdm_dev {
+       struct device *dev;
+       struct clk *clk;
+       struct clk *hclk;
+       struct regmap *regmap;
+       struct snd_dmaengine_dai_dma_data capture_dma_data;
+};
+
+struct rk_pdm_clkref {
+       unsigned int sr;
+       unsigned int clk;
+};
+
+static struct rk_pdm_clkref clkref[] = {
+       { 8000, 40960000 },
+       { 11025, 56448000 },
+       { 12000, 61440000 },
+};
+
+static unsigned int get_pdm_clk(unsigned int sr)
+{
+       unsigned int i, count, clk, div;
+
+       clk = 0;
+       if (!sr)
+               return clk;
+
+       count = ARRAY_SIZE(clkref);
+       for (i = 0; i < count; i++) {
+               if (sr % clkref[i].sr)
+                       continue;
+               div = sr / clkref[i].sr;
+               if ((div & (div - 1)) == 0) {
+                       clk = clkref[i].clk;
+                       break;
+               }
+       }
+
+       return clk;
+}
+
+static inline struct rk_pdm_dev *to_info(struct snd_soc_dai *dai)
+{
+       return snd_soc_dai_get_drvdata(dai);
+}
+
+static void rockchip_pdm_rxctrl(struct rk_pdm_dev *pdm, int on)
+{
+       if (on) {
+               regmap_update_bits(pdm->regmap, PDM_DMA_CTRL,
+                                  PDM_DMA_RD_MSK, PDM_DMA_RD_EN);
+               regmap_update_bits(pdm->regmap, PDM_SYSCONFIG,
+                                  PDM_RX_MASK, PDM_RX_START);
+       } else {
+               regmap_update_bits(pdm->regmap, PDM_DMA_CTRL,
+                                  PDM_DMA_RD_MSK, PDM_DMA_RD_DIS);
+               regmap_update_bits(pdm->regmap, PDM_SYSCONFIG,
+                                  PDM_RX_MASK | PDM_RX_CLR_MASK,
+                                  PDM_RX_STOP | PDM_RX_CLR_WR);
+       }
+}
+
+static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream,
+                                 struct snd_pcm_hw_params *params,
+                                 struct snd_soc_dai *dai)
+{
+       struct rk_pdm_dev *pdm = to_info(dai);
+       unsigned int val = 0;
+       unsigned int clk_rate, clk_div, samplerate;
+       int ret;
+
+       samplerate = params_rate(params);
+       clk_rate = get_pdm_clk(samplerate);
+       if (!clk_rate)
+               return -EINVAL;
+
+       ret = clk_set_rate(pdm->clk, clk_rate);
+       if (ret)
+               return -EINVAL;
+
+       clk_div = DIV_ROUND_CLOSEST(clk_rate, samplerate);
+
+       switch (clk_div) {
+       case 320:
+               val = PDM_CLK_320FS;
+               break;
+       case 640:
+               val = PDM_CLK_640FS;
+               break;
+       case 1280:
+               val = PDM_CLK_1280FS;
+               break;
+       case 2560:
+               val = PDM_CLK_2560FS;
+               break;
+       case 5120:
+               val = PDM_CLK_5120FS;
+               break;
+       default:
+               dev_err(pdm->dev, "unsupported div: %d\n", clk_div);
+               return -EINVAL;
+       }
+
+       regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_DS_RATIO_MSK, val);
+       regmap_update_bits(pdm->regmap, PDM_HPF_CTRL,
+                          PDM_HPF_CF_MSK, PDM_HPF_60HZ);
+       regmap_update_bits(pdm->regmap, PDM_HPF_CTRL,
+                          PDM_HPF_LE | PDM_HPF_RE, PDM_HPF_LE | PDM_HPF_RE);
+       regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_CLK_EN, PDM_CLK_EN);
+
+       val = 0;
+       switch (params_format(params)) {
+       case SNDRV_PCM_FORMAT_S8:
+               val |= PDM_VDW(8);
+               break;
+       case SNDRV_PCM_FORMAT_S16_LE:
+               val |= PDM_VDW(16);
+               break;
+       case SNDRV_PCM_FORMAT_S20_3LE:
+               val |= PDM_VDW(20);
+               break;
+       case SNDRV_PCM_FORMAT_S24_LE:
+               val |= PDM_VDW(24);
+               break;
+       case SNDRV_PCM_FORMAT_S32_LE:
+               val |= PDM_VDW(32);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       switch (params_channels(params)) {
+       case 8:
+               val |= PDM_PATH3_EN;
+               /* fallthrough */
+       case 6:
+               val |= PDM_PATH2_EN;
+               /* fallthrough */
+       case 4:
+               val |= PDM_PATH1_EN;
+               /* fallthrough */
+       case 2:
+               val |= PDM_PATH0_EN;
+               break;
+       default:
+               dev_err(pdm->dev, "invalid channel: %d\n",
+                       params_channels(params));
+               return -EINVAL;
+       }
+
+       if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+               regmap_update_bits(pdm->regmap, PDM_CTRL0,
+                                  PDM_PATH_MSK | PDM_VDW_MSK,
+                                  val);
+               regmap_update_bits(pdm->regmap, PDM_DMA_CTRL, PDM_DMA_RDL_MSK,
+                                  PDM_DMA_RDL(16));
+               regmap_update_bits(pdm->regmap, PDM_SYSCONFIG,
+                                  PDM_RX_MASK | PDM_RX_CLR_MASK,
+                                  PDM_RX_STOP | PDM_RX_CLR_WR);
+       }
+
+       return 0;
+}
+
+static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai,
+                               unsigned int fmt)
+{
+       struct rk_pdm_dev *pdm = to_info(cpu_dai);
+       unsigned int mask = 0, val = 0;
+
+       mask = PDM_CKP_MSK;
+       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+       case SND_SOC_DAIFMT_NB_NF:
+               val = PDM_CKP_NORMAL;
+               break;
+       case SND_SOC_DAIFMT_IB_NF:
+               val = PDM_CKP_INVERTED;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, mask, val);
+
+       return 0;
+}
+
+static int rockchip_pdm_trigger(struct snd_pcm_substream *substream, int cmd,
+                               struct snd_soc_dai *dai)
+{
+       struct rk_pdm_dev *pdm = to_info(dai);
+       int ret = 0;
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+       case SNDRV_PCM_TRIGGER_RESUME:
+       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+               if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+                       rockchip_pdm_rxctrl(pdm, 1);
+               break;
+       case SNDRV_PCM_TRIGGER_SUSPEND:
+       case SNDRV_PCM_TRIGGER_STOP:
+       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+               if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+                       rockchip_pdm_rxctrl(pdm, 0);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static int rockchip_pdm_dai_probe(struct snd_soc_dai *dai)
+{
+       struct rk_pdm_dev *pdm = to_info(dai);
+
+       dai->capture_dma_data = &pdm->capture_dma_data;
+
+       return 0;
+}
+
+static struct snd_soc_dai_ops rockchip_pdm_dai_ops = {
+       .set_fmt = rockchip_pdm_set_fmt,
+       .trigger = rockchip_pdm_trigger,
+       .hw_params = rockchip_pdm_hw_params,
+};
+
+#define ROCKCHIP_PDM_RATES SNDRV_PCM_RATE_8000_192000
+#define ROCKCHIP_PDM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
+                             SNDRV_PCM_FMTBIT_S20_3LE | \
+                             SNDRV_PCM_FMTBIT_S24_LE | \
+                             SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_driver rockchip_pdm_dai = {
+       .probe = rockchip_pdm_dai_probe,
+       .capture = {
+               .stream_name = "Capture",
+               .channels_min = 2,
+               .channels_max = 8,
+               .rates = ROCKCHIP_PDM_RATES,
+               .formats = ROCKCHIP_PDM_FORMATS,
+       },
+       .ops = &rockchip_pdm_dai_ops,
+       .symmetric_rates = 1,
+};
+
+static const struct snd_soc_component_driver rockchip_pdm_component = {
+       .name = "rockchip-pdm",
+};
+
+static int rockchip_pdm_runtime_suspend(struct device *dev)
+{
+       struct rk_pdm_dev *pdm = dev_get_drvdata(dev);
+
+       clk_disable_unprepare(pdm->clk);
+       clk_disable_unprepare(pdm->hclk);
+
+       return 0;
+}
+
+static int rockchip_pdm_runtime_resume(struct device *dev)
+{
+       struct rk_pdm_dev *pdm = dev_get_drvdata(dev);
+       int ret;
+
+       ret = clk_prepare_enable(pdm->clk);
+       if (ret) {
+               dev_err(pdm->dev, "clock enable failed %d\n", ret);
+               return ret;
+       }
+
+       ret = clk_prepare_enable(pdm->hclk);
+       if (ret) {
+               dev_err(pdm->dev, "hclock enable failed %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static bool rockchip_pdm_wr_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case PDM_SYSCONFIG:
+       case PDM_CTRL0:
+       case PDM_CTRL1:
+       case PDM_CLK_CTRL:
+       case PDM_HPF_CTRL:
+       case PDM_FIFO_CTRL:
+       case PDM_DMA_CTRL:
+       case PDM_INT_EN:
+       case PDM_INT_CLR:
+       case PDM_DATA_VALID:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static bool rockchip_pdm_rd_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case PDM_SYSCONFIG:
+       case PDM_CTRL0:
+       case PDM_CTRL1:
+       case PDM_CLK_CTRL:
+       case PDM_HPF_CTRL:
+       case PDM_FIFO_CTRL:
+       case PDM_DMA_CTRL:
+       case PDM_INT_EN:
+       case PDM_INT_CLR:
+       case PDM_INT_ST:
+       case PDM_DATA_VALID:
+       case PDM_VERSION:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static bool rockchip_pdm_volatile_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case PDM_SYSCONFIG:
+       case PDM_INT_CLR:
+       case PDM_INT_ST:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static const struct regmap_config rockchip_pdm_regmap_config = {
+       .reg_bits = 32,
+       .reg_stride = 4,
+       .val_bits = 32,
+       .max_register = PDM_VERSION,
+       .writeable_reg = rockchip_pdm_wr_reg,
+       .readable_reg = rockchip_pdm_rd_reg,
+       .volatile_reg = rockchip_pdm_volatile_reg,
+       .cache_type = REGCACHE_FLAT,
+};
+
+static int rockchip_pdm_probe(struct platform_device *pdev)
+{
+       struct rk_pdm_dev *pdm;
+       struct resource *res;
+       void __iomem *regs;
+       int ret;
+
+       pdm = devm_kzalloc(&pdev->dev, sizeof(*pdm), GFP_KERNEL);
+       if (!pdm)
+               return -ENOMEM;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(regs))
+               return PTR_ERR(regs);
+
+       pdm->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
+                                           &rockchip_pdm_regmap_config);
+       if (IS_ERR(pdm->regmap))
+               return PTR_ERR(pdm->regmap);
+
+       pdm->capture_dma_data.addr = res->start + PDM_RXFIFO_DATA;
+       pdm->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+       pdm->capture_dma_data.maxburst = PDM_DMA_BURST_SIZE;
+
+       pdm->dev = &pdev->dev;
+       dev_set_drvdata(&pdev->dev, pdm);
+
+       pdm->clk = devm_clk_get(&pdev->dev, "pdm_clk");
+       if (IS_ERR(pdm->clk))
+               return PTR_ERR(pdm->clk);
+
+       pdm->hclk = devm_clk_get(&pdev->dev, "pdm_hclk");
+       if (IS_ERR(pdm->hclk))
+               return PTR_ERR(pdm->hclk);
+
+       ret = clk_prepare_enable(pdm->hclk);
+       if (ret)
+               return ret;
+
+       pm_runtime_enable(&pdev->dev);
+       if (!pm_runtime_enabled(&pdev->dev)) {
+               ret = rockchip_pdm_runtime_resume(&pdev->dev);
+               if (ret)
+                       goto err_pm_disable;
+       }
+
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &rockchip_pdm_component,
+                                             &rockchip_pdm_dai, 1);
+
+       if (ret) {
+               dev_err(&pdev->dev, "could not register dai: %d\n", ret);
+               goto err_suspend;
+       }
+
+       ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
+       if (ret) {
+               dev_err(&pdev->dev, "could not register pcm: %d\n", ret);
+               goto err_suspend;
+       }
+
+       return 0;
+
+err_suspend:
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               rockchip_pdm_runtime_suspend(&pdev->dev);
+err_pm_disable:
+       pm_runtime_disable(&pdev->dev);
+
+       clk_disable_unprepare(pdm->hclk);
+
+       return ret;
+}
+
+static int rockchip_pdm_remove(struct platform_device *pdev)
+{
+       struct rk_pdm_dev *pdm = dev_get_drvdata(&pdev->dev);
+
+       pm_runtime_disable(&pdev->dev);
+       if (!pm_runtime_status_suspended(&pdev->dev))
+               rockchip_pdm_runtime_suspend(&pdev->dev);
+
+       clk_disable_unprepare(pdm->clk);
+       clk_disable_unprepare(pdm->hclk);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int rockchip_pdm_suspend(struct device *dev)
+{
+       struct rk_pdm_dev *pdm = dev_get_drvdata(dev);
+
+       regcache_mark_dirty(pdm->regmap);
+
+       return 0;
+}
+
+static int rockchip_pdm_resume(struct device *dev)
+{
+       struct rk_pdm_dev *pdm = dev_get_drvdata(dev);
+       int ret;
+
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0)
+               return ret;
+
+       ret = regcache_sync(pdm->regmap);
+
+       pm_runtime_put(dev);
+
+       return ret;
+}
+#endif
+
+static const struct dev_pm_ops rockchip_pdm_pm_ops = {
+       SET_RUNTIME_PM_OPS(rockchip_pdm_runtime_suspend,
+                          rockchip_pdm_runtime_resume, NULL)
+       SET_SYSTEM_SLEEP_PM_OPS(rockchip_pdm_suspend, rockchip_pdm_resume)
+};
+
+static const struct of_device_id rockchip_pdm_match[] = {
+       { .compatible = "rockchip,pdm", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, rockchip_pdm_match);
+
+static struct platform_driver rockchip_pdm_driver = {
+       .probe  = rockchip_pdm_probe,
+       .remove = rockchip_pdm_remove,
+       .driver = {
+               .name = "rockchip-pdm",
+               .of_match_table = of_match_ptr(rockchip_pdm_match),
+               .pm = &rockchip_pdm_pm_ops,
+       },
+};
+
+module_platform_driver(rockchip_pdm_driver);
+
+MODULE_AUTHOR("Sugar <sugar.zhang@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip PDM Controller Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/rockchip/rockchip_pdm.h b/sound/soc/rockchip/rockchip_pdm.h
new file mode 100644 (file)
index 0000000..886b48d
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * Rockchip PDM ALSA SoC Digital Audio Interface(DAI)  driver
+ *
+ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ */
+
+#ifndef _ROCKCHIP_PDM_H
+#define _ROCKCHIP_PDM_H
+
+/* PDM REGS */
+#define PDM_SYSCONFIG  (0x0000)
+#define PDM_CTRL0      (0x0004)
+#define PDM_CTRL1      (0x0008)
+#define PDM_CLK_CTRL   (0x000c)
+#define PDM_HPF_CTRL   (0x0010)
+#define PDM_FIFO_CTRL  (0x0014)
+#define PDM_DMA_CTRL   (0x0018)
+#define PDM_INT_EN     (0x001c)
+#define PDM_INT_CLR    (0x0020)
+#define PDM_INT_ST     (0x0024)
+#define PDM_RXFIFO_DATA        (0x0030)
+#define PDM_DATA_VALID (0x0054)
+#define PDM_VERSION    (0x0058)
+
+/* PDM_SYSCONFIG */
+#define PDM_RX_MASK            (0x1 << 2)
+#define PDM_RX_START           (0x1 << 2)
+#define PDM_RX_STOP            (0x0 << 2)
+#define PDM_RX_CLR_MASK                (0x1 << 0)
+#define PDM_RX_CLR_WR          (0x1 << 0)
+#define PDM_RX_CLR_DONE                (0x0 << 0)
+
+/* PDM CTRL0 */
+#define PDM_PATH_MSK           (0xf << 27)
+#define PDM_PATH3_EN           BIT(30)
+#define PDM_PATH2_EN           BIT(29)
+#define PDM_PATH1_EN           BIT(28)
+#define PDM_PATH0_EN           BIT(27)
+#define PDM_HWT_EN             BIT(26)
+#define PDM_VDW_MSK            (0x1f << 0)
+#define PDM_VDW(X)             ((X - 1) << 0)
+
+/* PDM CLK CTRL */
+#define PDM_CLK_MSK            BIT(5)
+#define PDM_CLK_EN             BIT(5)
+#define PDM_CLK_DIS            (0x0 << 5)
+#define PDM_CKP_MSK            BIT(3)
+#define PDM_CKP_NORMAL         (0x0 << 3)
+#define PDM_CKP_INVERTED       BIT(3)
+#define PDM_DS_RATIO_MSK       (0x7 << 0)
+#define PDM_CLK_320FS          (0x0 << 0)
+#define PDM_CLK_640FS          (0x1 << 0)
+#define PDM_CLK_1280FS         (0x2 << 0)
+#define PDM_CLK_2560FS         (0x3 << 0)
+#define PDM_CLK_5120FS         (0x4 << 0)
+
+/* PDM HPF CTRL */
+#define PDM_HPF_LE             BIT(3)
+#define PDM_HPF_RE             BIT(2)
+#define PDM_HPF_CF_MSK         (0x3 << 0)
+#define PDM_HPF_3P79HZ         (0x0 << 0)
+#define PDM_HPF_60HZ           (0x1 << 0)
+#define PDM_HPF_243HZ          (0x2 << 0)
+#define PDM_HPF_493HZ          (0x3 << 0)
+
+/* PDM DMA CTRL */
+#define PDM_DMA_RD_MSK         BIT(8)
+#define PDM_DMA_RD_EN          BIT(8)
+#define PDM_DMA_RD_DIS         (0x0 << 8)
+#define PDM_DMA_RDL_MSK                (0x7f << 0)
+#define PDM_DMA_RDL(X)         ((X - 1) << 0)
+
+#endif /* _ROCKCHIP_PDM_H */
index fa8101d1e16f276b2e5e7a8e70cbb2ab384ad9be..ee5055d47d13d0ba6f63417947c63f731bcac4a8 100644 (file)
@@ -49,8 +49,12 @@ static const struct of_device_id rk_spdif_match[] = {
          .data = (void *)RK_SPDIF_RK3066 },
        { .compatible = "rockchip,rk3188-spdif",
          .data = (void *)RK_SPDIF_RK3188 },
+       { .compatible = "rockchip,rk3228-spdif",
+         .data = (void *)RK_SPDIF_RK3366 },
        { .compatible = "rockchip,rk3288-spdif",
          .data = (void *)RK_SPDIF_RK3288 },
+       { .compatible = "rockchip,rk3328-spdif",
+         .data = (void *)RK_SPDIF_RK3366 },
        { .compatible = "rockchip,rk3366-spdif",
          .data = (void *)RK_SPDIF_RK3366 },
        { .compatible = "rockchip,rk3368-spdif",