diff options
Diffstat (limited to 'arch/arm/mach-ks8695')
-rw-r--r-- | arch/arm/mach-ks8695/board-acs5k.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/board-dsm320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/board-micrel.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c index 3d7d11436aa5..a91f99d265aa 100644 --- a/arch/arm/mach-ks8695/board-acs5k.c +++ b/arch/arm/mach-ks8695/board-acs5k.c | |||
@@ -223,7 +223,7 @@ static void __init acs5k_init(void) | |||
223 | 223 | ||
224 | MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") | 224 | MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") |
225 | /* Maintainer: Simtec Electronics. */ | 225 | /* Maintainer: Simtec Electronics. */ |
226 | .boot_params = KS8695_SDRAM_PA + 0x100, | 226 | .atag_offset = 0x100, |
227 | .map_io = ks8695_map_io, | 227 | .map_io = ks8695_map_io, |
228 | .init_irq = ks8695_init_irq, | 228 | .init_irq = ks8695_init_irq, |
229 | .init_machine = acs5k_init, | 229 | .init_machine = acs5k_init, |
diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c index c3c867ac4155..d24bcef2e2dd 100644 --- a/arch/arm/mach-ks8695/board-dsm320.c +++ b/arch/arm/mach-ks8695/board-dsm320.c | |||
@@ -121,7 +121,7 @@ static void __init dsm320_init(void) | |||
121 | 121 | ||
122 | MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player") | 122 | MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player") |
123 | /* Maintainer: Simtec Electronics. */ | 123 | /* Maintainer: Simtec Electronics. */ |
124 | .boot_params = KS8695_SDRAM_PA + 0x100, | 124 | .atag_offset = 0x100, |
125 | .map_io = ks8695_map_io, | 125 | .map_io = ks8695_map_io, |
126 | .init_irq = ks8695_init_irq, | 126 | .init_irq = ks8695_init_irq, |
127 | .init_machine = dsm320_init, | 127 | .init_machine = dsm320_init, |
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 9b9c47cc6471..16c95657f8fd 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c | |||
@@ -53,7 +53,7 @@ static void __init micrel_init(void) | |||
53 | 53 | ||
54 | MACHINE_START(KS8695, "KS8695 Centaur Development Board") | 54 | MACHINE_START(KS8695, "KS8695 Centaur Development Board") |
55 | /* Maintainer: Micrel Semiconductor Inc. */ | 55 | /* Maintainer: Micrel Semiconductor Inc. */ |
56 | .boot_params = KS8695_SDRAM_PA + 0x100, | 56 | .atag_offset = 0x100, |
57 | .map_io = ks8695_map_io, | 57 | .map_io = ks8695_map_io, |
58 | .init_irq = ks8695_init_irq, | 58 | .init_irq = ks8695_init_irq, |
59 | .init_machine = micrel_init, | 59 | .init_machine = micrel_init, |
diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/mach-ks8695/include/mach/debug-macro.S index bf516adf1925..a79e48981202 100644 --- a/arch/arm/mach-ks8695/include/mach/debug-macro.S +++ b/arch/arm/mach-ks8695/include/mach/debug-macro.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
15 | #include <mach/regs-uart.h> | 15 | #include <mach/regs-uart.h> |
16 | 16 | ||
17 | .macro addruart, rp, rv | 17 | .macro addruart, rp, rv, tmp |
18 | ldr \rp, =KS8695_UART_PA @ physical base address | 18 | ldr \rp, =KS8695_UART_PA @ physical base address |
19 | ldr \rv, =KS8695_UART_VA @ virtual base address | 19 | ldr \rv, =KS8695_UART_VA @ virtual base address |
20 | .endm | 20 | .endm |