diff options
Diffstat (limited to 'src/soc/rockchip/rk3288')
| -rw-r--r-- | src/soc/rockchip/rk3288/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/monotonic_timer.c | 40 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/timer.c | 18 |
3 files changed, 17 insertions, 45 deletions
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc index 836f2a7bea..01ed81b5c9 100644 --- a/src/soc/rockchip/rk3288/Makefile.inc +++ b/src/soc/rockchip/rk3288/Makefile.inc @@ -25,7 +25,6 @@ ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) bootblock-$(CONFIG_DRIVERS_UART) += uart.c endif bootblock-y += timer.c -bootblock-y += monotonic_timer.c bootblock-y += clock.c bootblock-y += spi.c bootblock-y += media.c @@ -33,7 +32,6 @@ bootblock-y += gpio.c bootblock-y += i2c.c bootblock-y += rk808.c -verstage-y += monotonic_timer.c verstage-y += spi.c verstage-y += timer.c verstage-$(CONFIG_DRIVERS_UART) += uart.c @@ -44,7 +42,6 @@ verstage-y += media.c romstage-y += cbmem.c romstage-y += timer.c -romstage-y += monotonic_timer.c romstage-$(CONFIG_DRIVERS_UART) += uart.c romstage-y += i2c.c romstage-y += clock.c @@ -58,7 +55,6 @@ romstage-y += tsadc.c ramstage-y += soc.c ramstage-y += cbmem.c ramstage-y += timer.c -ramstage-y += monotonic_timer.c ramstage-y += i2c.c ramstage-y += clock.c ramstage-y += spi.c diff --git a/src/soc/rockchip/rk3288/monotonic_timer.c b/src/soc/rockchip/rk3288/monotonic_timer.c deleted file mode 100644 index 4062860465..0000000000 --- a/src/soc/rockchip/rk3288/monotonic_timer.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Rockchip Inc. - * - * 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; version 2 of the License. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <arch/io.h> -#include <soc/addressmap.h> -#include <soc/timer.h> -#include <stdint.h> -#include <timer.h> - -static uint64_t timer_raw_value(void) -{ - uint64_t value0; - uint64_t value1; - - value0 = (uint64_t)read32(&timer7_ptr->timer_curr_value0); - value1 = (uint64_t)read32(&timer7_ptr->timer_curr_value1); - value0 = value0 | value1<<32; - return value0; -} - -void timer_monotonic_get(struct mono_time *mt) -{ - mono_time_set_usecs(mt, timer_raw_value() / clocks_per_usec); -} diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c index 658f4d74f4..47f99c23fd 100644 --- a/src/soc/rockchip/rk3288/timer.c +++ b/src/soc/rockchip/rk3288/timer.c @@ -18,11 +18,27 @@ */ #include <arch/io.h> -#include <console/console.h> #include <delay.h> #include <soc/timer.h> +#include <stdint.h> #include <timer.h> +static uint64_t timer_raw_value(void) +{ + uint64_t value0; + uint64_t value1; + + value0 = (uint64_t)read32(&timer7_ptr->timer_curr_value0); + value1 = (uint64_t)read32(&timer7_ptr->timer_curr_value1); + value0 = value0 | value1<<32; + return value0; +} + +void timer_monotonic_get(struct mono_time *mt) +{ + mono_time_set_usecs(mt, timer_raw_value() / clocks_per_usec); +} + void rk3288_init_timer(void) { write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count0); |