ARM: OMAP: Sync headers with linux-omap

This patch syncs omap specific headers with linux-omap.
Most of the changes needed because of bitrot caused by
driver changes in linux-omap tree. Integrating this
is needed for adding support for various omap drivers.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 0 insertions, 9 deletions

diff --git a/include/asm-arm/arch-omap/board-apollon.h b/include/asm-arm/arch-omap/board-apollon.h
index de0c5b792c58..dcb587b311f1 100644
--- a/include/asm-arm/arch-omap/board-apollon.h
+++ b/include/asm-arm/arch-omap/board-apollon.h
@@ -30,16 +30,7 @@
 #define __ASM_ARCH_OMAP_APOLLON_H
 
 /* Placeholder for APOLLON specific defines */
-/* GPMC CS0 */
-#define APOLLON_CS0_BASE                0x00000000
-/* GPMC CS1 */
-#define APOLLON_CS1_BASE                0x08000000
-#define APOLLON_ETHR_START              (APOLLON_CS1_BASE + 0x300)
 #define APOLLON_ETHR_GPIO_IRQ           74
-/* GPMC CS2 - reserved for OneNAND */
-#define APOLLON_CS2_BASE                0x10000000
-/* GPMC CS3 - reserved for NOR or NAND */
-#define APOLLON_CS3_BASE                0x18000000
 
 #endif /*  __ASM_ARCH_OMAP_APOLLON_H */