summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-03 16:44:35 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-10 11:44:45 +0900
commite12ef7f02ed56af4f84a5743fa268901c52729bf (patch)
treeff41d77a19a0ab31225bd7a1facbe3c86e8576e2 /arch
parenta6e1ec7f69950864ff8d992da6d929b1444f7cb3 (diff)
downloadlinux-e12ef7f02ed56af4f84a5743fa268901c52729bf.tar.gz
linux-e12ef7f02ed56af4f84a5743fa268901c52729bf.tar.bz2
linux-e12ef7f02ed56af4f84a5743fa268901c52729bf.zip
ARM: S3C2416: Use s3c2440 style i2c controller
The s3c2416 i2c controllers are compatible with the s3c2440 style i2c block, so change the device name appropriately. Signed-off-by: Ben Dooks <ben-linux@fluff.org>y
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2416/s3c2416.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index 6165dc7010fe..ad5a63a40d6e 100644
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -50,6 +50,8 @@
#include <plat/devs.h>
#include <plat/cpu.h>
+#include <plat/iic-core.h>
+
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
IODESC_ENT(CLKPWR),
@@ -80,6 +82,10 @@ int __init s3c2416_init(void)
s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
s3c_device_wdt.resource[1].end = IRQ_S3C2443_WDT;
+ /* the i2c devices are directly compatible with s3c2440 */
+ s3c_i2c0_setname("s3c2440-i2c");
+ s3c_i2c1_setname("s3c2440-i2c");
+
return sysdev_register(&s3c2416_sysdev);
}