These functions belong in time.h so move them over and add comments.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/cpu/armv7/ls102xa/timer.c | 1 + arch/arm/cpu/armv8/generic_timer.c | 1 + arch/arm/mach-imx/syscounter.c | 1 + arch/arm/mach-imx/timer.c | 1 + arch/m68k/lib/time.c | 1 + arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc8xxx/srio.c | 1 + arch/powerpc/lib/time.c | 1 + drivers/crypto/fsl/jr.c | 1 + drivers/i2c/fsl_i2c.c | 1 + include/common.h | 4 ---- include/time.h | 16 ++++++++++++++++ 12 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index e79360ada88..a5f4e31ac70 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -4,6 +4,7 @@ */
#include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index c1706dcec18..46e63294fef 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -6,6 +6,7 @@
#include <common.h> #include <command.h> +#include <time.h> #include <asm/system.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index c888a939385..5a292c39643 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -6,6 +6,7 @@ */
#include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index ed5eb1c8a77..5fe5c51f6a6 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -7,6 +7,7 @@ */
#include <common.h> +#include <time.h> #include <asm/io.h> #include <div64.h> #include <asm/arch/imx-regs.h> diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index a6345a0bc9c..c76c5fedc99 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -7,6 +7,7 @@ */
#include <common.h> +#include <time.h>
#include <asm/timer.h> #include <asm/immap.h> diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c index fcfa7302334..ebdcd29c13d 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c @@ -5,6 +5,7 @@
#include <common.h> #include <env.h> +#include <time.h> #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 #include <hwconfig.h> #endif diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c index ea7dac6e668..a1f94035596 100644 --- a/arch/powerpc/cpu/mpc8xxx/srio.c +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -5,6 +5,7 @@
#include <common.h> #include <config.h> +#include <time.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> #include <asm/fsl_srio.h> diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index a22a73abfa5..e1494fa1292 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -5,6 +5,7 @@ */
#include <common.h> +#include <time.h> #include <asm/io.h>
/* ------------------------------------------------------------------------- */ diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 31217623649..1ea9db6850f 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -11,6 +11,7 @@ #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" +#include <time.h> #ifdef CONFIG_FSL_CORENET #include <asm/fsl_pamu.h> #endif diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index bf8d52d5ad5..bbbd6ef5bfd 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> #include <i2c.h> /* Functional interface */ +#include <time.h> #include <asm/io.h> #include <asm/fsl_i2c.h> /* HW definitions */ #include <clk.h> diff --git a/include/common.h b/include/common.h index 1e77ed393e4..20d143deb81 100644 --- a/include/common.h +++ b/include/common.h @@ -288,10 +288,6 @@ int cleanup_before_linux_select(int flags); uint64_t get_ticks(void); void wait_ticks (unsigned long);
-/* arch/$(ARCH)/lib/time.c */ -ulong usec2ticks (unsigned long usec); -ulong ticks2usec (unsigned long ticks); - /* lib/uuid.c */ #include <uuid.h>
diff --git a/include/time.h b/include/time.h index 1e9b369be7c..5c6a0fd032c 100644 --- a/include/time.h +++ b/include/time.h @@ -69,4 +69,20 @@ uint64_t usec_to_tick(unsigned long usec); (time_after_eq(a,b) && \ time_before(a,c))
+/** + * usec2ticks() - Convert microseconds to internal ticks + * + * @usec: Value of microseconds to convert + * @return Corresponding internal ticks value, calculated using get_tbclk() + */ +ulong usec2ticks(unsigned long usec); + +/** + * ticks2usec() - Convert internal ticks to microseconds + * + * @ticks: Value of ticks to convert + * @return Corresponding microseconds value, calculated using get_tbclk() + */ +ulong ticks2usec(unsigned long ticks); + #endif /* _TIME_H */