1 files changed, 21 insertions, 36 deletions

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 69c44269ebdb..fc41a0e8b09f 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -57,6 +57,24 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
         return (0x6 + ws) << 8;
 }
 
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
+                                 struct rsnd_mod *mod,
+                                 struct rsnd_dai_stream *io)
+{
+        int id = rsnd_mod_id(mod);
+        int shift = (id % 2) ? 16 : 0;
+        u32 mask, val;
+
+        val = rsnd_adg_ssi_ws_timing_gen2(io);
+
+        val  = val      << shift;
+        mask = 0xffff   << shift;
+
+        rsnd_mod_bset(mod, CMDOUT_TIMSEL, mask, val);
+
+        return 0;
+}
+
 static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
                                         struct rsnd_mod *mod,
                                         struct rsnd_dai_stream *io,
@@ -397,9 +415,8 @@ int rsnd_adg_probe(struct platform_device *pdev,
 {
         struct rsnd_adg *adg;
         struct device *dev = rsnd_priv_to_dev(priv);
-        struct clk *clk, *clk_orig;
+        struct clk *clk;
         int i;
-        bool use_old_style = false;
 
         adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);
         if (!adg) {
@@ -407,45 +424,13 @@ int rsnd_adg_probe(struct platform_device *pdev,
                 return -ENOMEM;
         }
 
-        clk_orig        = devm_clk_get(dev, NULL);
         adg->clk[CLKA]  = devm_clk_get(dev, "clk_a");
         adg->clk[CLKB]  = devm_clk_get(dev, "clk_b");
         adg->clk[CLKC]  = devm_clk_get(dev, "clk_c");
         adg->clk[CLKI]  = devm_clk_get(dev, "clk_i");
 
-        /*
-         * It request device dependent audio clock.
-         * But above all clks will indicate rsnd module clock
-         * if platform doesn't it
-         */
-        for_each_rsnd_clk(clk, adg, i) {
-                if (clk_orig == clk) {
-                        dev_warn(dev,
-                                 "doesn't have device dependent clock, use independent clock\n");
-                        use_old_style = true;
-                        break;
-                }
-        }
-
-        /*
-         * note:
-         * these exist in order to keep compatible with
-         * platform which has device independent audio clock,
-         * but will be removed soon
-         */
-        if (use_old_style) {
-                adg->clk[CLKA] = devm_clk_get(NULL, "audio_clk_a");
-                adg->clk[CLKB] = devm_clk_get(NULL, "audio_clk_b");
-                adg->clk[CLKC] = devm_clk_get(NULL, "audio_clk_c");
-                adg->clk[CLKI] = devm_clk_get(NULL, "audio_clk_internal");
-        }
-
-        for_each_rsnd_clk(clk, adg, i) {
-                if (IS_ERR(clk)) {
-                        dev_err(dev, "Audio clock failed\n");
-                        return -EIO;
-                }
-        }
+        for_each_rsnd_clk(clk, adg, i)
+                dev_dbg(dev, "clk %d : %p\n", i, clk);
 
         rsnd_adg_ssi_clk_init(priv, adg);