diff options
author | viresh kumar <viresh.kumar@st.com> | 2011-03-06 23:57:06 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-09 04:49:46 -0500 |
commit | 53821162fce0e69a8d9fb98ae87ce27c1b500b8e (patch) | |
tree | 2aee16c814cea1ddbd0b6e660b08bf6a718f8c65 /arch | |
parent | c2c07831a76ca64670df9cc315087962f6fdceac (diff) |
ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
Resource size required mostly is 4K for all devices, whereas currently
reserved space is much beyond that. This patch replaces SIZE macro's used at
multiple places with SZ_4K.
Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-spear6xx/spear6xx.c | 25 |
5 files changed, 21 insertions, 28 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index 23d2a1457d7e..2697e65adf86 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c | |||
@@ -437,7 +437,7 @@ struct amba_device gpio1_device = { | |||
437 | }, | 437 | }, |
438 | .res = { | 438 | .res = { |
439 | .start = SPEAR300_GPIO_BASE, | 439 | .start = SPEAR300_GPIO_BASE, |
440 | .end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1, | 440 | .end = SPEAR300_GPIO_BASE + SZ_4K - 1, |
441 | .flags = IORESOURCE_MEM, | 441 | .flags = IORESOURCE_MEM, |
442 | }, | 442 | }, |
443 | .irq = {VIRQ_GPIO1, NO_IRQ}, | 443 | .irq = {VIRQ_GPIO1, NO_IRQ}, |
@@ -452,8 +452,7 @@ void __init spear300_init(void) | |||
452 | spear3xx_init(); | 452 | spear3xx_init(); |
453 | 453 | ||
454 | /* shared irq registration */ | 454 | /* shared irq registration */ |
455 | shirq_ras1.regs.base = | 455 | shirq_ras1.regs.base = ioremap(SPEAR300_TELECOM_BASE, SZ_4K); |
456 | ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE); | ||
457 | if (shirq_ras1.regs.base) { | 456 | if (shirq_ras1.regs.base) { |
458 | ret = spear_shirq_register(&shirq_ras1); | 457 | ret = spear_shirq_register(&shirq_ras1); |
459 | if (ret) | 458 | if (ret) |
@@ -461,8 +460,7 @@ void __init spear300_init(void) | |||
461 | } | 460 | } |
462 | 461 | ||
463 | /* pmx initialization */ | 462 | /* pmx initialization */ |
464 | pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, | 463 | pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K); |
465 | SPEAR300_SOC_CONFIG_SIZE); | ||
466 | if (pmx_driver.base) { | 464 | if (pmx_driver.base) { |
467 | ret = pmx_register(&pmx_driver); | 465 | ret = pmx_register(&pmx_driver); |
468 | if (ret) | 466 | if (ret) |
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 3a3d5482c6df..5c0a67b60c2a 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c | |||
@@ -267,7 +267,7 @@ void __init spear310_init(void) | |||
267 | spear3xx_init(); | 267 | spear3xx_init(); |
268 | 268 | ||
269 | /* shared irq registration */ | 269 | /* shared irq registration */ |
270 | base = ioremap(SPEAR310_SOC_CONFIG_BASE, SPEAR310_SOC_CONFIG_SIZE); | 270 | base = ioremap(SPEAR310_SOC_CONFIG_BASE, SZ_4K); |
271 | if (base) { | 271 | if (base) { |
272 | /* shirq 1 */ | 272 | /* shirq 1 */ |
273 | shirq_ras1.regs.base = base; | 273 | shirq_ras1.regs.base = base; |
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index 8ba3ff252942..741c1f414cbd 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c | |||
@@ -520,7 +520,7 @@ void __init spear320_init(void) | |||
520 | spear3xx_init(); | 520 | spear3xx_init(); |
521 | 521 | ||
522 | /* shared irq registration */ | 522 | /* shared irq registration */ |
523 | base = ioremap(SPEAR320_SOC_CONFIG_BASE, SPEAR320_SOC_CONFIG_SIZE); | 523 | base = ioremap(SPEAR320_SOC_CONFIG_BASE, SZ_4K); |
524 | if (base) { | 524 | if (base) { |
525 | /* shirq 1 */ | 525 | /* shirq 1 */ |
526 | shirq_ras1.regs.base = base; | 526 | shirq_ras1.regs.base = base; |
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index 634116f60297..d3ba8ca1bc59 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c | |||
@@ -35,7 +35,7 @@ struct amba_device gpio_device = { | |||
35 | }, | 35 | }, |
36 | .res = { | 36 | .res = { |
37 | .start = SPEAR3XX_ICM3_GPIO_BASE, | 37 | .start = SPEAR3XX_ICM3_GPIO_BASE, |
38 | .end = SPEAR3XX_ICM3_GPIO_BASE + SPEAR3XX_ICM3_GPIO_SIZE - 1, | 38 | .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1, |
39 | .flags = IORESOURCE_MEM, | 39 | .flags = IORESOURCE_MEM, |
40 | }, | 40 | }, |
41 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, | 41 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, |
@@ -48,7 +48,7 @@ struct amba_device uart_device = { | |||
48 | }, | 48 | }, |
49 | .res = { | 49 | .res = { |
50 | .start = SPEAR3XX_ICM1_UART_BASE, | 50 | .start = SPEAR3XX_ICM1_UART_BASE, |
51 | .end = SPEAR3XX_ICM1_UART_BASE + SPEAR3XX_ICM1_UART_SIZE - 1, | 51 | .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1, |
52 | .flags = IORESOURCE_MEM, | 52 | .flags = IORESOURCE_MEM, |
53 | }, | 53 | }, |
54 | .irq = {IRQ_UART, NO_IRQ}, | 54 | .irq = {IRQ_UART, NO_IRQ}, |
@@ -71,22 +71,22 @@ struct map_desc spear3xx_io_desc[] __initdata = { | |||
71 | { | 71 | { |
72 | .virtual = VA_SPEAR3XX_ICM1_UART_BASE, | 72 | .virtual = VA_SPEAR3XX_ICM1_UART_BASE, |
73 | .pfn = __phys_to_pfn(SPEAR3XX_ICM1_UART_BASE), | 73 | .pfn = __phys_to_pfn(SPEAR3XX_ICM1_UART_BASE), |
74 | .length = SPEAR3XX_ICM1_UART_SIZE, | 74 | .length = SZ_4K, |
75 | .type = MT_DEVICE | 75 | .type = MT_DEVICE |
76 | }, { | 76 | }, { |
77 | .virtual = VA_SPEAR3XX_ML1_VIC_BASE, | 77 | .virtual = VA_SPEAR3XX_ML1_VIC_BASE, |
78 | .pfn = __phys_to_pfn(SPEAR3XX_ML1_VIC_BASE), | 78 | .pfn = __phys_to_pfn(SPEAR3XX_ML1_VIC_BASE), |
79 | .length = SPEAR3XX_ML1_VIC_SIZE, | 79 | .length = SZ_4K, |
80 | .type = MT_DEVICE | 80 | .type = MT_DEVICE |
81 | }, { | 81 | }, { |
82 | .virtual = VA_SPEAR3XX_ICM3_SYS_CTRL_BASE, | 82 | .virtual = VA_SPEAR3XX_ICM3_SYS_CTRL_BASE, |
83 | .pfn = __phys_to_pfn(SPEAR3XX_ICM3_SYS_CTRL_BASE), | 83 | .pfn = __phys_to_pfn(SPEAR3XX_ICM3_SYS_CTRL_BASE), |
84 | .length = SPEAR3XX_ICM3_SYS_CTRL_SIZE, | 84 | .length = SZ_4K, |
85 | .type = MT_DEVICE | 85 | .type = MT_DEVICE |
86 | }, { | 86 | }, { |
87 | .virtual = VA_SPEAR3XX_ICM3_MISC_REG_BASE, | 87 | .virtual = VA_SPEAR3XX_ICM3_MISC_REG_BASE, |
88 | .pfn = __phys_to_pfn(SPEAR3XX_ICM3_MISC_REG_BASE), | 88 | .pfn = __phys_to_pfn(SPEAR3XX_ICM3_MISC_REG_BASE), |
89 | .length = SPEAR3XX_ICM3_MISC_REG_SIZE, | 89 | .length = SZ_4K, |
90 | .type = MT_DEVICE | 90 | .type = MT_DEVICE |
91 | }, | 91 | }, |
92 | }; | 92 | }; |
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 378440bdb1c9..981812961ac7 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c | |||
@@ -31,8 +31,7 @@ struct amba_device uart_device[] = { | |||
31 | }, | 31 | }, |
32 | .res = { | 32 | .res = { |
33 | .start = SPEAR6XX_ICM1_UART0_BASE, | 33 | .start = SPEAR6XX_ICM1_UART0_BASE, |
34 | .end = SPEAR6XX_ICM1_UART0_BASE + | 34 | .end = SPEAR6XX_ICM1_UART0_BASE + SZ_4K - 1, |
35 | SPEAR6XX_ICM1_UART0_SIZE - 1, | ||
36 | .flags = IORESOURCE_MEM, | 35 | .flags = IORESOURCE_MEM, |
37 | }, | 36 | }, |
38 | .irq = {IRQ_UART_0, NO_IRQ}, | 37 | .irq = {IRQ_UART_0, NO_IRQ}, |
@@ -42,8 +41,7 @@ struct amba_device uart_device[] = { | |||
42 | }, | 41 | }, |
43 | .res = { | 42 | .res = { |
44 | .start = SPEAR6XX_ICM1_UART1_BASE, | 43 | .start = SPEAR6XX_ICM1_UART1_BASE, |
45 | .end = SPEAR6XX_ICM1_UART1_BASE + | 44 | .end = SPEAR6XX_ICM1_UART1_BASE + SZ_4K - 1, |
46 | SPEAR6XX_ICM1_UART1_SIZE - 1, | ||
47 | .flags = IORESOURCE_MEM, | 45 | .flags = IORESOURCE_MEM, |
48 | }, | 46 | }, |
49 | .irq = {IRQ_UART_1, NO_IRQ}, | 47 | .irq = {IRQ_UART_1, NO_IRQ}, |
@@ -72,8 +70,7 @@ struct amba_device gpio_device[] = { | |||
72 | }, | 70 | }, |
73 | .res = { | 71 | .res = { |
74 | .start = SPEAR6XX_CPU_GPIO_BASE, | 72 | .start = SPEAR6XX_CPU_GPIO_BASE, |
75 | .end = SPEAR6XX_CPU_GPIO_BASE + | 73 | .end = SPEAR6XX_CPU_GPIO_BASE + SZ_4K - 1, |
76 | SPEAR6XX_CPU_GPIO_SIZE - 1, | ||
77 | .flags = IORESOURCE_MEM, | 74 | .flags = IORESOURCE_MEM, |
78 | }, | 75 | }, |
79 | .irq = {IRQ_LOCAL_GPIO, NO_IRQ}, | 76 | .irq = {IRQ_LOCAL_GPIO, NO_IRQ}, |
@@ -84,8 +81,7 @@ struct amba_device gpio_device[] = { | |||
84 | }, | 81 | }, |
85 | .res = { | 82 | .res = { |
86 | .start = SPEAR6XX_ICM3_GPIO_BASE, | 83 | .start = SPEAR6XX_ICM3_GPIO_BASE, |
87 | .end = SPEAR6XX_ICM3_GPIO_BASE + | 84 | .end = SPEAR6XX_ICM3_GPIO_BASE + SZ_4K - 1, |
88 | SPEAR6XX_ICM3_GPIO_SIZE - 1, | ||
89 | .flags = IORESOURCE_MEM, | 85 | .flags = IORESOURCE_MEM, |
90 | }, | 86 | }, |
91 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, | 87 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, |
@@ -96,8 +92,7 @@ struct amba_device gpio_device[] = { | |||
96 | }, | 92 | }, |
97 | .res = { | 93 | .res = { |
98 | .start = SPEAR6XX_ICM2_GPIO_BASE, | 94 | .start = SPEAR6XX_ICM2_GPIO_BASE, |
99 | .end = SPEAR6XX_ICM2_GPIO_BASE + | 95 | .end = SPEAR6XX_ICM2_GPIO_BASE + SZ_4K - 1, |
100 | SPEAR6XX_ICM2_GPIO_SIZE - 1, | ||
101 | .flags = IORESOURCE_MEM, | 96 | .flags = IORESOURCE_MEM, |
102 | }, | 97 | }, |
103 | .irq = {IRQ_APPL_GPIO, NO_IRQ}, | 98 | .irq = {IRQ_APPL_GPIO, NO_IRQ}, |
@@ -122,27 +117,27 @@ static struct map_desc spear6xx_io_desc[] __initdata = { | |||
122 | { | 117 | { |
123 | .virtual = VA_SPEAR6XX_ICM1_UART0_BASE, | 118 | .virtual = VA_SPEAR6XX_ICM1_UART0_BASE, |
124 | .pfn = __phys_to_pfn(SPEAR6XX_ICM1_UART0_BASE), | 119 | .pfn = __phys_to_pfn(SPEAR6XX_ICM1_UART0_BASE), |
125 | .length = SPEAR6XX_ICM1_UART0_SIZE, | 120 | .length = SZ_4K, |
126 | .type = MT_DEVICE | 121 | .type = MT_DEVICE |
127 | }, { | 122 | }, { |
128 | .virtual = VA_SPEAR6XX_CPU_VIC_PRI_BASE, | 123 | .virtual = VA_SPEAR6XX_CPU_VIC_PRI_BASE, |
129 | .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_PRI_BASE), | 124 | .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_PRI_BASE), |
130 | .length = SPEAR6XX_CPU_VIC_PRI_SIZE, | 125 | .length = SZ_4K, |
131 | .type = MT_DEVICE | 126 | .type = MT_DEVICE |
132 | }, { | 127 | }, { |
133 | .virtual = VA_SPEAR6XX_CPU_VIC_SEC_BASE, | 128 | .virtual = VA_SPEAR6XX_CPU_VIC_SEC_BASE, |
134 | .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_SEC_BASE), | 129 | .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_SEC_BASE), |
135 | .length = SPEAR6XX_CPU_VIC_SEC_SIZE, | 130 | .length = SZ_4K, |
136 | .type = MT_DEVICE | 131 | .type = MT_DEVICE |
137 | }, { | 132 | }, { |
138 | .virtual = VA_SPEAR6XX_ICM3_SYS_CTRL_BASE, | 133 | .virtual = VA_SPEAR6XX_ICM3_SYS_CTRL_BASE, |
139 | .pfn = __phys_to_pfn(SPEAR6XX_ICM3_SYS_CTRL_BASE), | 134 | .pfn = __phys_to_pfn(SPEAR6XX_ICM3_SYS_CTRL_BASE), |
140 | .length = SPEAR6XX_ICM3_MISC_REG_BASE, | 135 | .length = SZ_4K, |
141 | .type = MT_DEVICE | 136 | .type = MT_DEVICE |
142 | }, { | 137 | }, { |
143 | .virtual = VA_SPEAR6XX_ICM3_MISC_REG_BASE, | 138 | .virtual = VA_SPEAR6XX_ICM3_MISC_REG_BASE, |
144 | .pfn = __phys_to_pfn(SPEAR6XX_ICM3_MISC_REG_BASE), | 139 | .pfn = __phys_to_pfn(SPEAR6XX_ICM3_MISC_REG_BASE), |
145 | .length = SPEAR6XX_ICM3_MISC_REG_SIZE, | 140 | .length = SZ_4K, |
146 | .type = MT_DEVICE | 141 | .type = MT_DEVICE |
147 | }, | 142 | }, |
148 | }; | 143 | }; |