fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-arm / arch-sa1100 / collie.h

diff --git a/include/asm-arm/arch-sa1100/collie.h b/include/asm-arm/arch-sa1100/collie.h
index c070f70..14a344a 100644 (file)
--- a/include/asm-arm/arch-sa1100/collie.h
+++ b/include/asm-arm/arch-sa1100/collie.h
@@ -13,59 +13,21 @@
 #ifndef __ASM_ARCH_COLLIE_H
 #define __ASM_ARCH_COLLIE_H
 
-#include <linux/config.h>
 
-#define CF_BUF_CTRL_BASE 0xF0800000
-#define        COLLIE_SCP_REG(adr) (*(volatile unsigned short*)(CF_BUF_CTRL_BASE+(adr)))
-#define        COLLIE_SCP_MCR  0x00
-#define        COLLIE_SCP_CDR  0x04
-#define        COLLIE_SCP_CSR  0x08
-#define        COLLIE_SCP_CPR  0x0C
-#define        COLLIE_SCP_CCR  0x10
-#define        COLLIE_SCP_IRR  0x14
-#define        COLLIE_SCP_IRM  0x14
-#define        COLLIE_SCP_IMR  0x18
-#define        COLLIE_SCP_ISR  0x1C
-#define        COLLIE_SCP_GPCR 0x20
-#define        COLLIE_SCP_GPWR 0x24
-#define        COLLIE_SCP_GPRR 0x28
-#define        COLLIE_SCP_REG_MCR      COLLIE_SCP_REG(COLLIE_SCP_MCR)
-#define        COLLIE_SCP_REG_CDR      COLLIE_SCP_REG(COLLIE_SCP_CDR)
-#define        COLLIE_SCP_REG_CSR      COLLIE_SCP_REG(COLLIE_SCP_CSR)
-#define        COLLIE_SCP_REG_CPR      COLLIE_SCP_REG(COLLIE_SCP_CPR)
-#define        COLLIE_SCP_REG_CCR      COLLIE_SCP_REG(COLLIE_SCP_CCR)
-#define        COLLIE_SCP_REG_IRR      COLLIE_SCP_REG(COLLIE_SCP_IRR)
-#define        COLLIE_SCP_REG_IRM      COLLIE_SCP_REG(COLLIE_SCP_IRM)
-#define        COLLIE_SCP_REG_IMR      COLLIE_SCP_REG(COLLIE_SCP_IMR)
-#define        COLLIE_SCP_REG_ISR      COLLIE_SCP_REG(COLLIE_SCP_ISR)
-#define        COLLIE_SCP_REG_GPCR     COLLIE_SCP_REG(COLLIE_SCP_GPCR)
-#define        COLLIE_SCP_REG_GPWR     COLLIE_SCP_REG(COLLIE_SCP_GPWR)
-#define        COLLIE_SCP_REG_GPRR     COLLIE_SCP_REG(COLLIE_SCP_GPRR)
-
-#define COLLIE_SCP_GPCR_PA19   ( 1 << 9 )
-#define COLLIE_SCP_GPCR_PA18   ( 1 << 8 )
-#define COLLIE_SCP_GPCR_PA17   ( 1 << 7 )
-#define COLLIE_SCP_GPCR_PA16   ( 1 << 6 )
-#define COLLIE_SCP_GPCR_PA15   ( 1 << 5 )
-#define COLLIE_SCP_GPCR_PA14   ( 1 << 4 )
-#define COLLIE_SCP_GPCR_PA13   ( 1 << 3 )
-#define COLLIE_SCP_GPCR_PA12   ( 1 << 2 )
-#define COLLIE_SCP_GPCR_PA11   ( 1 << 1 )
-
-#define COLLIE_SCP_CHARGE_ON   COLLIE_SCP_GPCR_PA11
-#define COLLIE_SCP_DIAG_BOOT1  COLLIE_SCP_GPCR_PA12
-#define COLLIE_SCP_DIAG_BOOT2  COLLIE_SCP_GPCR_PA13
-#define COLLIE_SCP_MUTE_L      COLLIE_SCP_GPCR_PA14
-#define COLLIE_SCP_MUTE_R      COLLIE_SCP_GPCR_PA15
-#define COLLIE_SCP_5VON        COLLIE_SCP_GPCR_PA16
-#define COLLIE_SCP_AMP_ON      COLLIE_SCP_GPCR_PA17
-#define COLLIE_SCP_VPEN        COLLIE_SCP_GPCR_PA18
-#define COLLIE_SCP_LB_VOL_CHG  COLLIE_SCP_GPCR_PA19
-
-#define COLLIE_SCP_IO_DIR      ( COLLIE_SCP_CHARGE_ON | COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
+#define COLLIE_SCP_CHARGE_ON   SCOOP_GPCR_PA11
+#define COLLIE_SCP_DIAG_BOOT1  SCOOP_GPCR_PA12
+#define COLLIE_SCP_DIAG_BOOT2  SCOOP_GPCR_PA13
+#define COLLIE_SCP_MUTE_L      SCOOP_GPCR_PA14
+#define COLLIE_SCP_MUTE_R      SCOOP_GPCR_PA15
+#define COLLIE_SCP_5VON                SCOOP_GPCR_PA16
+#define COLLIE_SCP_AMP_ON      SCOOP_GPCR_PA17
+#define COLLIE_SCP_VPEN                SCOOP_GPCR_PA18
+#define COLLIE_SCP_LB_VOL_CHG  SCOOP_GPCR_PA19
+
+#define COLLIE_SCOOP_IO_DIR    ( COLLIE_SCP_CHARGE_ON | COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
                                COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | COLLIE_SCP_VPEN | \
                                COLLIE_SCP_LB_VOL_CHG )
-#define COLLIE_SCP_IO_OUT      ( COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | COLLIE_SCP_VPEN | \
+#define COLLIE_SCOOP_IO_OUT    ( COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | COLLIE_SCP_VPEN | \
                                COLLIE_SCP_CHARGE_ON )
 
 /* GPIOs for which the generic definition doesn't say much */
@@ -103,34 +65,6 @@
 #define COLLIE_LCM_IRQ_GPIO_nSD_DETECT IRQ_LOCOMO_GPIO13
 #define COLLIE_LCM_IRQ_GPIO_nSD_WP     IRQ_LOCOMO_GPIO14
 
-/*
- * Flash Memory mappings
- *
- */
-
-#define FLASH_MEM_BASE 0xe8ffc000
-#define        FLASH_DATA(adr) (*(volatile unsigned int*)(FLASH_MEM_BASE+(adr)))
-#define        FLASH_DATA_F(adr) (*(volatile float32 *)(FLASH_MEM_BASE+(adr)))
-#define FLASH_MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 )  | ( b << 8 ) | a )
-
-// COMADJ
-#define FLASH_COMADJ_MAJIC     FLASH_MAGIC_CHG('C','M','A','D')
-#define        FLASH_COMADJ_MAGIC_ADR  0x00
-#define        FLASH_COMADJ_DATA_ADR   0x04
-
-// TOUCH PANEL
-#define FLASH_TOUCH_MAJIC      FLASH_MAGIC_CHG('T','U','C','H')
-#define        FLASH_TOUCH_MAGIC_ADR   0x1C
-#define        FLASH_TOUCH_XP_DATA_ADR 0x20
-#define        FLASH_TOUCH_YP_DATA_ADR 0x24
-#define        FLASH_TOUCH_XD_DATA_ADR 0x28
-#define        FLASH_TOUCH_YD_DATA_ADR 0x2C
-
-// AD
-#define FLASH_AD_MAJIC FLASH_MAGIC_CHG('B','V','A','D')
-#define        FLASH_AD_MAGIC_ADR      0x30
-#define        FLASH_AD_DATA_ADR       0x34
-
 /* GPIO's on the TC35143AF (Toshiba Analog Frontend) */
 #define COLLIE_TC35143_GPIO_VERSION0    UCB_IO_0       /* GPIO0=Version                 */
 #define COLLIE_TC35143_GPIO_TBL_CHK     UCB_IO_1       /* GPIO1=TBL_CHK                 */