aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-12-20 19:59:05 -0500
committerKukjin Kim <kgene.kim@samsung.com>2010-12-29 18:36:40 -0500
commit6f5c11c5a5ec9aef67b433906c712608ef7b9b97 (patch)
treea0c4f02d7e064801c4d5926e36966a62938b2cdc
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>
-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 @@
14#include <linux/platform_device.h> 14#include <linux/platform_device.h>
15#include <linux/smsc911x.h> 15#include <linux/smsc911x.h>
16#include <linux/io.h> 16#include <linux/io.h>
17#include <linux/i2c.h>
17 18
18#include <asm/mach/arch.h> 19#include <asm/mach/arch.h>
19#include <asm/mach-types.h> 20#include <asm/mach-types.h>
@@ -23,6 +24,7 @@
23#include <plat/cpu.h> 24#include <plat/cpu.h>
24#include <plat/devs.h> 25#include <plat/devs.h>
25#include <plat/sdhci.h> 26#include <plat/sdhci.h>
27#include <plat/iic.h>
26 28
27#include <mach/map.h> 29#include <mach/map.h>
28#include <mach/regs-srom.h> 30#include <mach/regs-srom.h>
@@ -139,7 +141,12 @@ static struct platform_device smdkv310_smsc911x = {
139 }, 141 },
140}; 142};
141 143
144static struct i2c_board_info i2c_devs1[] __initdata = {
145 {I2C_BOARD_INFO("wm8994", 0x1a),},
146};
147
142static struct platform_device *smdkv310_devices[] __initdata = { 148static struct platform_device *smdkv310_devices[] __initdata = {
149 &s3c_device_i2c1,
143 &s3c_device_hsmmc0, 150 &s3c_device_hsmmc0,
144 &s3c_device_hsmmc1, 151 &s3c_device_hsmmc1,
145 &s3c_device_hsmmc2, 152 &s3c_device_hsmmc2,
@@ -148,6 +155,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
148 &s3c_device_wdt, 155 &s3c_device_wdt,
149 &smdkv310_smsc911x, 156 &smdkv310_smsc911x,
150 &s5pv310_device_ac97, 157 &s5pv310_device_ac97,
158 &s5pv310_device_i2s0,
151}; 159};
152 160
153static void __init smdkv310_smsc911x_init(void) 161static void __init smdkv310_smsc911x_init(void)
@@ -183,6 +191,9 @@ static void __init smdkv310_map_io(void)
183 191
184static void __init smdkv310_machine_init(void) 192static void __init smdkv310_machine_init(void)
185{ 193{
194 s3c_i2c1_set_platdata(NULL);
195 i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
196
186 smdkv310_smsc911x_init(); 197 smdkv310_smsc911x_init();
187 198
188 s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata); 199 s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata);