ASoC: sh: fsi: Add snd_soc_dai_set_fmt support

This patch add snd_soc_dai_ops :: set_fmt to FSI driver and
select master/slave clock mode by snd_soc_dai_set_fmt on
fsi-xxx.c instead of platform infomation code.
This patch remove fsi_is_master function which is no longer needed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

4 files changed, 61 insertions, 29 deletions

diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index a722a4c661ff..ce058c749e6a 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -23,15 +23,20 @@ struct fsi_ak4642_data {
 
 static int fsi_ak4642_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *dai = rtd->codec_dai;
+        struct snd_soc_dai *codec = rtd->codec_dai;
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
         int ret;
 
-        ret = snd_soc_dai_set_fmt(dai, SND_SOC_DAIFMT_LEFT_J |
-                                       SND_SOC_DAIFMT_CBM_CFM);
+        ret = snd_soc_dai_set_fmt(codec, SND_SOC_DAIFMT_LEFT_J |
+                                         SND_SOC_DAIFMT_CBM_CFM);
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_sysclk(dai, 0, 11289600, 0);
+        ret = snd_soc_dai_set_sysclk(codec, 0, 11289600, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_CBS_CFS);
 
         return ret;
 }
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c
index e8df9da92f71..9b24ed466ab1 100644
--- a/sound/soc/sh/fsi-da7210.c
+++ b/sound/soc/sh/fsi-da7210.c
@@ -15,11 +15,19 @@
 
 static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *dai = rtd->codec_dai;
+        struct snd_soc_dai *codec = rtd->codec_dai;
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
+        int ret;
 
-        return snd_soc_dai_set_fmt(dai,
+        ret = snd_soc_dai_set_fmt(codec,
                                    SND_SOC_DAIFMT_I2S |
                                    SND_SOC_DAIFMT_CBM_CFM);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_CBS_CFS);
+
+        return ret;
 }
 
 static struct snd_soc_dai_link fsi_da7210_dai = {
diff --git a/sound/soc/sh/fsi-hdmi.c b/sound/soc/sh/fsi-hdmi.c
index a52dd8ec71d3..96d8ce3f3211 100644
--- a/sound/soc/sh/fsi-hdmi.c
+++ b/sound/soc/sh/fsi-hdmi.c
@@ -12,6 +12,16 @@
 #include <linux/platform_device.h>
 #include <sound/sh_fsi.h>
 
+static int fsi_hdmi_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
+        int ret;
+
+        ret = snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_CBM_CFM);
+
+        return ret;
+}
+
 static struct snd_soc_dai_link fsi_dai_link = {
         .name           = "HDMI",
         .stream_name    = "HDMI",
@@ -19,6 +29,7 @@ static struct snd_soc_dai_link fsi_dai_link = {
         .codec_dai_name = "sh_mobile_hdmi-hifi",
         .platform_name  = "sh_fsi2",
         .codec_name     = "sh-mobile-hdmi",
+        .init           = fsi_hdmi_dai_init,
 };
 
 static struct snd_soc_card fsi_soc_card  = {
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 1d0a16e80919..5f39f364effd 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -78,6 +78,8 @@
 /* CKG1 */
 #define ACKMD_MASK      0x00007000
 #define BPFMD_MASK      0x00000700
+#define DIMD            (1 << 4)
+#define DOMD            (1 << 0)
 
 /* A/B MST_CTLR */
 #define BP      (1 << 4)        /* Fix the signal of Biphase output */
@@ -292,21 +294,6 @@ static inline struct fsi_stream *fsi_get_stream(struct fsi_priv *fsi,
         return is_play ? &fsi->playback : &fsi->capture;
 }
 
-static int fsi_is_master_mode(struct fsi_priv *fsi, int is_play)
-{
-        u32 mode;
-        u32 flags = fsi_get_info_flags(fsi);
-
-        mode = is_play ? SH_FSI_OUT_SLAVE_MODE : SH_FSI_IN_SLAVE_MODE;
-
-        /* return
-         * 1 : master mode
-         * 0 : slave mode
-         */
-
-        return (mode & flags) != mode;
-}
-
 static u32 fsi_get_port_shift(struct fsi_priv *fsi, int is_play)
 {
         int is_porta = fsi_is_port_a(fsi);
@@ -764,19 +751,11 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
         u32 fmt;
         u32 data;
         int is_play = fsi_is_play(substream);
-        int is_master;
 
         io = fsi_get_stream(fsi, is_play);
 
         pm_runtime_get_sync(dai->dev);
 
-        /* CKG1 */
-        data = is_play ? (1 << 0) : (1 << 4);
-        is_master = fsi_is_master_mode(fsi, is_play);
-        if (is_master)
-                fsi_reg_mask_set(fsi, CKG1, data, data);
-        else
-                fsi_reg_mask_set(fsi, CKG1, data, 0);
 
         /* clock inversion (CKG2) */
         data = 0;
@@ -893,6 +872,34 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
         return ret;
 }
 
+static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai);
+        u32 data = 0;
+        int ret;
+
+        pm_runtime_get_sync(dai->dev);
+
+        /* set master/slave audio interface */
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                data = DIMD | DOMD;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                break;
+        default:
+                ret = -EINVAL;
+                goto set_fmt_exit;
+        }
+        fsi_reg_mask_set(fsi, CKG1, (DIMD | DOMD), data);
+        ret = 0;
+
+set_fmt_exit:
+        pm_runtime_put_sync(dai->dev);
+
+        return ret;
+}
+
 static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *params,
                              struct snd_soc_dai *dai)
@@ -979,6 +986,7 @@ static struct snd_soc_dai_ops fsi_dai_ops = {
         .startup        = fsi_dai_startup,
         .shutdown       = fsi_dai_shutdown,
         .trigger        = fsi_dai_trigger,
+        .set_fmt        = fsi_dai_set_fmt,
         .hw_params      = fsi_dai_hw_params,
 };