1 files changed, 15 insertions, 44 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/spear300.h b/arch/arm/mach-spear3xx/include/mach/spear300.h
index ccaa76522ee2..c723515f8853 100644
--- 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_BASE           UL(0x50000000)
-#define SPEAR300_TELECOM_SIZE           0x10000000
 /* 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_BASE              UL(0x60000000)
-#define SPEAR300_CLCD_SIZE              0x10000000
+#define SPEAR300_SDHCI_BASE             UL(0x70000000)
+#define SPEAR300_NAND_0_BASE            UL(0x80000000)
-#define SPEAR300_SDIO_BASE              0x70000000
+#define SPEAR300_NAND_1_BASE            UL(0x84000000)
-#define SPEAR300_SDIO_SIZE              0x10000000
+#define SPEAR300_NAND_2_BASE            UL(0x88000000)
+#define SPEAR300_NAND_3_BASE            UL(0x8c000000)
-#define SPEAR300_NAND_0_BASE            0x80000000
+#define SPEAR300_NOR_0_BASE             UL(0x90000000)
-#define SPEAR300_NAND_0_SIZE            0x04000000
+#define SPEAR300_NOR_1_BASE             UL(0x91000000)
+#define SPEAR300_NOR_2_BASE             UL(0x92000000)
-#define SPEAR300_NAND_1_BASE            0x84000000
+#define SPEAR300_NOR_3_BASE             UL(0x93000000)
-#define SPEAR300_NAND_1_SIZE            0x04000000
+#define SPEAR300_FSMC_BASE              UL(0x94000000)
+#define SPEAR300_SOC_CONFIG_BASE        UL(0x99000000)
-#define SPEAR300_NAND_2_BASE            0x88000000
+#define SPEAR300_KEYBOARD_BASE          UL(0xA0000000)
-#define SPEAR300_NAND_2_SIZE            0x04000000
+#define SPEAR300_GPIO_BASE              UL(0xA9000000)
-#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
 #endif /* __MACH_SPEAR300_H */

diff --git a/arch/arm/mach-spear3xx/include/mach/spear300.h b/arch/arm/mach-spear3xx/include/mach/spear300.h index ccaa76522ee2..c723515f8853 100644 --- a/arch/arm/mach-spear3xx/include/mach/spear300.h +++ b/arch/arm/mach-spear3xx/include/mach/spear300.h
@@ -17,11 +17,9 @@
17	#define __MACH_SPEAR300_H	17	#define __MACH_SPEAR300_H
18		18
19	/* Base address of various IPs */	19	/* Base address of various IPs */
20	#define SPEAR300_TELECOM_BASE 0x50000000	20	#define SPEAR300_TELECOM_BASE UL(0x50000000)
21	#define SPEAR300_TELECOM_SIZE 0x10000000
22		21
23	/* Interrupt registers offsets and masks */	22	/* Interrupt registers offsets and masks */
24	#define SPEAR300_TELECOM_REG_SIZE 0x00010000
25	#define INT_ENB_MASK_REG 0x54	23	#define INT_ENB_MASK_REG 0x54
26	#define INT_STS_MASK_REG 0x58	24	#define INT_STS_MASK_REG 0x58
27	#define IT_PERS_S_IRQ_MASK (1 << 0)	25	#define IT_PERS_S_IRQ_MASK (1 << 0)
@@ -36,47 +34,20 @@
36		34
37	#define SHIRQ_RAS1_MASK 0x1FF	35	#define SHIRQ_RAS1_MASK 0x1FF
38		36
39	#define SPEAR300_CLCD_BASE 0x60000000	37	#define SPEAR300_CLCD_BASE UL(0x60000000)
40	#define SPEAR300_CLCD_SIZE 0x10000000	38	#define SPEAR300_SDHCI_BASE UL(0x70000000)
41		39	#define SPEAR300_NAND_0_BASE UL(0x80000000)
42	#define SPEAR300_SDIO_BASE 0x70000000	40	#define SPEAR300_NAND_1_BASE UL(0x84000000)
43	#define SPEAR300_SDIO_SIZE 0x10000000	41	#define SPEAR300_NAND_2_BASE UL(0x88000000)
44		42	#define SPEAR300_NAND_3_BASE UL(0x8c000000)
45	#define SPEAR300_NAND_0_BASE 0x80000000	43	#define SPEAR300_NOR_0_BASE UL(0x90000000)
46	#define SPEAR300_NAND_0_SIZE 0x04000000	44	#define SPEAR300_NOR_1_BASE UL(0x91000000)
47		45	#define SPEAR300_NOR_2_BASE UL(0x92000000)
48	#define SPEAR300_NAND_1_BASE 0x84000000	46	#define SPEAR300_NOR_3_BASE UL(0x93000000)
49	#define SPEAR300_NAND_1_SIZE 0x04000000	47	#define SPEAR300_FSMC_BASE UL(0x94000000)
50		48	#define SPEAR300_SOC_CONFIG_BASE UL(0x99000000)
51	#define SPEAR300_NAND_2_BASE 0x88000000	49	#define SPEAR300_KEYBOARD_BASE UL(0xA0000000)
52	#define SPEAR300_NAND_2_SIZE 0x04000000	50	#define SPEAR300_GPIO_BASE UL(0xA9000000)
53
54	#define SPEAR300_NAND_3_BASE 0x8c000000
55	#define SPEAR300_NAND_3_SIZE 0x04000000
56
57	#define SPEAR300_NOR_0_BASE 0x90000000
58	#define SPEAR300_NOR_0_SIZE 0x01000000
59
60	#define SPEAR300_NOR_1_BASE 0x91000000
61	#define SPEAR300_NOR_1_SIZE 0x01000000
62
63	#define SPEAR300_NOR_2_BASE 0x92000000
64	#define SPEAR300_NOR_2_SIZE 0x01000000
65
66	#define SPEAR300_NOR_3_BASE 0x93000000
67	#define SPEAR300_NOR_3_SIZE 0x01000000
68
69	#define SPEAR300_FSMC_BASE 0x94000000
70	#define SPEAR300_FSMC_SIZE 0x05000000
71
72	#define SPEAR300_SOC_CONFIG_BASE 0x99000000
73	#define SPEAR300_SOC_CONFIG_SIZE 0x00000008
74
75	#define SPEAR300_KEYBOARD_BASE 0xA0000000
76	#define SPEAR300_KEYBOARD_SIZE 0x09000000
77
78	#define SPEAR300_GPIO_BASE 0xA9000000
79	#define SPEAR300_GPIO_SIZE 0x07000000
80		51
81	#endif /* __MACH_SPEAR300_H */	52	#endif /* __MACH_SPEAR300_H */
82		53