ASoC: rsnd: SRC TIMSEL support for Capture

SRC has Sync/Async mode, and it can't use Sync mode when Capture
with CMD. In Async mode, it needs to care about in/out SRC rate
for settings, but current driver supporting Playback case only.
This patch supports Capture case.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index d74e1cc..f7e164c 100644 (file)
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -90,6 +90,108 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
        return (0x6 + ws) << 8;
 }
 
+static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,
+                                      struct rsnd_dai_stream *io,
+                                      unsigned int target_rate,
+                                      unsigned int *target_val,
+                                      unsigned int *target_en)
+{
+       struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
+       struct device *dev = rsnd_priv_to_dev(priv);
+       int idx, sel, div, step;
+       unsigned int val, en;
+       unsigned int min, diff;
+       unsigned int sel_rate[] = {
+               clk_get_rate(adg->clk[CLKA]),   /* 0000: CLKA */
+               clk_get_rate(adg->clk[CLKB]),   /* 0001: CLKB */
+               clk_get_rate(adg->clk[CLKC]),   /* 0010: CLKC */
+               adg->rbga_rate_for_441khz,      /* 0011: RBGA */
+               adg->rbgb_rate_for_48khz,       /* 0100: RBGB */
+       };
+
+       min = ~0;
+       val = 0;
+       en = 0;
+       for (sel = 0; sel < ARRAY_SIZE(sel_rate); sel++) {
+               idx = 0;
+               step = 2;
+
+               if (!sel_rate[sel])
+                       continue;
+
+               for (div = 2; div <= 98304; div += step) {
+                       diff = abs(target_rate - sel_rate[sel] / div);
+                       if (min > diff) {
+                               val = (sel << 8) | idx;
+                               min = diff;
+                               en = 1 << (sel + 1); /* fixme */
+                       }
+
+                       /*
+                        * step of 0_0000 / 0_0001 / 0_1101
+                        * are out of order
+                        */
+                       if ((idx > 2) && (idx % 2))
+                               step *= 2;
+                       if (idx == 0x1c) {
+                               div += step;
+                               step *= 2;
+                       }
+                       idx++;
+               }
+       }
+
+       if (min == ~0) {
+               dev_err(dev, "no Input clock\n");
+               return;
+       }
+
+       *target_val = val;
+       if (target_en)
+               *target_en = en;
+}
+
+static void rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,
+                                      struct rsnd_dai_stream *io,
+                                      unsigned int in_rate,
+                                      unsigned int out_rate,
+                                      u32 *in, u32 *out, u32 *en)
+{
+       struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+       unsigned int target_rate;
+       u32 *target_val;
+       u32 _in;
+       u32 _out;
+       u32 _en;
+
+       /* default = SSI WS */
+       _in =
+       _out = rsnd_adg_ssi_ws_timing_gen2(io);
+
+       target_rate = 0;
+       target_val = NULL;
+       _en = 0;
+       if (runtime->rate != in_rate) {
+               target_rate = out_rate;
+               target_val  = &_out;
+       } else if (runtime->rate != out_rate) {
+               target_rate = in_rate;
+               target_val  = &_in;
+       }
+
+       if (target_rate)
+               __rsnd_adg_get_timesel_ratio(priv, io,
+                                            target_rate,
+                                            target_val, &_en);
+
+       if (in)
+               *in = _in;
+       if (out)
+               *out = _out;
+       if (en)
+               *en = _en;
+}
+
 int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_mod,
                                 struct rsnd_dai_stream *io)
 {
@@ -110,25 +212,24 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_mod,
        return 0;
 }
 
-static int rsnd_adg_set_src_timsel_gen2(struct rsnd_mod *src_mod,
-                                       struct rsnd_dai_stream *io,
-                                       u32 timsel)
+int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod,
+                                 struct rsnd_dai_stream *io,
+                                 unsigned int in_rate,
+                                 unsigned int out_rate)
 {
        struct rsnd_priv *priv = rsnd_mod_to_priv(src_mod);
        struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
        struct rsnd_mod *adg_mod = rsnd_mod_get(adg);
-       int is_play = rsnd_io_is_play(io);
+       u32 in, out;
+       u32 mask, en;
        int id = rsnd_mod_id(src_mod);
        int shift = (id % 2) ? 16 : 0;
-       u32 mask, ws;
-       u32 in, out;
 
        rsnd_mod_confirm_src(src_mod);
 
-       ws = rsnd_adg_ssi_ws_timing_gen2(io);
-
-       in  = (is_play) ? timsel : ws;
-       out = (is_play) ? ws     : timsel;
+       rsnd_adg_get_timesel_ratio(priv, io,
+                                  in_rate, out_rate,
+                                  &in, &out, &en);
 
        in   = in       << shift;
        out  = out      << shift;
@@ -157,91 +258,12 @@ static int rsnd_adg_set_src_timsel_gen2(struct rsnd_mod *src_mod,
                break;
        }
 
-       return 0;
-}
-
-int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *src_mod,
-                                 struct rsnd_dai_stream *io,
-                                 unsigned int src_rate,
-                                 unsigned int dst_rate)
-{
-       struct rsnd_priv *priv = rsnd_mod_to_priv(src_mod);
-       struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
-       struct rsnd_mod *adg_mod = rsnd_mod_get(adg);
-       struct device *dev = rsnd_priv_to_dev(priv);
-       int idx, sel, div, step, ret;
-       u32 val, en;
-       unsigned int min, diff;
-       unsigned int sel_rate [] = {
-               clk_get_rate(adg->clk[CLKA]),   /* 0000: CLKA */
-               clk_get_rate(adg->clk[CLKB]),   /* 0001: CLKB */
-               clk_get_rate(adg->clk[CLKC]),   /* 0010: CLKC */
-               adg->rbga_rate_for_441khz,      /* 0011: RBGA */
-               adg->rbgb_rate_for_48khz,       /* 0100: RBGB */
-       };
-
-       rsnd_mod_confirm_src(src_mod);
-
-       min = ~0;
-       val = 0;
-       en = 0;
-       for (sel = 0; sel < ARRAY_SIZE(sel_rate); sel++) {
-               idx = 0;
-               step = 2;
-
-               if (!sel_rate[sel])
-                       continue;
-
-               for (div = 2; div <= 98304; div += step) {
-                       diff = abs(src_rate - sel_rate[sel] / div);
-                       if (min > diff) {
-                               val = (sel << 8) | idx;
-                               min = diff;
-                               en = 1 << (sel + 1); /* fixme */
-                       }
-
-                       /*
-                        * step of 0_0000 / 0_0001 / 0_1101
-                        * are out of order
-                        */
-                       if ((idx > 2) && (idx % 2))
-                               step *= 2;
-                       if (idx == 0x1c) {
-                               div += step;
-                               step *= 2;
-                       }
-                       idx++;
-               }
-       }
-
-       if (min == ~0) {
-               dev_err(dev, "no Input clock\n");
-               return -EIO;
-       }
-
-       ret = rsnd_adg_set_src_timsel_gen2(src_mod, io, val);
-       if (ret < 0) {
-               dev_err(dev, "timsel error\n");
-               return ret;
-       }
-
-       rsnd_mod_bset(adg_mod, DIV_EN, en, en);
-
-       dev_dbg(dev, "convert rate %d <-> %d\n", src_rate, dst_rate);
+       if (en)
+               rsnd_mod_bset(adg_mod, DIV_EN, en, en);
 
        return 0;
 }
 
-int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *src_mod,
-                                    struct rsnd_dai_stream *io)
-{
-       u32 val = rsnd_adg_ssi_ws_timing_gen2(io);
-
-       rsnd_mod_confirm_src(src_mod);
-
-       return rsnd_adg_set_src_timsel_gen2(src_mod, io, val);
-}
-
 static void rsnd_adg_set_ssi_clk(struct rsnd_mod *ssi_mod, u32 val)
 {
        struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 4b77f33..fc89a67 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -446,12 +446,10 @@ int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod);
 int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate);
 int rsnd_adg_probe(struct rsnd_priv *priv);
 void rsnd_adg_remove(struct rsnd_priv *priv);
-int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
+int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod,
                                  struct rsnd_dai_stream *io,
-                                 unsigned int src_rate,
-                                 unsigned int dst_rate);
-int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                    struct rsnd_dai_stream *io);
+                                 unsigned int in_rate,
+                                 unsigned int out_rate);
 int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,
                                 struct rsnd_dai_stream *io);
 

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index d1a8741..15d6ffe 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -189,7 +189,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
        struct device *dev = rsnd_priv_to_dev(priv);
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
-       u32 convert_rate = rsnd_src_convert_rate(io, mod);
+       u32 fin, fout;
        u32 ifscr, fsrate, adinr;
        u32 cr, route;
        u32 bsdsr, bsisr;
@@ -198,13 +198,16 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
        if (!runtime)
                return;
 
+       fin  = rsnd_src_get_in_rate(priv, io);
+       fout = rsnd_src_get_out_rate(priv, io);
+
        /* 6 - 1/6 are very enough ratio for SRC_BSDSR */
-       if (!convert_rate)
+       if (fin == fout)
                ratio = 0;
-       else if (convert_rate > runtime->rate)
-               ratio = 100 * convert_rate / runtime->rate;
+       else if (fin > fout)
+               ratio = 100 * fin / fout;
        else
-               ratio = 100 * runtime->rate / convert_rate;
+               ratio = 100 * fout / fin;
 
        if (ratio > 600) {
                dev_err(dev, "FSO/FSI ratio error\n");
@@ -222,9 +225,9 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
         */
        ifscr = 0;
        fsrate = 0;
-       if (convert_rate) {
+       if (fin != fout) {
                ifscr = 1;
-               fsrate = 0x0400000 / convert_rate * runtime->rate;
+               fsrate = 0x0400000 / fout * fin;
        }
 
        /*
@@ -232,7 +235,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
         */
        cr      = 0x00011110;
        route   = 0x0;
-       if (convert_rate) {
+       if (fin != fout) {
                route   = 0x1;
 
                if (rsnd_src_sync_is_enabled(mod)) {
@@ -274,12 +277,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
        rsnd_mod_write(mod, SRC_O_BUSIF_MODE, 1);
        rsnd_mod_write(mod, SRC_BUSIF_DALIGN, rsnd_get_dalign(mod, io));
 
-       if (convert_rate)
-               rsnd_adg_set_convert_clk_gen2(mod, io,
-                                             runtime->rate,
-                                             convert_rate);
-       else
-               rsnd_adg_set_convert_timing_gen2(mod, io);
+       rsnd_adg_set_src_timesel_gen2(mod, io, fin, fout);
 }
 
 static int rsnd_src_irq(struct rsnd_mod *mod,