diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-02-25 23:54:33 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-08 04:05:08 +0100 |
| commit | 7328ff4d72401835fa1aadfb9e574a2133bd952b (patch) | |
| tree | f7c7d461f9157002d429aa8d4d9559ff33c8b924 | |
| parent | OMAP2/3: PM: remove manual CM_AUTOIDLE bit setting in mach-omap2/pm*xx.c (diff) | |
| download | linux-7328ff4d72401835fa1aadfb9e574a2133bd952b.tar.xz linux-7328ff4d72401835fa1aadfb9e574a2133bd952b.zip | |
OMAP: smartreflex: move plat/smartreflex.h to mach-omap2/smartreflex.h
There's no reason for this header file to be in
plat-omap/include/plat/smartreflex.h. The hardware devices are in
OMAP2+ SoCs only. Leaving this header file in plat-omap causes
problems due to cross-dependencies with other header files that should
live in mach-omap2/.
Thanks to Benoît Cousson <b-cousson@ti.com> for suggesting the removal
of the smartreflex.h include from the OMAP3xxx hwmod data.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex-class3.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.h (renamed from arch/arm/plat-omap/include/plat/smartreflex.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index e9d001228568..8de2de97c2a1 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -22,7 +22,6 @@ #include <plat/l4_3xxx.h> #include <plat/i2c.h> #include <plat/gpio.h> -#include <plat/smartreflex.h> #include <plat/mcspi.h> #include "omap_hwmod_common_data.h" diff --git a/arch/arm/mach-omap2/smartreflex-class3.c b/arch/arm/mach-omap2/smartreflex-class3.c index 60e70552b4c5..f438cf4d847b 100644 --- a/arch/arm/mach-omap2/smartreflex-class3.c +++ b/arch/arm/mach-omap2/smartreflex-class3.c @@ -11,7 +11,7 @@ * published by the Free Software Foundation. */ -#include <plat/smartreflex.h> +#include "smartreflex.h" static int sr_class3_enable(struct voltagedomain *voltdm) { diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index c37e823266d3..077dfb6fd8fb 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -26,9 +26,9 @@ #include <linux/pm_runtime.h> #include <plat/common.h> -#include <plat/smartreflex.h> #include "pm.h" +#include "smartreflex.h" #define SMARTREFLEX_NAME_LEN 16 #define NVALUE_NAME_LEN 40 diff --git a/arch/arm/plat-omap/include/plat/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h index 6568c885f37a..6568c885f37a 100644 --- a/arch/arm/plat-omap/include/plat/smartreflex.h +++ b/arch/arm/mach-omap2/smartreflex.h diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index b1e0af18a26a..a636604961bc 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c @@ -23,9 +23,9 @@ #include <linux/io.h> #include <plat/omap_device.h> -#include <plat/smartreflex.h> #include <plat/voltage.h> +#include "smartreflex.h" #include "control.h" #include "pm.h" |