diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-05-03 02:46:56 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-04 12:50:02 -0400 |
commit | d48fd006e6d9394e9abd14f4747034f73bb6a386 (patch) | |
tree | fab3577a596c9f81268f37cf71bf07a67da39e78 /arch/arm/mach-ux500/cpu.c | |
parent | d67d1127a625cc5ebc3802180b19cc74f35b5578 (diff) |
ARM: 6082/1: ux500: put common devices into devices.c
Introduce devices.c, for placing devices common among Ux500 SoCs. Start
with the PL031 device.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index e6a8058cd735..05615c094493 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
18 | #include <mach/setup.h> | 18 | #include <mach/setup.h> |
19 | #include <mach/devices.h> | ||
19 | 20 | ||
20 | #include "clock.h" | 21 | #include "clock.h" |
21 | 22 | ||
@@ -41,11 +42,20 @@ static struct map_desc ux500_io_desc[] __initdata = { | |||
41 | __IO_DEV_DESC(UX500_BACKUPRAM0_BASE, SZ_8K), | 42 | __IO_DEV_DESC(UX500_BACKUPRAM0_BASE, SZ_8K), |
42 | }; | 43 | }; |
43 | 44 | ||
45 | static struct amba_device *ux500_amba_devs[] __initdata = { | ||
46 | &ux500_pl031_device, | ||
47 | }; | ||
48 | |||
44 | void __init ux500_map_io(void) | 49 | void __init ux500_map_io(void) |
45 | { | 50 | { |
46 | iotable_init(ux500_io_desc, ARRAY_SIZE(ux500_io_desc)); | 51 | iotable_init(ux500_io_desc, ARRAY_SIZE(ux500_io_desc)); |
47 | } | 52 | } |
48 | 53 | ||
54 | void __init ux500_init_devices(void) | ||
55 | { | ||
56 | amba_add_devices(ux500_amba_devs, ARRAY_SIZE(ux500_amba_devs)); | ||
57 | } | ||
58 | |||
49 | void __init ux500_init_irq(void) | 59 | void __init ux500_init_irq(void) |
50 | { | 60 | { |
51 | gic_dist_init(0, __io_address(UX500_GIC_DIST_BASE), 29); | 61 | gic_dist_init(0, __io_address(UX500_GIC_DIST_BASE), 29); |