First step to have a cpu-specific prcmu early init.
Signed-off-by: Loic Pallardy <loic.palla...@stericsson.com>
Signed-off-by: Maxime Coquelin <maxime.coque...@stericsson.com>
Acked-by: Linus Walleij <linus.wall...@linaro.org>
---
arch/arm/mach-ux500/board-mop500.c | 15 +++++++++++----
arch/arm/mach-ux500/cpu.c | 2 --
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500.c
b/arch/arm/mach-ux500/board-mop500.c
index fa75f95..057dfdb 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -21,6 +21,7 @@
#include <linux/amba/pl022.h>
#include <linux/amba/serial.h>
#include <linux/spi/spi.h>
+#include <linux/mfd/dbx500-prcmu.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/regulator/ab8500.h>
#include <linux/mfd/tc3589x.h>
@@ -715,12 +716,18 @@ static void __init u9540_init_machine(void)
regulator_has_full_constraints();
}
+static void __init mop500_init_irq(void)
+{
+ prcmu_early_init();
+ ux500_init_irq();
+}
+
MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
/* Maintainer: Srinidhi Kasagar <srinidhi.kasa...@stericsson.com> */
.atag_offset = 0x100,
.map_io = u8500_map_io,
.nr_irqs = UX500_NR_IRQS,
- .init_irq = ux500_init_irq,
+ .init_irq = mop500_init_irq,
/* we re-use nomadik timer here */
.timer = &ux500_timer,
.handle_irq = gic_handle_irq,
@@ -732,7 +739,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform
HREFv60+")
.atag_offset = 0x100,
.map_io = u8500_map_io,
.nr_irqs = UX500_NR_IRQS,
- .init_irq = ux500_init_irq,
+ .init_irq = mop500_init_irq,
.timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = hrefv60_init_machine,
@@ -743,7 +750,7 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
.atag_offset = 0x100,
.map_io = u8500_map_io,
.nr_irqs = UX500_NR_IRQS,
- .init_irq = ux500_init_irq,
+ .init_irq = mop500_init_irq,
/* we re-use nomadik timer here */
.timer = &ux500_timer,
.handle_irq = gic_handle_irq,
@@ -755,7 +762,7 @@ MACHINE_START(U9540, "ST-Ericsson 9540 platform")
.atag_offset = 0x100,
.map_io = u8500_map_io,
.nr_irqs = UX500_NR_IRQS,
- .init_irq = ux500_init_irq,
+ .init_irq = mop500_init_irq,
.timer = &ux500_timer,
.handle_irq = gic_handle_irq,
.init_machine = u9540_init_machine,
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 4b0a9b3..4a5177b 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -68,8 +68,6 @@ void __init ux500_init_irq(void)
* Init clocks here so that they are available for system timer
* initialization.
*/
- if (cpu_is_u8500_family())
- db8500_prcmu_early_init();
clk_init();
}
--
1.7.11.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
