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/arm/mach-shmobile | |
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/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index c18a740a4159..9ee55e0fbeb1 100644 --- 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 = { | |||
119 | 119 | ||
120 | /* FSI A */ | 120 | /* FSI A */ |
121 | static struct sh_fsi_platform_info fsi_info = { | 121 | static struct sh_fsi_platform_info fsi_info = { |
122 | .porta_flags = SH_FSI_OUT_SLAVE_MODE | | 122 | .porta_flags = SH_FSI_OFMT(I2S) | |
123 | SH_FSI_IN_SLAVE_MODE | | ||
124 | SH_FSI_OFMT(I2S) | | ||
125 | SH_FSI_IFMT(I2S), | 123 | SH_FSI_IFMT(I2S), |
126 | }; | 124 | }; |
127 | 125 | ||
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 3cf0951caa2d..d503a74e30e4 100644 --- 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) | |||
674 | 674 | ||
675 | static struct sh_fsi_platform_info fsi_info = { | 675 | static struct sh_fsi_platform_info fsi_info = { |
676 | .porta_flags = SH_FSI_BRS_INV | | 676 | .porta_flags = SH_FSI_BRS_INV | |
677 | SH_FSI_OUT_SLAVE_MODE | | ||
678 | SH_FSI_IN_SLAVE_MODE | | ||
679 | SH_FSI_OFMT(PCM) | | 677 | SH_FSI_OFMT(PCM) | |
680 | SH_FSI_IFMT(PCM), | 678 | SH_FSI_IFMT(PCM), |
681 | 679 | ||
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 7b15d21f0f68..425962d5b29c 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -611,8 +611,6 @@ fsi_set_rate_end: | |||
611 | 611 | ||
612 | static struct sh_fsi_platform_info fsi_info = { | 612 | static struct sh_fsi_platform_info fsi_info = { |
613 | .porta_flags = SH_FSI_BRS_INV | | 613 | .porta_flags = SH_FSI_BRS_INV | |
614 | SH_FSI_OUT_SLAVE_MODE | | ||
615 | SH_FSI_IN_SLAVE_MODE | | ||
616 | SH_FSI_OFMT(PCM) | | 614 | SH_FSI_OFMT(PCM) | |
617 | SH_FSI_IFMT(PCM), | 615 | SH_FSI_IFMT(PCM), |
618 | 616 | ||