aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-31 12:14:57 -0400
committerBen Dooks <ben-linux@fluff.org>2008-12-15 18:46:05 -0500
commitd7ea3743ca9939eb71931dedb613d14ff7201d02 (patch)
tree35c0cec6a6d9634009250d6fd273221e6ecc4376 /arch/arm
parentf9e2f3453c2357b56870b483fbc4bfd950456625 (diff)
[ARM] SMDK6410: Add second I2C channel.
Add the second I2C channel on the SMDK6410. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c6410/Kconfig2
-rw-r--r--arch/arm/mach-s3c6410/mach-smdk6410.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index 32bdc93fc1ff..2462693a1128 100644
--- a/arch/arm/mach-s3c6410/Kconfig
+++ b/arch/arm/mach-s3c6410/Kconfig
@@ -23,6 +23,8 @@ config MACH_SMDK6410
23 bool "SMDK6410" 23 bool "SMDK6410"
24 select CPU_S3C6410 24 select CPU_S3C6410
25 select S3C_DEV_HSMMC 25 select S3C_DEV_HSMMC
26 select S3C_DEV_I2C1
26 select S3C6410_SETUP_SDHCI 27 select S3C6410_SETUP_SDHCI
28 select S3C64XX_SETUP_I2C1
27 help 29 help
28 Machine support for the Samsung SMDK6410 30 Machine support for the Samsung SMDK6410
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index d58c83d31a06..8d7101aab759 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -65,6 +65,7 @@ struct map_desc smdk6410_iodesc[] = {};
65static struct platform_device *smdk6410_devices[] __initdata = { 65static struct platform_device *smdk6410_devices[] __initdata = {
66 &s3c_device_hsmmc0, 66 &s3c_device_hsmmc0,
67 &s3c_device_i2c0, 67 &s3c_device_i2c0,
68 &s3c_device_i2c1,
68}; 69};
69 70
70extern void s3c64xx_init_io(struct map_desc *, int); 71extern void s3c64xx_init_io(struct map_desc *, int);
@@ -79,6 +80,7 @@ static void __init smdk6410_map_io(void)
79static void __init smdk6410_machine_init(void) 80static void __init smdk6410_machine_init(void)
80{ 81{
81 s3c_i2c0_set_platdata(NULL); 82 s3c_i2c0_set_platdata(NULL);
83 s3c_i2c1_set_platdata(NULL);
82 platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); 84 platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
83} 85}
84 86