summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-12-21 09:59:05 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-12-30 08:36:40 +0900
commit6f5c11c5a5ec9aef67b433906c712608ef7b9b97 (patch)
treea0c4f02d7e064801c4d5926e36966a62938b2cdc /arch
parent906b9826b81d07701b96621a14d7cf255c6e1712 (diff)
ARM: S5PV310: Enable I2S device on SMDKV310
Enable I2S_0 device on the SMDKV310. 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv310/mach-smdkv310.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/mach-smdkv310.c b/arch/arm/mach-s5pv310/mach-smdkv310.c
index 524b5f33b857..d5eb607763f7 100644
--- a/arch/arm/mach-s5pv310/mach-smdkv310.c
+++ b/arch/arm/mach-s5pv310/mach-smdkv310.c
@@ -14,6 +14,7 @@
#include <linux/platform_device.h>
#include <linux/smsc911x.h>
#include <linux/io.h>
+#include <linux/i2c.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -23,6 +24,7 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/sdhci.h>
+#include <plat/iic.h>
#include <mach/map.h>
#include <mach/regs-srom.h>
@@ -139,7 +141,12 @@ static struct platform_device smdkv310_smsc911x = {
},
};
+static struct i2c_board_info i2c_devs1[] __initdata = {
+ {I2C_BOARD_INFO("wm8994", 0x1a),},
+};
+
static struct platform_device *smdkv310_devices[] __initdata = {
+ &s3c_device_i2c1,
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
&s3c_device_hsmmc2,
@@ -148,6 +155,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
&s3c_device_wdt,
&smdkv310_smsc911x,
&s5pv310_device_ac97,
+ &s5pv310_device_i2s0,
};
static void __init smdkv310_smsc911x_init(void)
@@ -183,6 +191,9 @@ static void __init smdkv310_map_io(void)
static void __init smdkv310_machine_init(void)
{
+ s3c_i2c1_set_platdata(NULL);
+ i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
+
smdkv310_smsc911x_init();
s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata);