Merge branch 'topic/asoc' into for-linus

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 81d6536552a9..1a8118c929be 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -673,16 +673,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)
 }
 
 static struct sh_fsi_platform_info fsi_info = {
-        .porta_flags = SH_FSI_BRS_INV |
-                       SH_FSI_OUT_SLAVE_MODE |
-                       SH_FSI_IN_SLAVE_MODE |
-                       SH_FSI_OFMT(PCM) |
-                       SH_FSI_IFMT(PCM),
+        .porta_flags = SH_FSI_BRS_INV,
 
         .portb_flags = SH_FSI_BRS_INV |
                        SH_FSI_BRM_INV |
                        SH_FSI_LRS_INV |
-                       SH_FSI_OFMT(SPDIF),
+                       SH_FSI_FMT_SPDIF,
         .set_rate = fsi_set_rate,
 };
 
@@ -783,6 +779,10 @@ static struct platform_device hdmi_device = {
         },
 };
 
+static struct platform_device fsi_hdmi_device = {
+        .name           = "sh_fsi2_b_hdmi",
+};
+
 static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,
                                 unsigned long *parent_freq)
 {
@@ -936,6 +936,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
         &usb1_host_device,
         &fsi_device,
         &fsi_ak4643_device,
+        &fsi_hdmi_device,
         &sh_mmcif_device,
         &lcdc1_device,
         &lcdc_device,