diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/mach-s5pv310/mach-smdkv310.c | |
parent | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 (diff) | |
parent | fa353e9f409340cefc7650854065cbcea85c347d (diff) |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'arch/arm/mach-s5pv310/mach-smdkv310.c')
-rw-r--r-- | arch/arm/mach-s5pv310/mach-smdkv310.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv310/mach-smdkv310.c b/arch/arm/mach-s5pv310/mach-smdkv310.c index e4a826ac3c1d..3eb029ca2073 100644 --- a/arch/arm/mach-s5pv310/mach-smdkv310.c +++ b/arch/arm/mach-s5pv310/mach-smdkv310.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <plat/devs.h> | 26 | #include <plat/devs.h> |
27 | #include <plat/sdhci.h> | 27 | #include <plat/sdhci.h> |
28 | #include <plat/iic.h> | 28 | #include <plat/iic.h> |
29 | #include <plat/pd.h> | ||
29 | 30 | ||
30 | #include <mach/map.h> | 31 | #include <mach/map.h> |
31 | 32 | ||
@@ -146,16 +147,23 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
146 | }; | 147 | }; |
147 | 148 | ||
148 | static struct platform_device *smdkv310_devices[] __initdata = { | 149 | static struct platform_device *smdkv310_devices[] __initdata = { |
149 | &s3c_device_i2c1, | ||
150 | &s3c_device_hsmmc0, | 150 | &s3c_device_hsmmc0, |
151 | &s3c_device_hsmmc1, | 151 | &s3c_device_hsmmc1, |
152 | &s3c_device_hsmmc2, | 152 | &s3c_device_hsmmc2, |
153 | &s3c_device_hsmmc3, | 153 | &s3c_device_hsmmc3, |
154 | &s3c_device_i2c1, | ||
154 | &s3c_device_rtc, | 155 | &s3c_device_rtc, |
155 | &s3c_device_wdt, | 156 | &s3c_device_wdt, |
156 | &smdkv310_smsc911x, | ||
157 | &s5pv310_device_ac97, | 157 | &s5pv310_device_ac97, |
158 | &s5pv310_device_i2s0, | 158 | &s5pv310_device_i2s0, |
159 | &s5pv310_device_pd[PD_MFC], | ||
160 | &s5pv310_device_pd[PD_G3D], | ||
161 | &s5pv310_device_pd[PD_LCD0], | ||
162 | &s5pv310_device_pd[PD_LCD1], | ||
163 | &s5pv310_device_pd[PD_CAM], | ||
164 | &s5pv310_device_pd[PD_TV], | ||
165 | &s5pv310_device_pd[PD_GPS], | ||
166 | &smdkv310_smsc911x, | ||
159 | }; | 167 | }; |
160 | 168 | ||
161 | static void __init smdkv310_smsc911x_init(void) | 169 | static void __init smdkv310_smsc911x_init(void) |