diff options
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index f6522f9f129c..a29a0e3adcf9 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
11 | #include <linux/clk.h> | 11 | #include <linux/clk.h> |
12 | #include <linux/mfd/db8500-prcmu.h> | 12 | #include <linux/mfd/db8500-prcmu.h> |
13 | #include <linux/mfd/db5500-prcmu.h> | ||
14 | #include <linux/clksrc-dbx500-prcmu.h> | 13 | #include <linux/clksrc-dbx500-prcmu.h> |
15 | #include <linux/sys_soc.h> | 14 | #include <linux/sys_soc.h> |
16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
@@ -52,10 +51,7 @@ void __init ux500_init_irq(void) | |||
52 | void __iomem *dist_base; | 51 | void __iomem *dist_base; |
53 | void __iomem *cpu_base; | 52 | void __iomem *cpu_base; |
54 | 53 | ||
55 | if (cpu_is_u5500()) { | 54 | if (cpu_is_u8500_family()) { |
56 | dist_base = __io_address(U5500_GIC_DIST_BASE); | ||
57 | cpu_base = __io_address(U5500_GIC_CPU_BASE); | ||
58 | } else if (cpu_is_u8500()) { | ||
59 | dist_base = __io_address(U8500_GIC_DIST_BASE); | 55 | dist_base = __io_address(U8500_GIC_DIST_BASE); |
60 | cpu_base = __io_address(U8500_GIC_CPU_BASE); | 56 | cpu_base = __io_address(U8500_GIC_CPU_BASE); |
61 | } else | 57 | } else |
@@ -72,9 +68,7 @@ void __init ux500_init_irq(void) | |||
72 | * Init clocks here so that they are available for system timer | 68 | * Init clocks here so that they are available for system timer |
73 | * initialization. | 69 | * initialization. |
74 | */ | 70 | */ |
75 | if (cpu_is_u5500()) | 71 | if (cpu_is_u8500_family()) |
76 | db5500_prcmu_early_init(); | ||
77 | if (cpu_is_u8500()) | ||
78 | db8500_prcmu_early_init(); | 72 | db8500_prcmu_early_init(); |
79 | clk_init(); | 73 | clk_init(); |
80 | } | 74 | } |