1 files changed, 87 insertions, 18 deletions

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 687a8f83dbe5..f24d19526603 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -93,6 +93,9 @@ struct sun4i_i2s {
         struct clk      *mod_clk;
         struct regmap   *regmap;
 
+        unsigned int    mclk_freq;
+
+        struct snd_dmaengine_dai_dma_data       capture_dma_data;
         struct snd_dmaengine_dai_dma_data       playback_dma_data;
 };
 
@@ -157,14 +160,24 @@ static int sun4i_i2s_get_mclk_div(struct sun4i_i2s *i2s,
 }
 
 static int sun4i_i2s_oversample_rates[] = { 128, 192, 256, 384, 512, 768 };
+static bool sun4i_i2s_oversample_is_valid(unsigned int oversample)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(sun4i_i2s_oversample_rates); i++)
+                if (sun4i_i2s_oversample_rates[i] == oversample)
+                        return true;
+
+        return false;
+}
 
 static int sun4i_i2s_set_clk_rate(struct sun4i_i2s *i2s,
                                   unsigned int rate,
                                   unsigned int word_size)
 {
-        unsigned int clk_rate;
+        unsigned int oversample_rate, clk_rate;
         int bclk_div, mclk_div;
-        int ret, i;
+        int ret;
 
         switch (rate) {
         case 176400:
@@ -196,21 +209,18 @@ static int sun4i_i2s_set_clk_rate(struct sun4i_i2s *i2s,
         if (ret)
                 return ret;
 
-        /* Always favor the highest oversampling rate */
-        for (i = (ARRAY_SIZE(sun4i_i2s_oversample_rates) - 1); i >= 0; i--) {
-                unsigned int oversample_rate = sun4i_i2s_oversample_rates[i];
-
-                bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate,
-                                                  word_size);
-                mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate,
-                                                  clk_rate,
-                                                  rate);
+        oversample_rate = i2s->mclk_freq / rate;
+        if (!sun4i_i2s_oversample_is_valid(oversample_rate))
+                return -EINVAL;
 
-                if ((bclk_div >= 0) && (mclk_div >= 0))
-                        break;
-        }
+        bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate,
+                                          word_size);
+        if (bclk_div < 0)
+                return -EINVAL;
 
-        if ((bclk_div < 0) || (mclk_div < 0))
+        mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate,
+                                          clk_rate, rate);
+        if (mclk_div < 0)
                 return -EINVAL;
 
         regmap_write(i2s->regmap, SUN4I_I2S_CLK_DIV_REG,
@@ -341,6 +351,27 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         return 0;
 }
 
+static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s)
+{
+        /* Flush RX FIFO */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG,
+                           SUN4I_I2S_FIFO_CTRL_FLUSH_RX,
+                           SUN4I_I2S_FIFO_CTRL_FLUSH_RX);
+
+        /* Clear RX counter */
+        regmap_write(i2s->regmap, SUN4I_I2S_RX_CNT_REG, 0);
+
+        /* Enable RX Block */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+                           SUN4I_I2S_CTRL_RX_EN,
+                           SUN4I_I2S_CTRL_RX_EN);
+
+        /* Enable RX DRQ */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_DMA_INT_CTRL_REG,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN);
+}
+
 static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s)
 {
         /* Flush TX FIFO */
@@ -362,6 +393,18 @@ static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s)
                            SUN4I_I2S_DMA_INT_CTRL_TX_DRQ_EN);
 }
 
+static void sun4i_i2s_stop_capture(struct sun4i_i2s *i2s)
+{
+        /* Disable RX Block */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+                           SUN4I_I2S_CTRL_RX_EN,
+                           0);
+
+        /* Disable RX DRQ */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_DMA_INT_CTRL_REG,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN,
+                           0);
+}
 
 static void sun4i_i2s_stop_playback(struct sun4i_i2s *i2s)
 {
@@ -388,7 +431,7 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         sun4i_i2s_start_playback(i2s);
                 else
-                        return -EINVAL;
+                        sun4i_i2s_start_capture(i2s);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
@@ -397,7 +440,7 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         sun4i_i2s_stop_playback(i2s);
                 else
-                        return -EINVAL;
+                        sun4i_i2s_stop_capture(i2s);
                 break;
 
         default:
@@ -447,9 +490,23 @@ static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream,
         regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG, 0);
 }
 
+static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+                                unsigned int freq, int dir)
+{
+        struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+
+        if (clk_id != 0)
+                return -EINVAL;
+
+        i2s->mclk_freq = freq;
+
+        return 0;
+}
+
 static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
         .hw_params      = sun4i_i2s_hw_params,
         .set_fmt        = sun4i_i2s_set_fmt,
+        .set_sysclk     = sun4i_i2s_set_sysclk,
         .shutdown       = sun4i_i2s_shutdown,
         .startup        = sun4i_i2s_startup,
         .trigger        = sun4i_i2s_trigger,
@@ -459,7 +516,9 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 {
         struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 
-        snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, NULL);
+        snd_soc_dai_init_dma_data(dai,
+                                  &i2s->playback_dma_data,
+                                  &i2s->capture_dma_data);
 
         snd_soc_dai_set_drvdata(dai, i2s);
 
@@ -468,6 +527,13 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 
 static struct snd_soc_dai_driver sun4i_i2s_dai = {
         .probe = sun4i_i2s_dai_probe,
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_192000,
+                .formats = SNDRV_PCM_FMTBIT_S16_LE,
+        },
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -630,6 +696,9 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
         i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;
         i2s->playback_dma_data.maxburst = 4;
 
+        i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG;
+        i2s->capture_dma_data.maxburst = 4;
+
         pm_runtime_enable(&pdev->dev);
         if (!pm_runtime_enabled(&pdev->dev)) {
                 ret = sun4i_i2s_runtime_resume(&pdev->dev);