diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-10-08 13:40:20 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-10-08 13:40:20 -0400 |
commit | 4814ced5116e3b73dc4f63eec84999739fc8ed11 (patch) | |
tree | a70a0a532d3c552c76c6a0e4dce13e5c492bd772 /arch/arm/mach-omap2/clock44xx_data.c | |
parent | aa218dafd7b37ba92fcfdd6d5c8d459772f88042 (diff) |
OMAP: control: move plat-omap/control.h to mach-omap2/control.h
Only OMAP2+ platforms have the System Control Module (SCM) IP block.
In the past, we've kept the SCM header file in plat-omap. This has
led to abuse - device drivers including it; includes being added that
create implicit dependencies on OMAP2+ builds; etc.
In response, move the SCM headers into mach-omap2/.
As part of this, remove the direct SCM access from the OMAP UDC
driver. It was clearly broken. The UDC code needs an indepth review for
use on OMAP2+ chips.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Cory Maccarrone <darkstar6262@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 67fac44cb6e6..1599836ba3d9 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
29 | #include <plat/control.h> | ||
30 | #include <plat/clkdev_omap.h> | 29 | #include <plat/clkdev_omap.h> |
31 | 30 | ||
32 | #include "clock.h" | 31 | #include "clock.h" |
@@ -35,6 +34,7 @@ | |||
35 | #include "cm-regbits-44xx.h" | 34 | #include "cm-regbits-44xx.h" |
36 | #include "prm.h" | 35 | #include "prm.h" |
37 | #include "prm-regbits-44xx.h" | 36 | #include "prm-regbits-44xx.h" |
37 | #include "control.h" | ||
38 | 38 | ||
39 | /* Root clocks */ | 39 | /* Root clocks */ |
40 | 40 | ||