Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[oweals/u-boot.git] / include / timer.h

diff --git a/include/timer.h b/include/timer.h
index cdf385d174c9bf2ae7e7ea11d715a1feffaa9f9a..7fee17e3d24193c105f44f61ff2f099dc56811eb 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -7,37 +7,46 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
+/*
+ * timer_conv_64 - convert 32-bit counter value to 64-bit
+ *
+ * @count: 32-bit counter value
+ * @return: 64-bit counter value
+ */
+u64 timer_conv_64(u32 count);
+
 /*
  * Get the current timer count
  *
- * @dev: The Timer device
+ * @dev: The timer device
  * @count: pointer that returns the current timer count
  * @return: 0 if OK, -ve on error
  */
-int timer_get_count(struct udevice *dev, unsigned long *count);
+int timer_get_count(struct udevice *dev, u64 *count);
+
 /*
  * Get the timer input clock frequency
  *
- * @dev: The Timer device
+ * @dev: The timer device
  * @return: the timer input clock frequency
  */
 unsigned long timer_get_rate(struct udevice *dev);
 
 /*
- * struct timer_ops - Driver model Timer operations
+ * struct timer_ops - Driver model timer operations
  *
- * The uclass interface is implemented by all Timer devices which use
+ * The uclass interface is implemented by all timer devices which use
  * driver model.
  */
 struct timer_ops {
        /*
         * Get the current timer count
         *
-        * @dev: The Timer device
-        * @count: pointer that returns the current timer count
+        * @dev: The timer device
+        * @count: pointer that returns the current 64-bit timer count
         * @return: 0 if OK, -ve on error
         */
-       int (*get_count)(struct udevice *dev, unsigned long *count);
+       int (*get_count)(struct udevice *dev, u64 *count);
 };
 
 /*