diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index df1ce543cd7c..16bbb3f8f234 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
@@ -119,6 +119,8 @@ CONFIG_USB_ETH=m | |||
119 | CONFIG_MMC=y | 119 | CONFIG_MMC=y |
120 | CONFIG_MMC_SDHI=y | 120 | CONFIG_MMC_SDHI=y |
121 | CONFIG_MMC_SH_MMCIF=y | 121 | CONFIG_MMC_SH_MMCIF=y |
122 | CONFIG_DMADEVICES=y | ||
123 | CONFIG_SH_DMAE=y | ||
122 | CONFIG_UIO=y | 124 | CONFIG_UIO=y |
123 | CONFIG_UIO_PDRV_GENIRQ=y | 125 | CONFIG_UIO_PDRV_GENIRQ=y |
124 | # CONFIG_DNOTIFY is not set | 126 | # CONFIG_DNOTIFY is not set |
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index a642ce68dddf..d63e559629b8 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
@@ -768,12 +768,14 @@ static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable) | |||
768 | static struct sh_fsi_platform_info fsi_info = { | 768 | static struct sh_fsi_platform_info fsi_info = { |
769 | /* FSI-WM8978 */ | 769 | /* FSI-WM8978 */ |
770 | .port_a = { | 770 | .port_a = { |
771 | .tx_id = SHDMA_SLAVE_FSIA_TX, | ||
771 | }, | 772 | }, |
772 | /* FSI-HDMI */ | 773 | /* FSI-HDMI */ |
773 | .port_b = { | 774 | .port_b = { |
774 | .flags = SH_FSI_FMT_SPDIF | | 775 | .flags = SH_FSI_FMT_SPDIF | |
775 | SH_FSI_ENABLE_STREAM_MODE, | 776 | SH_FSI_ENABLE_STREAM_MODE, |
776 | .set_rate = fsi_hdmi_set_rate, | 777 | .set_rate = fsi_hdmi_set_rate, |
778 | .tx_id = SHDMA_SLAVE_FSIB_TX, | ||
777 | } | 779 | } |
778 | }; | 780 | }; |
779 | 781 | ||