diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 21:39:13 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 21:39:13 +0200 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s5pc100/mach-smdkc100.c | |
| parent | ARM: memblock: setup lowmem mappings using memblock (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff) | |
| download | linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.xz linux-9bafc74163d8bccca9810159aab39be926fb877c.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pc100/mach-smdkc100.c')
| -rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 880fb075092c..18b405d514d6 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c @@ -47,6 +47,7 @@ #include <plat/adc.h> #include <plat/keypad.h> #include <plat/ts.h> +#include <plat/audio.h> /* Following are default values for UCON, ULCON and UFCON UART registers */ #define SMDKC100_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ @@ -196,6 +197,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { &s5p_device_fimc0, &s5p_device_fimc1, &s5p_device_fimc2, + &s5pc100_device_spdif, }; static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { @@ -226,6 +228,8 @@ static void __init smdkc100_machine_init(void) samsung_keypad_set_platdata(&smdkc100_keypad_data); + s5pc100_spdif_setup_gpio(S5PC100_SPDIF_GPD); + /* LCD init */ gpio_request(S5PC100_GPD(0), "GPD"); gpio_request(S5PC100_GPH0(6), "GPH0"); |