diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-06-16 04:44:27 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 16:09:56 +0400 |
| commit | bb4dbefe4c6ae3685152d03e318e093d5f6f795a (patch) | |
| tree | a35a87afcae726267ec39ecfaa9549e3d719109b /arch/arm/mach-integrator/integrator_cp.c | |
| parent | 578fdfdf32a84ca17ed2090dba4ff2c8e688cc89 (diff) | |
| download | linux-bb4dbefe4c6ae3685152d03e318e093d5f6f795a.tar.xz | |
ARM: integrator: move CM base into device tree
This moves the core module (CM) control base into the device
tree. It is a simple memory range of 0x200 bytes. Move the
cm header down into the machine directory and unexport the
cm_control() symbol as no modules are using it.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 26b344197560..422c3f9b4163 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -36,7 +36,6 @@ #include <asm/hardware/arm_timer.h> #include <asm/hardware/icst.h> -#include <mach/cm.h> #include <mach/lm.h> #include <asm/mach/arch.h> @@ -49,6 +48,7 @@ #include <plat/clcd.h> #include <plat/sched_clock.h> +#include "cm.h" #include "common.h" /* Base address to the CP controller */ @@ -255,6 +255,7 @@ static const struct of_device_id fpga_irq_of_match[] __initconst = { static void __init intcp_init_irq_of(void) { + cm_init(); of_irq_init(fpga_irq_of_match); integrator_clk_init(true); } |