From a973b11ddf27903c36c6d3d659b9ca77cc531cad Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 25 Jun 2012 03:37:20 -0700
Subject: [PATCH] --- yaml --- r: 319308 b: refs/heads/master c:
 dc7dd5841f714c3bc3f358cb126ba4432947e854 h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/arm/configs/armadillo800eva_defconfig     | 2 ++
 trunk/arch/arm/mach-shmobile/board-armadillo800eva.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 90f7bf0cece0..0a8d7f0ffa5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0676c05e57c6e37fc9f985a8f6ea2883e5b2cbda
+refs/heads/master: dc7dd5841f714c3bc3f358cb126ba4432947e854
diff --git a/trunk/arch/arm/configs/armadillo800eva_defconfig b/trunk/arch/arm/configs/armadillo800eva_defconfig
index df1ce543cd7c..16bbb3f8f234 100644
--- a/trunk/arch/arm/configs/armadillo800eva_defconfig
+++ b/trunk/arch/arm/configs/armadillo800eva_defconfig
@@ -119,6 +119,8 @@ CONFIG_USB_ETH=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
 CONFIG_MMC_SH_MMCIF=y
+CONFIG_DMADEVICES=y
+CONFIG_SH_DMAE=y
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
 # CONFIG_DNOTIFY is not set
diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
index a642ce68dddf..d63e559629b8 100644
--- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -768,12 +768,14 @@ static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable)
 static struct sh_fsi_platform_info fsi_info = {
 	/* FSI-WM8978 */
 	.port_a = {
+		.tx_id = SHDMA_SLAVE_FSIA_TX,
 	},
 	/* FSI-HDMI */
 	.port_b = {
 		.flags		= SH_FSI_FMT_SPDIF |
 				  SH_FSI_ENABLE_STREAM_MODE,
 		.set_rate	= fsi_hdmi_set_rate,
+		.tx_id		= SHDMA_SLAVE_FSIB_TX,
 	}
 };