From 846e63dfa8403178c46a099419d064c4ee385ab0 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Mon, 21 Mar 2016 02:19:03 +0100 Subject: [PATCH] Drop CFG_HZ_FALLBACK as we don't need it anymore, clean in time.c --- u-boot/include/configs/ap121.h | 1 - u-boot/include/configs/ap143.h | 1 - u-boot/include/configs/db12x.h | 1 - u-boot/lib_mips/time.c | 61 ++++++++++++---------------------- 4 files changed, 22 insertions(+), 42 deletions(-) diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index eb37e8c..f0d3eb3 100644 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -331,7 +331,6 @@ #define CFG_HZ bd->bi_cfg_hz #define CONFIG_QCA_PLL QCA_PLL_PRESET_400_400_200 -#define CFG_HZ_FALLBACK (400000000LU/2) /* diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index 92be783..cc7749d 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -137,7 +137,6 @@ #if defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ defined(CONFIG_FOR_TPLINK_WR841N_V9) #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200 - #define CFG_HZ_FALLBACK (550000000LU/2) #endif /* diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h index 5b9b2b1..0d6cb27 100644 --- a/u-boot/include/configs/db12x.h +++ b/u-boot/include/configs/db12x.h @@ -129,7 +129,6 @@ /* For now, use some safe clocks for all AR934x */ #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200 -#define CFG_HZ_FALLBACK (550000000LU/2) /* diff --git a/u-boot/lib_mips/time.c b/u-boot/lib_mips/time.c index 709d385..2da1e9e 100644 --- a/u-boot/lib_mips/time.c +++ b/u-boot/lib_mips/time.c @@ -1,74 +1,57 @@ /* - * (C) Copyright 2003 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * Copyright (C) 2015 Piotr Dymacz + * Copyright (C) 2003 Wolfgang Denk, DENX Software Engineering, * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier:GPL-2.0 */ #include DECLARE_GLOBAL_DATA_PTR; -static inline void mips_compare_set(u32 v){ +static inline void mips_compare_set(u32 v) +{ asm volatile ("mtc0 %0, $11" : : "r" (v)); } -static inline void mips_count_set(u32 v){ +static inline void mips_count_set(u32 v) +{ asm volatile ("mtc0 %0, $9" : : "r" (v)); } -static inline u32 mips_count_get(void){ +static inline u32 mips_count_get(void) +{ u32 count; asm volatile ("mfc0 %0, $9" : "=r" (count) :); - return(count); + + return count; } /* - * timer without interrupts + * Timer without interrupts */ -int timer_init(void){ +int timer_init(void) +{ mips_compare_set(0); mips_count_set(0); - return(0); + return 0; } -ulong get_timer(ulong base){ - return(mips_count_get() - base); +ulong get_timer(ulong base) +{ + return mips_count_get() - base; } -void udelay(unsigned long usec){ +void udelay(unsigned long usec) +{ ulong tmo; ulong start = get_timer(0); bd_t *bd = gd->bd; - /* - * We don't have filled the bd->bi_cfg_hz - * before relocation to RAM (bd is read only before that), - */ - if((gd->flags & GD_FLG_RELOC) == 0){ - tmo = usec * (CFG_HZ_FALLBACK / 1000000); - } else { - tmo = usec * (CFG_HZ / 1000000); - } + tmo = usec * (CFG_HZ / 1000000); while ((ulong)((mips_count_get() - start)) < tmo) - /*NOP*/; + /* NOP */; } -- 2.25.1