diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-01-19 21:46:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-21 14:01:47 -0500 |
commit | 4d805f7b6607f6e547dc22e5d57c201e43d21c05 (patch) | |
tree | 41ce090f7f9f3f4cc76e74101a108218da447f62 /arch/sh | |
parent | 0d032c19e764ad2f60292f58116f6c2a052a58ab (diff) |
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>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 33b662999fc6..037416f346cf 100644 --- 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[] = { | |||
724 | /* FSI */ | 724 | /* FSI */ |
725 | static struct sh_fsi_platform_info fsi_info = { | 725 | static struct sh_fsi_platform_info fsi_info = { |
726 | .portb_flags = SH_FSI_BRS_INV | | 726 | .portb_flags = SH_FSI_BRS_INV | |
727 | SH_FSI_OUT_SLAVE_MODE | | ||
728 | SH_FSI_IN_SLAVE_MODE | | ||
729 | SH_FSI_OFMT(I2S) | | 727 | SH_FSI_OFMT(I2S) | |
730 | SH_FSI_IFMT(I2S), | 728 | SH_FSI_IFMT(I2S), |
731 | }; | 729 | }; |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 527679394a25..b4aef05dd8b5 100644 --- 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 = { | |||
287 | /* change J20, J21, J22 pin to 1-2 connection to use slave mode */ | 287 | /* change J20, J21, J22 pin to 1-2 connection to use slave mode */ |
288 | static struct sh_fsi_platform_info fsi_info = { | 288 | static struct sh_fsi_platform_info fsi_info = { |
289 | .porta_flags = SH_FSI_BRS_INV | | 289 | .porta_flags = SH_FSI_BRS_INV | |
290 | SH_FSI_OUT_SLAVE_MODE | | ||
291 | SH_FSI_IN_SLAVE_MODE | | ||
292 | SH_FSI_OFMT(PCM) | | 290 | SH_FSI_OFMT(PCM) | |
293 | SH_FSI_IFMT(PCM), | 291 | SH_FSI_IFMT(PCM), |
294 | }; | 292 | }; |