diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-17 13:24:23 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-17 13:38:27 -0500 |
commit | 379df2793efdca18e91cb8570f844ad1f83eb609 (patch) | |
tree | 6f61e172528c1fdade27517301787e4c0b174243 /arch/arm/mach-integrator/include/mach/platform.h | |
parent | 328ba305e3871d4256398a80f45517ec9c814999 (diff) |
ARM: integrator: push down SC dependencies
This pushes the dependencies on the Integrator/AP system
controller (SC) down into the PCI V3 driver and the
AP-specific board file.
First, the platform data for the PL010 UART is moved into
the integrator_ap.c board file, and the Integrator/CP is
assigned with NULL pdata. This way the callback functions
can reference the dynamically remapped AP syscon address
in both the ATAG and DT boot path, and this remapping
is localized to the board file.
Second the PCIv3 driver is making its own dynamic remapping
of the SC for the few registers it is using. When we
convert the PCIv3 driver over to using device tree having a
dynamically assigned base address will be useful, but we
will have to use the definition from <mach/platform.h> for
now, the only improvement is that it's done dynamically.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/include/mach/platform.h')
-rw-r--r-- | arch/arm/mach-integrator/include/mach/platform.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index efeac5d0bc9e..be5859efe10e 100644 --- a/arch/arm/mach-integrator/include/mach/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h | |||
@@ -190,7 +190,6 @@ | |||
190 | #define INTEGRATOR_SC_CTRLC_OFFSET 0x0C | 190 | #define INTEGRATOR_SC_CTRLC_OFFSET 0x0C |
191 | #define INTEGRATOR_SC_DEC_OFFSET 0x10 | 191 | #define INTEGRATOR_SC_DEC_OFFSET 0x10 |
192 | #define INTEGRATOR_SC_ARB_OFFSET 0x14 | 192 | #define INTEGRATOR_SC_ARB_OFFSET 0x14 |
193 | #define INTEGRATOR_SC_PCIENABLE_OFFSET 0x18 | ||
194 | #define INTEGRATOR_SC_LOCK_OFFSET 0x1C | 193 | #define INTEGRATOR_SC_LOCK_OFFSET 0x1C |
195 | 194 | ||
196 | #define INTEGRATOR_SC_BASE 0x11000000 | 195 | #define INTEGRATOR_SC_BASE 0x11000000 |