summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-08-31 11:38:54 +0100
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2022-04-02 11:11:44 +0100
commite5d6f24567c6a7316b7acb39ad4459c6a5847b61 (patch)
tree6fee0c629da0de8f86ffa1cd34507341b64e5f81 /arch/arm/mach-sa1100/include
parent1d8f228a1698f1095a7c9ab52914be4e2fe3cb9d (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/include')
-rw-r--r--arch/arm/mach-sa1100/include/mach/assabet.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/assabet.h b/arch/arm/mach-sa1100/include/mach/assabet.h
index 829fc1839d35..53f05fced930 100644
--- a/arch/arm/mach-sa1100/include/mach/assabet.h
+++ b/arch/arm/mach-sa1100/include/mach/assabet.h
@@ -13,26 +13,6 @@
#ifndef __ASM_ARCH_ASSABET_H
#define __ASM_ARCH_ASSABET_H
-
-/* System Configuration Register flags */
-
-#define ASSABET_SCR_SDRAM_LOW (1<<2) /* SDRAM size (low bit) */
-#define ASSABET_SCR_SDRAM_HIGH (1<<3) /* SDRAM size (high bit) */
-#define ASSABET_SCR_FLASH_LOW (1<<4) /* Flash size (low bit) */
-#define ASSABET_SCR_FLASH_HIGH (1<<5) /* Flash size (high bit) */
-#define ASSABET_SCR_GFX (1<<8) /* Graphics Accelerator (0 = present) */
-#define ASSABET_SCR_SA1111 (1<<9) /* Neponset (0 = present) */
-
-#define ASSABET_SCR_INIT -1
-
-extern unsigned long SCR_value;
-
-#ifdef CONFIG_ASSABET_NEPONSET
-#define machine_has_neponset() ((SCR_value & ASSABET_SCR_SA1111) == 0)
-#else
-#define machine_has_neponset() (0)
-#endif
-
/* Board Control Register */
#define ASSABET_BCR_CF_PWR (1<<0) /* Compact Flash Power (1 = 3.3v, 0 = off) */