diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-11-29 21:32:04 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 06:34:44 -0500 |
commit | c8d6bf9a7b282255cd155b676ff91b08266b8529 (patch) | |
tree | ce498262399f2f1a03ea1a502c0de17759641ab7 /arch | |
parent | 649e5fb033bbadbfa78aba5e2711f1faf2affaf0 (diff) |
ASoC: sh: fsi-ak4642: Add FSI port and ak464x selection
Current FSI-Ak4642 device had niche settings which were
FSI2-A-AK4643 and FSI-A-AK4642.
This patch add platform_device_id which can control
FSI/FSI2, PortA/PortB, AK4642/AK4643 from platform data.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 5 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 5 |
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 d3260542b943..82c3204af899 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -640,6 +640,10 @@ static struct platform_device fsi_device = { | |||
640 | }, | 640 | }, |
641 | }; | 641 | }; |
642 | 642 | ||
643 | static struct platform_device fsi_ak4643_device = { | ||
644 | .name = "sh_fsi2_a_ak4643", | ||
645 | }; | ||
646 | |||
643 | static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = { | 647 | static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = { |
644 | .clock_source = LCDC_CLK_EXTERNAL, | 648 | .clock_source = LCDC_CLK_EXTERNAL, |
645 | .ch[0] = { | 649 | .ch[0] = { |
@@ -838,6 +842,7 @@ static struct platform_device *ap4evb_devices[] __initdata = { | |||
838 | &sdhi1_device, | 842 | &sdhi1_device, |
839 | &usb1_host_device, | 843 | &usb1_host_device, |
840 | &fsi_device, | 844 | &fsi_device, |
845 | &fsi_ak4643_device, | ||
841 | &sh_mmcif_device, | 846 | &sh_mmcif_device, |
842 | &lcdc1_device, | 847 | &lcdc1_device, |
843 | &lcdc_device, | 848 | &lcdc_device, |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index c31d228fdfc6..dff89d0fa20f 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -343,6 +343,10 @@ static struct platform_device fsi_device = { | |||
343 | }, | 343 | }, |
344 | }; | 344 | }; |
345 | 345 | ||
346 | static struct platform_device fsi_ak4642_device = { | ||
347 | .name = "sh_fsi_a_ak4642", | ||
348 | }; | ||
349 | |||
346 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ | 350 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ |
347 | static struct sh_keysc_info keysc_info = { | 351 | static struct sh_keysc_info keysc_info = { |
348 | .mode = SH_KEYSC_MODE_1, | 352 | .mode = SH_KEYSC_MODE_1, |
@@ -615,6 +619,7 @@ static struct platform_device *ms7724se_devices[] __initdata = { | |||
615 | &sh7724_usb0_host_device, | 619 | &sh7724_usb0_host_device, |
616 | &sh7724_usb1_gadget_device, | 620 | &sh7724_usb1_gadget_device, |
617 | &fsi_device, | 621 | &fsi_device, |
622 | &fsi_ak4642_device, | ||
618 | &sdhi0_cn7_device, | 623 | &sdhi0_cn7_device, |
619 | &sdhi1_cn8_device, | 624 | &sdhi1_cn8_device, |
620 | &irda_device, | 625 | &irda_device, |