diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 11:34:19 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-02 11:11:42 +0100 |
| commit | c959cf0112fdeeba817c2463f7fb1aab492e4f2c (patch) | |
| tree | 344a6944b1ab6843bb669407c9754e138d0e9922 /arch/arm/mach-sa1100/assabet.c | |
| parent | 2a25af8ff5a2d077d25dda8f2ee49ddac572dc07 (diff) | |
ARM: sa1100/assabet: move BCR register address definition
Move the Assabet BCR register address definition out of the header file
and into the board code, converting it to a iomem pointer rather than a
volatile accessor. Also update the early IO maps to use the appropriate
definition.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/assabet.c')
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 9919e0f32c4b..0731d14303a4 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -46,6 +46,9 @@ #include "generic.h" +#define ASSABET_BCR_BASE 0xf1000000 +#define ASSABET_BCR IOMEM(ASSABET_BCR_BASE) + #define ASSABET_BCR_DB1110 \ (ASSABET_BCR_SPK_OFF | \ ASSABET_BCR_LED_GREEN | ASSABET_BCR_LED_RED | \ @@ -698,7 +701,7 @@ static struct sa1100_port_fns assabet_port_fns __initdata = { static struct map_desc assabet_io_desc[] __initdata = { { /* Board Control Register */ - .virtual = 0xf1000000, + .virtual = ASSABET_BCR_BASE, .pfn = __phys_to_pfn(0x12000000), .length = 0x00100000, .type = MT_DEVICE @@ -759,7 +762,7 @@ void __init assabet_init_irq(void) * * This must precede any driver calls to BCR_set() or BCR_clear(). */ - assabet_init_gpio((void *)&ASSABET_BCR, def_val); + assabet_init_gpio(ASSABET_BCR, def_val); } MACHINE_START(ASSABET, "Intel-Assabet") |