aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-01-23 20:09:02 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 10:15:24 -0500
commit3f25c9ccb7409e6f61c11e7828c0ddb54ab1cb7b (patch)
treefe370fad65d0cdaf31884af905c9d7fdc04da682 /arch/arm
parent3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1 (diff)
ASoC: sh: fsi-hdmi: Add FSI port and HDMI selection
This patch add platform_device_id which can control PortA/PortB for FSI2-HDMI from platform data. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c5
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index d503a74e30e4..920ed81f1c61 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -781,6 +781,10 @@ static struct platform_device hdmi_device = {
781 }, 781 },
782}; 782};
783 783
784static struct platform_device fsi_hdmi_device = {
785 .name = "sh_fsi2_b_hdmi",
786};
787
784static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq, 788static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,
785 unsigned long *parent_freq) 789 unsigned long *parent_freq)
786{ 790{
@@ -934,6 +938,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
934 &usb1_host_device, 938 &usb1_host_device,
935 &fsi_device, 939 &fsi_device,
936 &fsi_ak4643_device, 940 &fsi_ak4643_device,
941 &fsi_hdmi_device,
937 &sh_mmcif_device, 942 &sh_mmcif_device,
938 &lcdc1_device, 943 &lcdc1_device,
939 &lcdc_device, 944 &lcdc_device,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 425962d5b29c..aa4bcc347044 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -400,6 +400,10 @@ static struct platform_device hdmi_device = {
400 }, 400 },
401}; 401};
402 402
403static struct platform_device fsi_hdmi_device = {
404 .name = "sh_fsi2_b_hdmi",
405};
406
403static int __init hdmi_init_pm_clock(void) 407static int __init hdmi_init_pm_clock(void)
404{ 408{
405 struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick"); 409 struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
@@ -920,6 +924,7 @@ static struct platform_device *mackerel_devices[] __initdata = {
920 &leds_device, 924 &leds_device,
921 &fsi_device, 925 &fsi_device,
922 &fsi_ak4643_device, 926 &fsi_ak4643_device,
927 &fsi_hdmi_device,
923 &sdhi0_device, 928 &sdhi0_device,
924#if !defined(CONFIG_MMC_SH_MMCIF) 929#if !defined(CONFIG_MMC_SH_MMCIF)
925 &sdhi1_device, 930 &sdhi1_device,