Patchwork [v1,3/6] xilinx_timer: Fixed "frequency" prop name

login
register
mail settings
Submitter Peter A. G. Crosthwaite
Date Sept. 17, 2012, 8:47 a.m.
Message ID <af47553624c2d22d0cdd57d305a6fde8b7057cf9.1347871393.git.peter.crosthwaite@petalogix.com>
Download mbox | patch
Permalink /patch/184325/
State New
Headers show

Comments

Peter A. G. Crosthwaite - Sept. 17, 2012, 8:47 a.m.
The "frequency" qdev prop matches the "clock-frequency" property in Xilinx EDK.
Renamed "frequency" -> "clock-frequency" accordingly.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
 hw/xilinx.h       |    2 +-
 hw/xilinx_timer.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/xilinx.h b/hw/xilinx.h
index df06a00..45a6bdc 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -23,7 +23,7 @@  xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
 
     dev = qdev_create(NULL, "xlnx.xps-timer");
     qdev_prop_set_uint32(dev, "one-timer-only", oto);
-    qdev_prop_set_uint32(dev, "frequency", freq);
+    qdev_prop_set_uint32(dev, "clock-frequency", freq);
     qdev_init_nofail(dev);
     sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
     sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index c02e6ca..9eb5ef7 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -224,7 +224,8 @@  static int xilinx_timer_init(SysBusDevice *dev)
 }
 
 static Property xilinx_timer_properties[] = {
-    DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz,   62 * 1000000),
+    DEFINE_PROP_UINT32("clock-frequency", struct timerblock, freq_hz,
+                                                                62 * 1000000),
     DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only, 0),
     DEFINE_PROP_END_OF_LIST(),
 };