diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-01 21:24:57 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-10 13:45:16 -0500 |
commit | 102c3065739c933289ab67492d7dde0d40fc2369 (patch) | |
tree | c74488f50833d2b6d21641fa146d2a737bebab38 | |
parent | 8425938602a2d83e79c22c7d23714a8dc90846f6 (diff) |
ARM: S5P64X0: move i2c.h into local directory
The <mach/i2c.h> can be moved into mach-s5p64x0/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s5p64x0/i2c.h (renamed from arch/arm/mach-s5p64x0/include/mach/i2c.h) | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/setup-i2c0.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/setup-i2c1.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/i2c.h b/arch/arm/mach-s5p64x0/i2c.h index 887d25209e8e..1e5bb4ea200d 100644 --- a/arch/arm/mach-s5p64x0/include/mach/i2c.h +++ b/arch/arm/mach-s5p64x0/i2c.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s5p64x0/include/mach/i2c.h | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 2 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com | 3 | * http://www.samsung.com |
5 | * | 4 | * |
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index 1af823558c60..3fb4de34c4c5 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/hardware.h> | 38 | #include <mach/hardware.h> |
39 | #include <mach/map.h> | 39 | #include <mach/map.h> |
40 | #include <mach/regs-clock.h> | 40 | #include <mach/regs-clock.h> |
41 | #include <mach/i2c.h> | ||
42 | #include <mach/regs-gpio.h> | 41 | #include <mach/regs-gpio.h> |
43 | 42 | ||
44 | #include <plat/regs-serial.h> | 43 | #include <plat/regs-serial.h> |
@@ -56,6 +55,7 @@ | |||
56 | #include <plat/sdhci.h> | 55 | #include <plat/sdhci.h> |
57 | 56 | ||
58 | #include "common.h" | 57 | #include "common.h" |
58 | #include "i2c.h" | ||
59 | 59 | ||
60 | #define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 60 | #define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
61 | S3C2410_UCON_RXILEVEL | \ | 61 | S3C2410_UCON_RXILEVEL | \ |
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 62526ccf6b70..53a576d12b88 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/hardware.h> | 38 | #include <mach/hardware.h> |
39 | #include <mach/map.h> | 39 | #include <mach/map.h> |
40 | #include <mach/regs-clock.h> | 40 | #include <mach/regs-clock.h> |
41 | #include <mach/i2c.h> | ||
42 | #include <mach/regs-gpio.h> | 41 | #include <mach/regs-gpio.h> |
43 | 42 | ||
44 | #include <plat/regs-serial.h> | 43 | #include <plat/regs-serial.h> |
@@ -56,6 +55,7 @@ | |||
56 | #include <plat/sdhci.h> | 55 | #include <plat/sdhci.h> |
57 | 56 | ||
58 | #include "common.h" | 57 | #include "common.h" |
58 | #include "i2c.h" | ||
59 | 59 | ||
60 | #define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 60 | #define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
61 | S3C2410_UCON_RXILEVEL | \ | 61 | S3C2410_UCON_RXILEVEL | \ |
diff --git a/arch/arm/mach-s5p64x0/setup-i2c0.c b/arch/arm/mach-s5p64x0/setup-i2c0.c index a32edc545e6c..569b76ac98cb 100644 --- a/arch/arm/mach-s5p64x0/setup-i2c0.c +++ b/arch/arm/mach-s5p64x0/setup-i2c0.c | |||
@@ -21,7 +21,7 @@ struct platform_device; /* don't need the contents */ | |||
21 | #include <plat/gpio-cfg.h> | 21 | #include <plat/gpio-cfg.h> |
22 | #include <linux/platform_data/i2c-s3c2410.h> | 22 | #include <linux/platform_data/i2c-s3c2410.h> |
23 | 23 | ||
24 | #include <mach/i2c.h> | 24 | #include "i2c.h" |
25 | 25 | ||
26 | void s5p6440_i2c0_cfg_gpio(struct platform_device *dev) | 26 | void s5p6440_i2c0_cfg_gpio(struct platform_device *dev) |
27 | { | 27 | { |
diff --git a/arch/arm/mach-s5p64x0/setup-i2c1.c b/arch/arm/mach-s5p64x0/setup-i2c1.c index ca2c5c7f8aa6..867374e6d0bc 100644 --- a/arch/arm/mach-s5p64x0/setup-i2c1.c +++ b/arch/arm/mach-s5p64x0/setup-i2c1.c | |||
@@ -21,7 +21,7 @@ struct platform_device; /* don't need the contents */ | |||
21 | #include <plat/gpio-cfg.h> | 21 | #include <plat/gpio-cfg.h> |
22 | #include <linux/platform_data/i2c-s3c2410.h> | 22 | #include <linux/platform_data/i2c-s3c2410.h> |
23 | 23 | ||
24 | #include <mach/i2c.h> | 24 | #include "i2c.h" |
25 | 25 | ||
26 | void s5p6440_i2c1_cfg_gpio(struct platform_device *dev) | 26 | void s5p6440_i2c1_cfg_gpio(struct platform_device *dev) |
27 | { | 27 | { |