Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / lpd270.h

diff --git a/include/asm-arm/arch-pxa/lpd270.h b/include/asm-arm/arch-pxa/lpd270.h
deleted file mode 100644 (file)
index 501d240..0000000
--- a/include/asm-arm/arch-pxa/lpd270.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * include/asm-arm/arch-pxa/lpd270.h
- *
- * Author:     Lennert Buytenhek
- * Created:    Feb 10, 2006
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_LPD270_H
-#define __ASM_ARCH_LPD270_H
-
-#define LPD270_CPLD_PHYS       PXA_CS2_PHYS
-#define LPD270_CPLD_VIRT       0xf0000000
-#define LPD270_CPLD_SIZE       0x00100000
-
-#define LPD270_ETH_PHYS                (PXA_CS2_PHYS + 0x01000000)
-
-/* CPLD registers  */
-#define LPD270_CPLD_REG(x)     ((unsigned long)(LPD270_CPLD_VIRT + (x)))
-#define LPD270_CONTROL         LPD270_CPLD_REG(0x00)
-#define LPD270_PERIPHERAL0     LPD270_CPLD_REG(0x04)
-#define LPD270_PERIPHERAL1     LPD270_CPLD_REG(0x08)
-#define LPD270_CPLD_REVISION   LPD270_CPLD_REG(0x14)
-#define LPD270_EEPROM_SPI_ITF  LPD270_CPLD_REG(0x20)
-#define LPD270_MODE_PINS       LPD270_CPLD_REG(0x24)
-#define LPD270_EGPIO           LPD270_CPLD_REG(0x30)
-#define LPD270_INT_MASK                LPD270_CPLD_REG(0x40)
-#define LPD270_INT_STATUS      LPD270_CPLD_REG(0x50)
-
-#define LPD270_INT_AC97                (1 << 4)  /* AC'97 CODEC IRQ */
-#define LPD270_INT_ETHERNET    (1 << 3)  /* Ethernet controller IRQ */
-#define LPD270_INT_USBC                (1 << 2)  /* USB client cable detection IRQ */
-
-
-#endif