diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-11-13 17:34:20 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-30 20:33:48 -0500 |
commit | 4d3a3469dbabbcff4dab225bc3be0b247b36401c (patch) | |
tree | fb8b419426d5fb63aa3111b6dc5fcae87e1424f6 /arch/arm/mach-s3c2410 | |
parent | cf383678242eacd6f92a48314922598ed3408355 (diff) |
ARM: S3C24XX: machine support for Simtec Audio
Add the platform/machine support for the audio devices fitted to
the Simtec range of boards since the move to ASoC.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 647c9adb018f..5f7837068238 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -61,6 +61,7 @@ | |||
61 | #include <plat/devs.h> | 61 | #include <plat/devs.h> |
62 | #include <plat/cpu.h> | 62 | #include <plat/cpu.h> |
63 | #include <plat/cpu-freq.h> | 63 | #include <plat/cpu-freq.h> |
64 | #include <plat/audio-simtec.h> | ||
64 | 65 | ||
65 | #include "usb-simtec.h" | 66 | #include "usb-simtec.h" |
66 | #include "nor-simtec.h" | 67 | #include "nor-simtec.h" |
@@ -608,6 +609,11 @@ static struct s3c_cpufreq_board __initdata bast_cpufreq = { | |||
608 | .need_io = 1, | 609 | .need_io = 1, |
609 | }; | 610 | }; |
610 | 611 | ||
612 | static struct s3c24xx_audio_simtec_pdata __initdata bast_audio = { | ||
613 | .have_mic = 1, | ||
614 | .have_lout = 1, | ||
615 | }; | ||
616 | |||
611 | static void __init bast_map_io(void) | 617 | static void __init bast_map_io(void) |
612 | { | 618 | { |
613 | /* initialise the clocks */ | 619 | /* initialise the clocks */ |
@@ -647,6 +653,7 @@ static void __init bast_init(void) | |||
647 | 653 | ||
648 | usb_simtec_init(); | 654 | usb_simtec_init(); |
649 | nor_simtec_init(); | 655 | nor_simtec_init(); |
656 | simtec_audio_add(NULL, true, &bast_audio); | ||
650 | 657 | ||
651 | s3c_cpufreq_setboard(&bast_cpufreq); | 658 | s3c_cpufreq_setboard(&bast_cpufreq); |
652 | } | 659 | } |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 1628cc773a2c..7611472b5f1b 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <plat/devs.h> | 49 | #include <plat/devs.h> |
50 | #include <plat/cpu.h> | 50 | #include <plat/cpu.h> |
51 | #include <plat/iic.h> | 51 | #include <plat/iic.h> |
52 | #include <plat/audio-simtec.h> | ||
52 | 53 | ||
53 | #include "usb-simtec.h" | 54 | #include "usb-simtec.h" |
54 | #include "nor-simtec.h" | 55 | #include "nor-simtec.h" |
@@ -393,6 +394,7 @@ static void __init vr1000_init(void) | |||
393 | ARRAY_SIZE(vr1000_i2c_devs)); | 394 | ARRAY_SIZE(vr1000_i2c_devs)); |
394 | 395 | ||
395 | nor_simtec_init(); | 396 | nor_simtec_init(); |
397 | simtec_audio_add(NULL, true, NULL); | ||
396 | } | 398 | } |
397 | 399 | ||
398 | MACHINE_START(VR1000, "Thorcom-VR1000") | 400 | MACHINE_START(VR1000, "Thorcom-VR1000") |