4 files changed, 11 insertions, 13 deletions

diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 23d2a1457d7..2697e65adf8 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -437,7 +437,7 @@ struct amba_device gpio1_device = {
         },
         .res = {
                 .start = SPEAR300_GPIO_BASE,
-                .end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1,
+                .end = SPEAR300_GPIO_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
         .irq = {VIRQ_GPIO1, NO_IRQ},
@@ -452,8 +452,7 @@ void __init spear300_init(void)
         spear3xx_init();
 
         /* shared irq registration */
-        shirq_ras1.regs.base =
-                ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE);
+        shirq_ras1.regs.base = ioremap(SPEAR300_TELECOM_BASE, SZ_4K);
         if (shirq_ras1.regs.base) {
                 ret = spear_shirq_register(&shirq_ras1);
                 if (ret)
@@ -461,8 +460,7 @@ void __init spear300_init(void)
         }
 
         /* pmx initialization */
-        pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE,
-                        SPEAR300_SOC_CONFIG_SIZE);
+        pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);
         if (pmx_driver.base) {
                 ret = pmx_register(&pmx_driver);
                 if (ret)
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
index 3a3d5482c6d..5c0a67b60c2 100644
--- a/arch/arm/mach-spear3xx/spear310.c
+++ b/arch/arm/mach-spear3xx/spear310.c
@@ -267,7 +267,7 @@ void __init spear310_init(void)
         spear3xx_init();
 
         /* shared irq registration */
-        base = ioremap(SPEAR310_SOC_CONFIG_BASE, SPEAR310_SOC_CONFIG_SIZE);
+        base = ioremap(SPEAR310_SOC_CONFIG_BASE, SZ_4K);
         if (base) {
                 /* shirq 1 */
                 shirq_ras1.regs.base = base;
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 8ba3ff25294..741c1f414cb 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -520,7 +520,7 @@ void __init spear320_init(void)
         spear3xx_init();
 
         /* shared irq registration */
-        base = ioremap(SPEAR320_SOC_CONFIG_BASE, SPEAR320_SOC_CONFIG_SIZE);
+        base = ioremap(SPEAR320_SOC_CONFIG_BASE, SZ_4K);
         if (base) {
                 /* shirq 1 */
                 shirq_ras1.regs.base = base;
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index 634116f6029..d3ba8ca1bc5 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -35,7 +35,7 @@ struct amba_device gpio_device = {
         },
         .res = {
                 .start = SPEAR3XX_ICM3_GPIO_BASE,
-                .end = SPEAR3XX_ICM3_GPIO_BASE + SPEAR3XX_ICM3_GPIO_SIZE - 1,
+                .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
         .irq = {IRQ_BASIC_GPIO, NO_IRQ},
@@ -48,7 +48,7 @@ struct amba_device uart_device = {
         },
         .res = {
                 .start = SPEAR3XX_ICM1_UART_BASE,
-                .end = SPEAR3XX_ICM1_UART_BASE + SPEAR3XX_ICM1_UART_SIZE - 1,
+                .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
         .irq = {IRQ_UART, NO_IRQ},
@@ -71,22 +71,22 @@ struct map_desc spear3xx_io_desc[] __initdata = {
         {
                 .virtual        = VA_SPEAR3XX_ICM1_UART_BASE,
                 .pfn            = __phys_to_pfn(SPEAR3XX_ICM1_UART_BASE),
-                .length         = SPEAR3XX_ICM1_UART_SIZE,
+                .length         = SZ_4K,
                 .type           = MT_DEVICE
         }, {
                 .virtual        = VA_SPEAR3XX_ML1_VIC_BASE,
                 .pfn            = __phys_to_pfn(SPEAR3XX_ML1_VIC_BASE),
-                .length         = SPEAR3XX_ML1_VIC_SIZE,
+                .length         = SZ_4K,
                 .type           = MT_DEVICE
         }, {
                 .virtual        = VA_SPEAR3XX_ICM3_SYS_CTRL_BASE,
                 .pfn            = __phys_to_pfn(SPEAR3XX_ICM3_SYS_CTRL_BASE),
-                .length         = SPEAR3XX_ICM3_SYS_CTRL_SIZE,
+                .length         = SZ_4K,
                 .type           = MT_DEVICE
         }, {
                 .virtual        = VA_SPEAR3XX_ICM3_MISC_REG_BASE,
                 .pfn            = __phys_to_pfn(SPEAR3XX_ICM3_MISC_REG_BASE),
-                .length         = SPEAR3XX_ICM3_MISC_REG_SIZE,
+                .length         = SZ_4K,
                 .type           = MT_DEVICE
         },
 };