diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-08 12:11:22 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:36:50 -0400 |
commit | 3a8761c0272c961c707e5af2eb0179adf3ef7e14 (patch) | |
tree | 101b61bd1bc57de37c52587ecaff1da4e84d7742 /arch/arm/mach-omap2/common.h | |
parent | 8599e7c58786e3aef0bdb0fa093fd5150ae8a9bc (diff) |
ARM: OMAP: Split plat-omap/i2c.c into mach-omap1 and mach-omap2
There's no need to keep the device related things in the
common i2c.c as omap2+ is using hwmod. Split the code to
mach-omap1 and mach-omap2 parts and only leave common
code to plat-omap/i2c.c.
Note that as omap1 only has one i2c controller, we can
now remove the old device related macros.
Reviewed-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r-- | arch/arm/mach-omap2/common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 7045e4d61ac3..a68b421b3f86 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
@@ -28,7 +28,9 @@ | |||
28 | 28 | ||
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/i2c.h> | ||
31 | #include <linux/i2c/twl.h> | 32 | #include <linux/i2c/twl.h> |
33 | #include <linux/i2c-omap.h> | ||
32 | 34 | ||
33 | #include <asm/proc-fns.h> | 35 | #include <asm/proc-fns.h> |
34 | 36 | ||
@@ -36,6 +38,8 @@ | |||
36 | #include <plat/serial.h> | 38 | #include <plat/serial.h> |
37 | #include <plat/common.h> | 39 | #include <plat/common.h> |
38 | 40 | ||
41 | #include "i2c.h" | ||
42 | |||
39 | #define OMAP_INTC_START NR_IRQS | 43 | #define OMAP_INTC_START NR_IRQS |
40 | 44 | ||
41 | #ifdef CONFIG_SOC_OMAP2420 | 45 | #ifdef CONFIG_SOC_OMAP2420 |