diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-10-08 09:34:56 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 03:03:01 -0400 |
commit | 3b7998f529a18696baafb8cca63a7720565ad77f (patch) | |
tree | 9201940bf2d58e9b58d75ca50f25b1be8d681b70 /arch | |
parent | acf5eda92da23c904d1e37ba80c75572f3e2c860 (diff) |
ARM: S5PV310: I2C0/1 devices support on Universal board
Camera devices use the I2C0 and Gyro uese the I2C1 on universal board.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: minor title fixes]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/mach-universal_c210.c | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 6b2b948c9ccd..f12f560894ad 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig | |||
@@ -57,6 +57,8 @@ config MACH_UNIVERSAL_C210 | |||
57 | bool "Mobile UNIVERSAL_C210 Board" | 57 | bool "Mobile UNIVERSAL_C210 Board" |
58 | select CPU_S5PV310 | 58 | select CPU_S5PV310 |
59 | select S5P_DEV_ONENAND | 59 | select S5P_DEV_ONENAND |
60 | select S3C_DEV_I2C1 | ||
61 | select S5PV310_SETUP_I2C1 | ||
60 | help | 62 | help |
61 | Machine support for Samsung Mobile Universal S5PC210 Reference | 63 | Machine support for Samsung Mobile Universal S5PC210 Reference |
62 | Board. S5PC210(MCP) is one of package option of S5PV310 | 64 | Board. S5PC210(MCP) is one of package option of S5PV310 |
diff --git a/arch/arm/mach-s5pv310/mach-universal_c210.c b/arch/arm/mach-s5pv310/mach-universal_c210.c index e16984963e89..deffeb1be3b9 100644 --- a/arch/arm/mach-s5pv310/mach-universal_c210.c +++ b/arch/arm/mach-s5pv310/mach-universal_c210.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/platform_device.h> | 10 | #include <linux/platform_device.h> |
11 | #include <linux/serial_core.h> | 11 | #include <linux/serial_core.h> |
12 | #include <linux/input.h> | 12 | #include <linux/input.h> |
13 | #include <linux/i2c.h> | ||
13 | #include <linux/gpio_keys.h> | 14 | #include <linux/gpio_keys.h> |
14 | #include <linux/gpio.h> | 15 | #include <linux/gpio.h> |
15 | 16 | ||
@@ -116,6 +117,16 @@ static struct platform_device universal_gpio_keys = { | |||
116 | }, | 117 | }, |
117 | }; | 118 | }; |
118 | 119 | ||
120 | /* I2C0 */ | ||
121 | static struct i2c_board_info i2c0_devs[] __initdata = { | ||
122 | /* Camera, To be updated */ | ||
123 | }; | ||
124 | |||
125 | /* I2C1 */ | ||
126 | static struct i2c_board_info i2c1_devs[] __initdata = { | ||
127 | /* Gyro, To be updated */ | ||
128 | }; | ||
129 | |||
119 | static struct platform_device *universal_devices[] __initdata = { | 130 | static struct platform_device *universal_devices[] __initdata = { |
120 | &universal_gpio_keys, | 131 | &universal_gpio_keys, |
121 | &s5p_device_onenand, | 132 | &s5p_device_onenand, |
@@ -134,6 +145,9 @@ static void __init universal_machine_init(void) | |||
134 | l2x0_init(S5P_VA_L2CC, 1 << 28, 0xffffffff); | 145 | l2x0_init(S5P_VA_L2CC, 1 << 28, 0xffffffff); |
135 | #endif | 146 | #endif |
136 | 147 | ||
148 | i2c_register_board_info(0, i2c0_devs, ARRAY_SIZE(i2c0_devs)); | ||
149 | i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs)); | ||
150 | |||
137 | /* Last */ | 151 | /* Last */ |
138 | platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices)); | 152 | platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices)); |
139 | } | 153 | } |