aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Brinkmann <soren.brinkmann@xilinx.com>2014-09-02 17:19:06 -0400
committerMichal Simek <michal.simek@xilinx.com>2014-09-16 06:55:05 -0400
commitae88b85e801ba77939b07eb9214f1d6542fa23f7 (patch)
treeb325f4b494a3d308eccdf3a3bcf509fc54f3c090
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
ARM: zynq: PM: Enable A9 internal clock gating feature
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/arm/mach-zynq/common.c6
-rw-r--r--arch/arm/mach-zynq/common.h11
-rw-r--r--arch/arm/mach-zynq/platsmp.c13
3 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 31a6fa40ba37..3cb7c198615a 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -98,6 +98,11 @@ static int __init zynq_get_revision(void)
98 return revision; 98 return revision;
99} 99}
100 100
101static void __init zynq_init_late(void)
102{
103 zynq_core_pm_init();
104}
105
101/** 106/**
102 * zynq_init_machine - System specific initialization, intended to be 107 * zynq_init_machine - System specific initialization, intended to be
103 * called from board specific initialization. 108 * called from board specific initialization.
@@ -204,6 +209,7 @@ DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
204 .map_io = zynq_map_io, 209 .map_io = zynq_map_io,
205 .init_irq = zynq_irq_init, 210 .init_irq = zynq_irq_init,
206 .init_machine = zynq_init_machine, 211 .init_machine = zynq_init_machine,
212 .init_late = zynq_init_late,
207 .init_time = zynq_timer_init, 213 .init_time = zynq_timer_init,
208 .dt_compat = zynq_dt_match, 214 .dt_compat = zynq_dt_match,
209 .reserve = zynq_memory_init, 215 .reserve = zynq_memory_init,
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index f652f0a884a6..596ef0b5067c 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -40,4 +40,15 @@ extern void __iomem *zynq_scu_base;
40/* Hotplug */ 40/* Hotplug */
41extern void zynq_platform_cpu_die(unsigned int cpu); 41extern void zynq_platform_cpu_die(unsigned int cpu);
42 42
43static inline void zynq_core_pm_init(void)
44{
45 /* A9 clock gating */
46 asm volatile ("mrc p15, 0, r12, c15, c0, 0\n"
47 "orr r12, r12, #1\n"
48 "mcr p15, 0, r12, c15, c0, 0\n"
49 : /* no outputs */
50 : /* no inputs */
51 : "r12");
52}
53
43#endif 54#endif
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index abc82ef085c1..6c7843108c7f 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -112,6 +112,18 @@ static void __init zynq_smp_prepare_cpus(unsigned int max_cpus)
112 scu_enable(zynq_scu_base); 112 scu_enable(zynq_scu_base);
113} 113}
114 114
115/**
116 * zynq_secondary_init - Initialize secondary CPU cores
117 * @cpu: CPU that is initialized
118 *
119 * This function is in the hotplug path. Don't move it into the
120 * init section!!
121 */
122static void zynq_secondary_init(unsigned int cpu)
123{
124 zynq_core_pm_init();
125}
126
115#ifdef CONFIG_HOTPLUG_CPU 127#ifdef CONFIG_HOTPLUG_CPU
116static int zynq_cpu_kill(unsigned cpu) 128static int zynq_cpu_kill(unsigned cpu)
117{ 129{
@@ -124,6 +136,7 @@ struct smp_operations zynq_smp_ops __initdata = {
124 .smp_init_cpus = zynq_smp_init_cpus, 136 .smp_init_cpus = zynq_smp_init_cpus,
125 .smp_prepare_cpus = zynq_smp_prepare_cpus, 137 .smp_prepare_cpus = zynq_smp_prepare_cpus,
126 .smp_boot_secondary = zynq_boot_secondary, 138 .smp_boot_secondary = zynq_boot_secondary,
139 .smp_secondary_init = zynq_secondary_init,
127#ifdef CONFIG_HOTPLUG_CPU 140#ifdef CONFIG_HOTPLUG_CPU
128 .cpu_die = zynq_platform_cpu_die, 141 .cpu_die = zynq_platform_cpu_die,
129 .cpu_kill = zynq_cpu_kill, 142 .cpu_kill = zynq_cpu_kill,