diff options
-rw-r--r-- | arch/arm/mach-s3c6410/cpu.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/iic-core.h | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/cpu.c b/arch/arm/mach-s3c6410/cpu.c index 137918e7711f..6a73ca6b7a3a 100644 --- a/arch/arm/mach-s3c6410/cpu.c +++ b/arch/arm/mach-s3c6410/cpu.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <plat/devs.h> | 36 | #include <plat/devs.h> |
37 | #include <plat/clock.h> | 37 | #include <plat/clock.h> |
38 | #include <plat/sdhci.h> | 38 | #include <plat/sdhci.h> |
39 | #include <plat/iic-core.h> | ||
39 | #include <plat/s3c6400.h> | 40 | #include <plat/s3c6400.h> |
40 | #include <plat/s3c6410.h> | 41 | #include <plat/s3c6410.h> |
41 | 42 | ||
@@ -56,6 +57,10 @@ void __init s3c6410_map_io(void) | |||
56 | /* initialise device information early */ | 57 | /* initialise device information early */ |
57 | s3c6410_default_sdhci0(); | 58 | s3c6410_default_sdhci0(); |
58 | s3c6410_default_sdhci1(); | 59 | s3c6410_default_sdhci1(); |
60 | |||
61 | /* the i2c devices are directly compatible with s3c2440 */ | ||
62 | s3c_i2c0_setname("s3c2440-i2c"); | ||
63 | s3c_i2c1_setname("s3c2440-i2c"); | ||
59 | } | 64 | } |
60 | 65 | ||
61 | void __init s3c6410_init_clocks(int xtal) | 66 | void __init s3c6410_init_clocks(int xtal) |
diff --git a/arch/arm/plat-s3c/include/plat/iic-core.h b/arch/arm/plat-s3c/include/plat/iic-core.h new file mode 100644 index 000000000000..36397ca20962 --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/iic-core.h | |||
@@ -0,0 +1,35 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/iic-core.h | ||
2 | * | ||
3 | * Copyright 2008 Openmoko, Inc. | ||
4 | * Copyright 2008 Simtec Electronics | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * | ||
7 | * S3C - I2C Controller core functions | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef __ASM_ARCH_IIC_CORE_H | ||
15 | #define __ASM_ARCH_IIC_CORE_H __FILE__ | ||
16 | |||
17 | /* These functions are only for use with the core support code, such as | ||
18 | * the cpu specific initialisation code | ||
19 | */ | ||
20 | |||
21 | /* re-define device name depending on support. */ | ||
22 | static inline void s3c_i2c0_setname(char *name) | ||
23 | { | ||
24 | /* currently this device is always compiled in */ | ||
25 | s3c_device_i2c0.name = name; | ||
26 | } | ||
27 | |||
28 | static inline void s3c_i2c1_setname(char *name) | ||
29 | { | ||
30 | #ifdef CONFIG_S3C_DEV_I2C1 | ||
31 | s3c_device_i2c1.name = name; | ||
32 | #endif | ||
33 | } | ||
34 | |||
35 | #endif /* __ASM_ARCH_IIC_H */ | ||