2 files changed, 38 insertions, 2 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index b39751244daa..8302265977a8 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -909,8 +909,26 @@ static struct platform_device lcdc1_device = {
         },
 };
 
+static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
+        .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct asoc_simple_card_info fsi2_hdmi_info = {
+        .name           = "HDMI",
+        .card           = "FSI2B-HDMI",
+        .cpu_dai        = "fsib-dai",
+        .codec          = "sh-mobile-hdmi",
+        .platform       = "sh_fsi2",
+        .codec_dai      = "sh_mobile_hdmi-hifi",
+        .init           = &fsi2_hdmi_init_info,
+};
+
 static struct platform_device fsi_hdmi_device = {
-        .name           = "sh_fsi2_b_hdmi",
+        .name   = "asoc-simple-card",
+        .id     = 1,
+        .dev    = {
+                .platform_data  = &fsi2_hdmi_info,
+        },
 };
 
 static struct gpio_led ap4evb_leds[] = {
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 4a461384d27c..1bf1b2b8f8e9 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -503,8 +503,26 @@ static struct platform_device hdmi_lcdc_device = {
         },
 };
 
+static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
+        .cpu_daifmt     = SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct asoc_simple_card_info fsi2_hdmi_info = {
+        .name           = "HDMI",
+        .card           = "FSI2B-HDMI",
+        .cpu_dai        = "fsib-dai",
+        .codec          = "sh-mobile-hdmi",
+        .platform       = "sh_fsi2",
+        .codec_dai      = "sh_mobile_hdmi-hifi",
+        .init           = &fsi2_hdmi_init_info,
+};
+
 static struct platform_device fsi_hdmi_device = {
-        .name           = "sh_fsi2_b_hdmi",
+        .name   = "asoc-simple-card",
+        .id     = 1,
+        .dev    = {
+                .platform_data  = &fsi2_hdmi_info,
+        },
 };
 
 static void __init hdmi_init_pm_clock(void)