aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 02:37:24 -0500
committerTakashi Iwai <tiwai@suse.de>2011-01-13 02:37:24 -0500
commit6db9a0f326d3144d790d9479309df480a8f562e4 (patch)
tree650a8950c35c087278ecee1b8d123f75f601ebc8 /arch/arm/mach-shmobile
parentc400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff)
parent18b022eb117e7f70c191267551ff865f278a9258 (diff)
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index d440e5f456a..e6bf1e114b1 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -729,6 +729,10 @@ static struct platform_device fsi_device = {
729 }, 729 },
730}; 730};
731 731
732static struct platform_device fsi_ak4643_device = {
733 .name = "sh_fsi2_a_ak4643",
734};
735
732static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = { 736static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = {
733 .clock_source = LCDC_CLK_EXTERNAL, 737 .clock_source = LCDC_CLK_EXTERNAL,
734 .ch[0] = { 738 .ch[0] = {
@@ -927,6 +931,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
927 &sdhi1_device, 931 &sdhi1_device,
928 &usb1_host_device, 932 &usb1_host_device,
929 &fsi_device, 933 &fsi_device,
934 &fsi_ak4643_device,
930 &sh_mmcif_device, 935 &sh_mmcif_device,
931 &lcdc1_device, 936 &lcdc1_device,
932 &lcdc_device, 937 &lcdc_device,