diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-12-17 01:12:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-24 10:57:09 -0500 |
commit | abca75814a82c0c53c0a8ec7fa1300c133bc4f01 (patch) | |
tree | d62dca5f3cd5584f8345b5b3e6aeaf67e9464c97 /arch/arm/mach-shmobile/board-ap4evb.c | |
parent | 6cbdbffba19620db77de38094f407b6f21d3f10c (diff) |
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>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 99ef190d0909..4c979039d97e 100644 --- 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 = { | |||
657 | /* FSI */ | 657 | /* FSI */ |
658 | #define IRQ_FSI evt2irq(0x1840) | 658 | #define IRQ_FSI evt2irq(0x1840) |
659 | static struct sh_fsi_platform_info fsi_info = { | 659 | static struct sh_fsi_platform_info fsi_info = { |
660 | .port_a = { | ||
661 | .flags = SH_FSI_BRS_INV, | ||
662 | }, | ||
663 | .port_b = { | 660 | .port_b = { |
664 | .flags = SH_FSI_BRS_INV | | 661 | .flags = SH_FSI_CLK_CPG | |
665 | SH_FSI_BRM_INV | | ||
666 | SH_FSI_LRS_INV | | ||
667 | SH_FSI_CLK_CPG | | ||
668 | SH_FSI_FMT_SPDIF, | 662 | SH_FSI_FMT_SPDIF, |
669 | }, | 663 | }, |
670 | }; | 664 | }; |
@@ -816,7 +810,8 @@ static struct platform_device lcdc1_device = { | |||
816 | }; | 810 | }; |
817 | 811 | ||
818 | static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { | 812 | static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { |
819 | .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM, | 813 | .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM | |
814 | SND_SOC_DAIFMT_IB_NF, | ||
820 | }; | 815 | }; |
821 | 816 | ||
822 | static struct asoc_simple_card_info fsi2_hdmi_info = { | 817 | static struct asoc_simple_card_info fsi2_hdmi_info = { |