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>

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index c18a740a415957b2bcd8e4ea30d192822b501c5f..9ee55e0fbeb1ef786a85467c2f53d013b1c6a9cd 100644 (file)
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -119,9 +119,7 @@ static struct platform_device keysc_device = {
 
 /* FSI A */
 static struct sh_fsi_platform_info fsi_info = {
-       .porta_flags = SH_FSI_OUT_SLAVE_MODE    |
-                      SH_FSI_IN_SLAVE_MODE     |
-                      SH_FSI_OFMT(I2S)         |
+       .porta_flags = SH_FSI_OFMT(I2S)         |
                       SH_FSI_IFMT(I2S),
 };
 

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 3cf0951caa2dd73d164f04a5ad1ef1f9ba356c1a..d503a74e30e456fc81c174e63a82fe97414d2e69 100644 (file)
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -674,8 +674,6 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)
 
 static struct sh_fsi_platform_info fsi_info = {
        .porta_flags = SH_FSI_BRS_INV |
-                      SH_FSI_OUT_SLAVE_MODE |
-                      SH_FSI_IN_SLAVE_MODE |
                       SH_FSI_OFMT(PCM) |
                       SH_FSI_IFMT(PCM),
 

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 7b15d21f0f68b473fc7e8d87a859effdece7670d..425962d5b29c8133872f74ad85fc3e8d64c96c36 100644 (file)
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -611,8 +611,6 @@ fsi_set_rate_end:
 
 static struct sh_fsi_platform_info fsi_info = {
        .porta_flags =  SH_FSI_BRS_INV          |
-                       SH_FSI_OUT_SLAVE_MODE   |
-                       SH_FSI_IN_SLAVE_MODE    |
                        SH_FSI_OFMT(PCM)        |
                        SH_FSI_IFMT(PCM),
 

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 33b662999fc66b68b8fbe5f1893aa5ce675e5d0c..037416f346cf8c0a3f3b823693b19b488c4315aa 100644 (file)
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -724,8 +724,6 @@ static struct platform_device camera_devices[] = {
 /* FSI */
 static struct sh_fsi_platform_info fsi_info = {
        .portb_flags = SH_FSI_BRS_INV |
-                      SH_FSI_OUT_SLAVE_MODE |
-                      SH_FSI_IN_SLAVE_MODE |
                       SH_FSI_OFMT(I2S) |
                       SH_FSI_IFMT(I2S),
 };

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 527679394a256ceed4e43789f03978a5d2274629..b4aef05dd8b5420830087b647bb518a84515a6f1 100644 (file)
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -287,8 +287,6 @@ static struct platform_device ceu1_device = {
 /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
 static struct sh_fsi_platform_info fsi_info = {
        .porta_flags = SH_FSI_BRS_INV |
-                      SH_FSI_OUT_SLAVE_MODE |
-                      SH_FSI_IN_SLAVE_MODE |
                       SH_FSI_OFMT(PCM) |
                       SH_FSI_IFMT(PCM),
 };

diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index d79894192ae3e10cb5f072c51f2ed640c7ba76fd..18e43279f70fb4e7e830dfcf3d8a523c26a76e40 100644 (file)
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -17,12 +17,11 @@
 
 /* flags format
 
- * 0xABCDEEFF
+ * 0xABC0EEFF
  *
  * A:  channel size for TDM (input)
  * B:  channel size for TDM (ooutput)
  * C:  inversion
- * D:  mode
  * E:  input format
  * F:  output format
  */
@@ -46,11 +45,6 @@
 #define SH_FSI_LRS_INV         (1 << 22)
 #define SH_FSI_BRS_INV         (1 << 23)
 
-/* mode */
-#define SH_FSI_MODE_MASK       0x000F0000
-#define SH_FSI_IN_SLAVE_MODE   (1 << 16)  /* default master mode */
-#define SH_FSI_OUT_SLAVE_MODE  (1 << 17)  /* default master mode */
-
 /* DI format */
 #define SH_FSI_FMT_MASK                0x000000FF
 #define SH_FSI_IFMT(x)         (((SH_FSI_FMT_ ## x) & SH_FSI_FMT_MASK) << 8)

diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index a722a4c661ffb6f716948c5ca17b139983e17ed2..ce058c749e6aa6e46db8689c861495aef6b00ad0 100644 (file)
--- 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 e8df9da92f713c9c772a9c35e4f4c6b5b033e06e..9b24ed466ab13bc079d94d081152fb0b26bccea8 100644 (file)
--- 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 a52dd8ec71d38d1b7b0c0b48d0707c34e9e28669..96d8ce3f3211ec01e49c9e628fb7218123575c3a 100644 (file)
--- 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 1d0a16e80919f788f5566f6cff64f857bbecb9a0..5f39f364effdfa85d263991010cb796c4ff4a224 100644 (file)
--- 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,
 };