ASoC: fsi: remove SH_FSI_xxx_INV flags

3449f5fab8c51e37a8a48bc2516588c615373191
(ASoC: fsi: add SND_SOC_DAIFMT_INV_xxx support)
added clock inversion support via snd_soc_dai_set_fmt().
Thus, this patch removed SH_FSI_xxx_INV and fsi_get_info()
from fsi driver, and modified platform settings to use new style.
Then, it cleaned up meaningless settings from platform.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 99ef190d0909d5ee5bf633efd0b660061244e71b..4c979039d97ec0b465fec6074c923e39f03b9321 100644 (file)
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -657,14 +657,8 @@ static struct platform_device lcdc_device = {
 /* FSI */
 #define IRQ_FSI                evt2irq(0x1840)
 static struct sh_fsi_platform_info fsi_info = {
-       .port_a = {
-               .flags          = SH_FSI_BRS_INV,
-       },
        .port_b = {
-               .flags          = SH_FSI_BRS_INV |
-                                 SH_FSI_BRM_INV |
-                                 SH_FSI_LRS_INV |
-                                 SH_FSI_CLK_CPG |
+               .flags          = SH_FSI_CLK_CPG |
                                  SH_FSI_FMT_SPDIF,
        },
 };
@@ -816,7 +810,8 @@ static struct platform_device lcdc1_device = {
 };
 
 static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
-       .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM,
+       .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM |
+                         SND_SOC_DAIFMT_IB_NF,
 };
 
 static struct asoc_simple_card_info fsi2_hdmi_info = {

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 2fed62f660459ccae4b08f8548543309587eb0fc..b5d210b4264c00e8c71ae417602cf7ada05c59b7 100644 (file)
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -503,7 +503,8 @@ static struct platform_device hdmi_lcdc_device = {
 };
 
 static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
-       .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM,
+       .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM |
+                         SND_SOC_DAIFMT_IB_NF,
 };
 
 static struct asoc_simple_card_info fsi2_hdmi_info = {
@@ -858,16 +859,12 @@ static struct platform_device leds_device = {
 #define IRQ_FSI evt2irq(0x1840)
 static struct sh_fsi_platform_info fsi_info = {
        .port_a = {
-               .flags = SH_FSI_BRS_INV,
                .tx_id = SHDMA_SLAVE_FSIA_TX,
                .rx_id = SHDMA_SLAVE_FSIA_RX,
        },
        .port_b = {
-               .flags = SH_FSI_BRS_INV |
-                       SH_FSI_BRM_INV  |
-                       SH_FSI_LRS_INV  |
-                       SH_FSI_CLK_CPG  |
-                       SH_FSI_FMT_SPDIF,
+               .flags = SH_FSI_CLK_CPG |
+                        SH_FSI_FMT_SPDIF,
        }
 };
 

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 3fede4556c91eee6ae7e5aa7a449675710254150..8ebe4c7a766b13395ece224310bb503385f78582 100644 (file)
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -877,12 +877,6 @@ static struct platform_device camera_devices[] = {
 };
 
 /* FSI */
-static struct sh_fsi_platform_info fsi_info = {
-       .port_b = {
-               .flags = SH_FSI_BRS_INV,
-       },
-};
-
 static struct resource fsi_resources[] = {
        [0] = {
                .name   = "FSI",
@@ -901,15 +895,13 @@ static struct platform_device fsi_device = {
        .id             = 0,
        .num_resources  = ARRAY_SIZE(fsi_resources),
        .resource       = fsi_resources,
-       .dev    = {
-               .platform_data  = &fsi_info,
-       },
 };
 
 static struct asoc_simple_dai_init_info fsi_da7210_init_info = {
        .fmt            = SND_SOC_DAIFMT_I2S,
        .codec_daifmt   = SND_SOC_DAIFMT_CBM_CFM,
-       .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS,
+       .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS |
+                         SND_SOC_DAIFMT_IB_NF,
 };
 
 static struct asoc_simple_card_info fsi_da7210_info = {

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 35f6efa3ac0e60c8f1842ef36629e3356622d0c9..975608f5e8054d21b65dad51c2663500416b7210 100644 (file)
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -279,12 +279,6 @@ static struct platform_device ceu1_device = {
 
 /* FSI */
 /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
-static struct sh_fsi_platform_info fsi_info = {
-       .port_a = {
-               .flags = SH_FSI_BRS_INV,
-       },
-};
-
 static struct resource fsi_resources[] = {
        [0] = {
                .name   = "FSI",
@@ -303,15 +297,13 @@ static struct platform_device fsi_device = {
        .id             = 0,
        .num_resources  = ARRAY_SIZE(fsi_resources),
        .resource       = fsi_resources,
-       .dev    = {
-               .platform_data  = &fsi_info,
-       },
 };
 
 static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {
        .fmt            = SND_SOC_DAIFMT_LEFT_J,
        .codec_daifmt   = SND_SOC_DAIFMT_CBM_CFM,
-       .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS,
+       .cpu_daifmt     = SND_SOC_DAIFMT_CBS_CFS |
+                         SND_SOC_DAIFMT_IB_NF,
        .sysclk         = 11289600,
 };
 

diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index 66285e1e340eab8da5e69d07aa4152ebb7a74891..43ac28581920b768465c97d3086145b062363214 100644 (file)
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -29,13 +29,6 @@
  * D:  clock selecter if master mode
  */
 
-/* A: clock inversion */
-#define SH_FSI_INVERSION_MASK  0x0000000F
-#define SH_FSI_LRM_INV         (1 << 0)
-#define SH_FSI_BRM_INV         (1 << 1)
-#define SH_FSI_LRS_INV         (1 << 2)
-#define SH_FSI_BRS_INV         (1 << 3)
-
 /* B: format mode */
 #define SH_FSI_FMT_MASK                0x000000F0
 #define SH_FSI_FMT_DAI         (0 << 4)

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 5cb1332e0438388ba81b6b016bb67a2d891d4ec1..f14c611b38c642e004741d2cd6ff031abc832ef6 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -251,7 +251,6 @@ struct fsi_clk {
 struct fsi_priv {
        void __iomem *base;
        struct fsi_master *master;
-       struct sh_fsi_port_info *info;
 
        struct fsi_stream playback;
        struct fsi_stream capture;
@@ -426,14 +425,6 @@ static struct fsi_priv *fsi_get_priv(struct snd_pcm_substream *substream)
        return fsi_get_priv_frm_dai(fsi_get_dai(substream));
 }
 
-static u32 fsi_get_info_flags(struct fsi_priv *fsi)
-{
-       if (!fsi->info)
-               return 0;
-
-       return fsi->info->flags;
-}
-
 static u32 fsi_get_port_shift(struct fsi_priv *fsi, struct fsi_stream *io)
 {
        int is_play = fsi_stream_is_play(fsi, io);
@@ -1543,7 +1534,6 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
                          struct fsi_stream *io,
                          struct device *dev)
 {
-       u32 flags = fsi_get_info_flags(fsi);
        u32 data = 0;
 
        /* clock setting */
@@ -1560,19 +1550,6 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
                data |= (1 << 4);
        if (fsi_is_clk_master(fsi))
                data <<= 8;
-       /* FIXME
-        *
-        * SH_FSI_xxx_INV style will be removed
-        */
-       if (SH_FSI_LRM_INV & flags)
-               data |= 1 << 12;
-       if (SH_FSI_BRM_INV & flags)
-               data |= 1 << 8;
-       if (SH_FSI_LRS_INV & flags)
-               data |= 1 << 4;
-       if (SH_FSI_BRS_INV & flags)
-               data |= 1 << 0;
-
        fsi_reg_write(fsi, CKG2, data);
 
        /* spdif ? */
@@ -1988,7 +1965,6 @@ static int fsi_probe(struct platform_device *pdev)
        fsi             = &master->fsia;
        fsi->base       = master->base;
        fsi->master     = master;
-       fsi->info       = pinfo;
        fsi_port_info_init(fsi, pinfo);
        fsi_handler_init(fsi, pinfo);
        ret = fsi_stream_probe(fsi, &pdev->dev);
@@ -2002,7 +1978,6 @@ static int fsi_probe(struct platform_device *pdev)
        fsi             = &master->fsib;
        fsi->base       = master->base + 0x40;
        fsi->master     = master;
-       fsi->info       = pinfo;
        fsi_port_info_init(fsi, pinfo);
        fsi_handler_init(fsi, pinfo);
        ret = fsi_stream_probe(fsi, &pdev->dev);