diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-30 18:23:35 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-30 18:23:35 +0200 |
| commit | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (patch) | |
| tree | 86a7b7b507e421e534d94b9b788df741692ad1cb /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | ARM: msm: Silence readb/writeb warnings due to missing IOMEM() (diff) | |
| parent | ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting (diff) | |
| download | linux-da98f44f27d81d7fe9a41f69af4fe08c18d13b56.tar.xz linux-da98f44f27d81d7fe9a41f69af4fe08c18d13b56.zip | |
Merge tag 'renesas-fixes-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
Merge "Renesas ARM Based SoC Fixes for v3.16" from Simon Horman:
This corrects a bug that will be introduced in v3.15.
The bug causes audio playback to fail on the Armadillo800 EVA board.
* tag 'renesas-fixes-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 486063db2a2f..da4163ff31a2 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1017,7 +1017,7 @@ static struct asoc_simple_card_info fsi2_hdmi_info = { .platform = "sh_fsi2", .cpu_dai = { .name = "fsib-dai", - .fmt = SND_SOC_DAIFMT_CBM_CFM, + .fmt = SND_SOC_DAIFMT_CBS_CFS, }, .codec_dai = { .name = "sh_mobile_hdmi-hifi", |