diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 1657eac5dde2..1a63c213e45d 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -399,6 +399,10 @@ static struct platform_device hdmi_device = { | |||
399 | }, | 399 | }, |
400 | }; | 400 | }; |
401 | 401 | ||
402 | static struct platform_device fsi_hdmi_device = { | ||
403 | .name = "sh_fsi2_b_hdmi", | ||
404 | }; | ||
405 | |||
402 | static int __init hdmi_init_pm_clock(void) | 406 | static int __init hdmi_init_pm_clock(void) |
403 | { | 407 | { |
404 | struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick"); | 408 | struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick"); |
@@ -609,16 +613,12 @@ fsi_set_rate_end: | |||
609 | } | 613 | } |
610 | 614 | ||
611 | static struct sh_fsi_platform_info fsi_info = { | 615 | static struct sh_fsi_platform_info fsi_info = { |
612 | .porta_flags = SH_FSI_BRS_INV | | 616 | .porta_flags = SH_FSI_BRS_INV, |
613 | SH_FSI_OUT_SLAVE_MODE | | ||
614 | SH_FSI_IN_SLAVE_MODE | | ||
615 | SH_FSI_OFMT(PCM) | | ||
616 | SH_FSI_IFMT(PCM), | ||
617 | 617 | ||
618 | .portb_flags = SH_FSI_BRS_INV | | 618 | .portb_flags = SH_FSI_BRS_INV | |
619 | SH_FSI_BRM_INV | | 619 | SH_FSI_BRM_INV | |
620 | SH_FSI_LRS_INV | | 620 | SH_FSI_LRS_INV | |
621 | SH_FSI_OFMT(SPDIF), | 621 | SH_FSI_FMT_SPDIF, |
622 | 622 | ||
623 | .set_rate = fsi_set_rate, | 623 | .set_rate = fsi_set_rate, |
624 | }; | 624 | }; |
@@ -921,6 +921,7 @@ static struct platform_device *mackerel_devices[] __initdata = { | |||
921 | &leds_device, | 921 | &leds_device, |
922 | &fsi_device, | 922 | &fsi_device, |
923 | &fsi_ak4643_device, | 923 | &fsi_ak4643_device, |
924 | &fsi_hdmi_device, | ||
924 | &sdhi0_device, | 925 | &sdhi0_device, |
925 | #if !defined(CONFIG_MMC_SH_MMCIF) | 926 | #if !defined(CONFIG_MMC_SH_MMCIF) |
926 | &sdhi1_device, | 927 | &sdhi1_device, |