Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da98f44f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes-for-v3.16' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 96919d44 73035985

arch/arm/mach-shmobile/board-armadillo800eva.c

+1 −1
Original line number Diff line number Diff line
@@ -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",