patchbot at xen
Aug 8, 2013, 10:25 PM
Post #1 of 1
(7 views)
Permalink
|
|
[xen master] Revert "xen/arm: Add support for device tree specified arch_timer clock frequency."
|
|
commit 5c858f0e55a443ef8717e18e0aa434a7fae0bd1f
Author: Ian Campbell <ian.campbell [at] citrix>
AuthorDate: Thu Aug 8 13:44:16 2013 +0100
Commit: Ian Campbell <ian.campbell [at] citrix>
CommitDate: Thu Aug 8 13:44:16 2013 +0100
Revert "xen/arm: Add support for device tree specified arch_timer clock frequency."
This reverts commit dd11cc89c5ba53ae8d969037eda8b8c70d20ffa6.
Broke the build due to dt_property_read_u32 being defined in an as yet
unapplied patch.
---
xen/arch/arm/time.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 9a1b080..4ed7882 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -104,7 +104,6 @@ int __init init_xen_time(void)
struct dt_device_node *dev;
int res;
unsigned int i;
- u32 rate;
dev = dt_find_compatible_node(NULL, NULL, "arm,armv7-timer");
if ( !dev )
@@ -135,11 +134,7 @@ int __init init_xen_time(void)
if ( !cpu_has_gentimer )
panic("CPU does not support the Generic Timer v1 interface.\n");
- res = dt_property_read_u32(dev, "clock-frequency", &rate);
- if ( res )
- cpu_khz = rate / 1000;
- else
- cpu_khz = READ_SYSREG32(CNTFRQ_EL0) / 1000;
+ cpu_khz = READ_SYSREG32(CNTFRQ_EL0) / 1000;
boot_count = READ_SYSREG64(CNTPCT_EL0);
printk("Using generic timer at %lu KHz\n", cpu_khz);
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
