mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-23 02:51:47 +00:00
Code Issues Releases Wiki Activity

ARM: S5PV310: Enable I2S device on SMDKC210

Browse source 
Enable I2S_0 device on the SMDKC210.
Also, add the dependency I2C_1 device.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
[kgene.kim@samsung.com: minor changed title]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Jassi Brar 2010-12-21 09:59:57 +09:00 committed by Kukjin Kim
parent 6f5c11c5a5
commit d8a2d39d9e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/mach-s5pv310/mach-smdkc210.c
View file

@ -14,6 +14,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/i2c.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
@ -23,6 +24,7 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/sdhci.h> #include <plat/sdhci.h>
#include <plat/iic.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-srom.h> #include <mach/regs-srom.h>
@ -139,7 +141,12 @@ static struct platform_device smdkc210_smsc911x = {
}, },
}; };
static struct i2c_board_info i2c_devs1[] __initdata = {
{I2C_BOARD_INFO("wm8994", 0x1a),},
};
static struct platform_device *smdkc210_devices[] __initdata = { static struct platform_device *smdkc210_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_hsmmc0, &s3c_device_hsmmc0,
&s3c_device_hsmmc1, &s3c_device_hsmmc1,
&s3c_device_hsmmc2, &s3c_device_hsmmc2,
@ -148,6 +155,7 @@ static struct platform_device *smdkc210_devices[] __initdata = {
&s3c_device_wdt, &s3c_device_wdt,
&smdkc210_smsc911x, &smdkc210_smsc911x,
&s5pv310_device_ac97, &s5pv310_device_ac97,
&s5pv310_device_i2s0,
}; };
static void __init smdkc210_smsc911x_init(void) static void __init smdkc210_smsc911x_init(void)
@ -183,6 +191,9 @@ static void __init smdkc210_map_io(void)
static void __init smdkc210_machine_init(void) static void __init smdkc210_machine_init(void)
{ {
s3c_i2c1_set_platdata(NULL);
i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
smdkc210_smsc911x_init(); smdkc210_smsc911x_init();
s3c_sdhci0_set_platdata(&smdkc210_hsmmc0_pdata); s3c_sdhci0_set_platdata(&smdkc210_hsmmc0_pdata);