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/board-cm-t3517.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/board-cm-t3517.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 1115b8ab5e1d..c49319ff5c36 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | #include <plat/board.h> | 41 | #include <plat/board.h> |
42 | #include <plat/common.h> | 42 | #include <plat/common.h> |
43 | #include <plat/control.h> | ||
44 | #include <plat/usb.h> | 43 | #include <plat/usb.h> |
45 | #include <plat/nand.h> | 44 | #include <plat/nand.h> |
46 | #include <plat/gpmc.h> | 45 | #include <plat/gpmc.h> |
@@ -48,6 +47,7 @@ | |||
48 | #include <mach/am35xx.h> | 47 | #include <mach/am35xx.h> |
49 | 48 | ||
50 | #include "mux.h" | 49 | #include "mux.h" |
50 | #include "control.h" | ||
51 | 51 | ||
52 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) | 52 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) |
53 | static struct gpio_led cm_t3517_leds[] = { | 53 | static struct gpio_led cm_t3517_leds[] = { |