Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / arm / mach-spear3xx / include / mach / spear300.h

diff --git a/arch/arm/mach-spear3xx/include/mach/spear300.h b/arch/arm/mach-spear3xx/include/mach/spear300.h
index ccaa765..c723515 100644 (file)
--- a/arch/arm/mach-spear3xx/include/mach/spear300.h
+++ b/arch/arm/mach-spear3xx/include/mach/spear300.h
@@ -17,11 +17,9 @@
 #define __MACH_SPEAR300_H
 
 /* Base address of various IPs */
-#define SPEAR300_TELECOM_BASE          0x50000000
-#define SPEAR300_TELECOM_SIZE          0x10000000
+#define SPEAR300_TELECOM_BASE          UL(0x50000000)
 
 /* Interrupt registers offsets and masks */
-#define SPEAR300_TELECOM_REG_SIZE      0x00010000
 #define INT_ENB_MASK_REG               0x54
 #define INT_STS_MASK_REG               0x58
 #define IT_PERS_S_IRQ_MASK             (1 << 0)
@@ -36,47 +34,20 @@
 
 #define SHIRQ_RAS1_MASK                        0x1FF
 
-#define SPEAR300_CLCD_BASE             0x60000000
-#define SPEAR300_CLCD_SIZE             0x10000000
-
-#define SPEAR300_SDIO_BASE             0x70000000
-#define SPEAR300_SDIO_SIZE             0x10000000
-
-#define SPEAR300_NAND_0_BASE           0x80000000
-#define SPEAR300_NAND_0_SIZE           0x04000000
-
-#define SPEAR300_NAND_1_BASE           0x84000000
-#define SPEAR300_NAND_1_SIZE           0x04000000
-
-#define SPEAR300_NAND_2_BASE           0x88000000
-#define SPEAR300_NAND_2_SIZE           0x04000000
-
-#define SPEAR300_NAND_3_BASE           0x8c000000
-#define SPEAR300_NAND_3_SIZE           0x04000000
-
-#define SPEAR300_NOR_0_BASE            0x90000000
-#define SPEAR300_NOR_0_SIZE            0x01000000
-
-#define SPEAR300_NOR_1_BASE            0x91000000
-#define SPEAR300_NOR_1_SIZE            0x01000000
-
-#define SPEAR300_NOR_2_BASE            0x92000000
-#define SPEAR300_NOR_2_SIZE            0x01000000
-
-#define SPEAR300_NOR_3_BASE            0x93000000
-#define SPEAR300_NOR_3_SIZE            0x01000000
-
-#define SPEAR300_FSMC_BASE             0x94000000
-#define SPEAR300_FSMC_SIZE             0x05000000
-
-#define SPEAR300_SOC_CONFIG_BASE       0x99000000
-#define SPEAR300_SOC_CONFIG_SIZE       0x00000008
-
-#define SPEAR300_KEYBOARD_BASE         0xA0000000
-#define SPEAR300_KEYBOARD_SIZE         0x09000000
-
-#define SPEAR300_GPIO_BASE             0xA9000000
-#define SPEAR300_GPIO_SIZE             0x07000000
+#define SPEAR300_CLCD_BASE             UL(0x60000000)
+#define SPEAR300_SDHCI_BASE            UL(0x70000000)
+#define SPEAR300_NAND_0_BASE           UL(0x80000000)
+#define SPEAR300_NAND_1_BASE           UL(0x84000000)
+#define SPEAR300_NAND_2_BASE           UL(0x88000000)
+#define SPEAR300_NAND_3_BASE           UL(0x8c000000)
+#define SPEAR300_NOR_0_BASE            UL(0x90000000)
+#define SPEAR300_NOR_1_BASE            UL(0x91000000)
+#define SPEAR300_NOR_2_BASE            UL(0x92000000)
+#define SPEAR300_NOR_3_BASE            UL(0x93000000)
+#define SPEAR300_FSMC_BASE             UL(0x94000000)
+#define SPEAR300_SOC_CONFIG_BASE       UL(0x99000000)
+#define SPEAR300_KEYBOARD_BASE         UL(0xA0000000)
+#define SPEAR300_GPIO_BASE             UL(0xA9000000)
 
 #endif /* __MACH_SPEAR300_H */