diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 11:38:54 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-02 11:11:44 +0100 |
| commit | e5d6f24567c6a7316b7acb39ad4459c6a5847b61 (patch) | |
| tree | 6fee0c629da0de8f86ffa1cd34507341b64e5f81 /arch/arm/mach-sa1100/assabet.c | |
| parent | 1d8f228a1698f1095a7c9ab52914be4e2fe3cb9d (diff) | |
ARM: sa1100/assabet: move SCR definitions and machine_has_neponset()
Nothing outside of assabet.c needs the board SCR register definitions,
nor does it need machine_has_neponset(). Remove these definitions.
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 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 0731d14303a4..3609c55942ad 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -46,6 +46,22 @@ #include "generic.h" +enum { + /* System Configuration Register flags */ + SCR_SDRAM_LOW = BIT(2), /* SDRAM size (low bit) */ + SCR_SDRAM_HIGH = BIT(3), /* SDRAM size (high bit) */ + SCR_FLASH_LOW = BIT(4), /* Flash size (low bit) */ + SCR_FLASH_HIGH = BIT(5), /* Flash size (high bit) */ + SCR_GFX = BIT(8), /* Graphics Accelerator (0=present) */ + SCR_SA1111 = BIT(9), /* Neponset (0=present) */ +}; + +#ifdef CONFIG_ASSABET_NEPONSET +#define machine_has_neponset() ((SCR_value & SCR_SA1111) == 0) +#else +#define machine_has_neponset() (0) +#endif + #define ASSABET_BCR_BASE 0xf1000000 #define ASSABET_BCR IOMEM(ASSABET_BCR_BASE) @@ -62,8 +78,7 @@ ASSABET_BCR_CF_BUS_OFF | ASSABET_BCR_STEREO_LB | \ ASSABET_BCR_IRDA_MD0 | ASSABET_BCR_CF_RST) -unsigned long SCR_value = ASSABET_SCR_INIT; -EXPORT_SYMBOL(SCR_value); +static unsigned long SCR_value = ~0UL; static struct gpio_chip *assabet_bcr_gc; |