From 3a8761c0272c961c707e5af2eb0179adf3ef7e14 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 8 Oct 2012 09:11:22 -0700 Subject: 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-omap2/common.h') 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 @@ #include #include +#include #include +#include #include @@ -36,6 +38,8 @@ #include #include +#include "i2c.h" + #define OMAP_INTC_START NR_IRQS #ifdef CONFIG_SOC_OMAP2420 -- cgit v1.2.1 From e6a6e5ad17ee090f8d48a3b0758338a97124539f Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 27 Sep 2012 17:11:15 -0700 Subject: ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2 We cannot keep this in plat/common.h for common zImage support. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index a68b421b3f86..b91b2a2308aa 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -36,7 +36,8 @@ #include #include -#include + +#include "../plat-omap/common.h" #include "i2c.h" -- cgit v1.2.1 From f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Tue, 2 Oct 2012 00:17:05 +0530 Subject: ARM: OMAP2+: Move omap_reserve() locally to mach-omap2 omap_reserve() callback is defned only for mach-omap2. So, moving definition of omap_reserve() to mach-omap2. This helps is moving plat/omap_secure.h local to mach-omap2 Signed-off-by: Lokesh Vutla Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index b91b2a2308aa..42b1b2e009d3 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -343,6 +343,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); +extern void omap_reserve(void); #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ -- cgit v1.2.1 From e4c060db2c13f10de09101afc564763f9fd0019a Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 5 Oct 2012 13:25:59 -0700 Subject: ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 We want to remove plat/cpu.h. To do this, let's first split it to private soc.h to mach-omap1 and mach-omap2. We have to keep plat/cpu.h around until the remaining drivers are fixed, so let's include the local soc.h in plat/cpu.h and for drivers still including plat/cpu.h. Once the drivers are fixed not to include plat/cpu.h, we can remove the file. This is needed for the ARM common zImage support. [tony@atomide.com: updated to not print a warning] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 42b1b2e009d3..d135d551d124 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -34,7 +34,6 @@ #include -#include #include #include "../plat-omap/common.h" -- cgit v1.2.1 From 3d82cbbb3aadb4f8a30e3f614e51be96574a0855 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 15 Oct 2012 12:50:46 -0700 Subject: ARM: OMAP: Split plat/serial.h for omap1 and omap2+ For omap1, we'll keep mach/serial.h around for 8250.c hardware workarounds. For omap2+, we no longer need mach/serial.h and can make it local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index d135d551d124..c85022ab22d5 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -34,11 +34,10 @@ #include -#include - #include "../plat-omap/common.h" #include "i2c.h" +#include "serial.h" #define OMAP_INTC_START NR_IRQS -- cgit v1.2.1 From 54db6eee06b51278a79e007765151fb5e71c370c Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 24 Oct 2012 14:26:18 -0700 Subject: ARM: OMAP2+: Introduce local usb.h Let's move what we can from plat/usb.h to the local usb.h for ARM common zImage support. This is needed so we can remove plat/usb.h for ARM common zImage support. Cc: Samuel Ortiz Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: Partha Basak Cc: Keshava Munegowda Cc: linux-usb@vger.kernel.org Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 7045e4d61ac3..fa2f4c9ed1ff 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -36,6 +36,8 @@ #include #include +#include "usb.h" + #define OMAP_INTC_START NR_IRQS #ifdef CONFIG_SOC_OMAP2420 -- cgit v1.2.1 From 5c2e88525b5f1cdc72c9eefba72dae13be7e5d20 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 29 Oct 2012 16:45:47 -0700 Subject: ARM: OMAP: Remove plat-omap/common.h Most of the prototypes in plat-omap/common.h are not common to omap1 and omap2+, they are local to omap2+ and should not be in plat-omap/common.h. The only shared function prototype in this file is omap_init_clocksource_32k(), let's put that into counter-32k.h. Note that the new plat/counter-32k.h must not be included from drivers, that will break omap2+ build for CONFIG_MULTIPLATFORM. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-omap2/common.h') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index c925c805969f..426fcfcfd821 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -34,8 +34,6 @@ #include -#include "../plat-omap/common.h" - #include "i2c.h" #include "serial.h" @@ -345,5 +343,8 @@ struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); extern void omap_reserve(void); +struct omap_hwmod; +extern int omap_dss_reset(struct omap_hwmod *); + #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ -- cgit v1.2.1