diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 06:55:33 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 06:55:33 +0900 |
| commit | 2eebcef31a133b27a09c457f3a7ad509bf237822 (patch) | |
| tree | a717becc4cbe8dae31bb29af90f3cbd5f635497e /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | f89983ef61677afc828ed32b3c42ef5a71eb0686 (diff) | |
| parent | fd974e52dbbdb27910d40d8feea7000f26545683 (diff) | |
| download | op-kernel-dev-2eebcef31a133b27a09c457f3a7ad509bf237822.zip op-kernel-dev-2eebcef31a133b27a09c457f3a7ad509bf237822.tar.gz | |
Merge branch 'topic/fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple-card
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 2fed62f..b5d210b 100644 --- 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, } }; |
