2 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 6b04260aa142..f03e75bd0b2b 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -2,6 +2,8 @@ config ARCH_ZYNQ
         bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
         select ARM_AMBA
         select ARM_GIC
+        select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_OPP
         select COMMON_CLK
         select CPU_V7
         select GENERIC_CLOCKEVENTS
@@ -13,6 +15,6 @@ config ARCH_ZYNQ
         select HAVE_SMP
         select SPARSE_IRQ
         select CADENCE_TTC_TIMER
-        select ARM_GLOBAL_TIMER
+        select ARM_GLOBAL_TIMER if !CPU_FREQ
         help
           Support for Xilinx Zynq ARM Cortex A9 Platform
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 8c09a8393fb6..a39be8e80856 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -64,6 +64,8 @@ static struct platform_device zynq_cpuidle_device = {
  */
 static void __init zynq_init_machine(void)
 {
+        struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
+
         /*
          * 64KB way size, 8-way associativity, parity disabled
          */
@@ -72,6 +74,7 @@ static void __init zynq_init_machine(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         platform_device_register(&zynq_cpuidle_device);
+        platform_device_register_full(&devinfo);
 }
 
 static void __init zynq_timer_init(void)