diff options
Diffstat (limited to 'src/soc/samsung')
| -rw-r--r-- | src/soc/samsung/exynos5250/bootblock.c | 5 | ||||
| -rw-r--r-- | src/soc/samsung/exynos5250/include/soc/clk.h | 3 | ||||
| -rw-r--r-- | src/soc/samsung/exynos5250/timer.c | 5 | ||||
| -rw-r--r-- | src/soc/samsung/exynos5420/bootblock.c | 5 | ||||
| -rw-r--r-- | src/soc/samsung/exynos5420/include/soc/clk.h | 3 | ||||
| -rw-r--r-- | src/soc/samsung/exynos5420/timer.c | 5 |
6 files changed, 6 insertions, 20 deletions
diff --git a/src/soc/samsung/exynos5250/bootblock.c b/src/soc/samsung/exynos5250/bootblock.c index dd0e01c87c..5154c5b3c8 100644 --- a/src/soc/samsung/exynos5250/bootblock.c +++ b/src/soc/samsung/exynos5250/bootblock.c @@ -23,11 +23,6 @@ void bootblock_soc_init(void) { - /* kick off the multi-core timer. - * We want to do this as early as we can. - */ - mct_start(); - if (get_wakeup_state() == WAKEUP_DIRECT) { wakeup(); /* Never returns. */ diff --git a/src/soc/samsung/exynos5250/include/soc/clk.h b/src/soc/samsung/exynos5250/include/soc/clk.h index cefd37ad45..54b06a7483 100644 --- a/src/soc/samsung/exynos5250/include/soc/clk.h +++ b/src/soc/samsung/exynos5250/include/soc/clk.h @@ -589,9 +589,6 @@ int clock_set_rate(enum periph_id periph_id, unsigned int rate); /* Clock gate unused IP */ void clock_gate(void); -void mct_start(void); -uint64_t mct_raw_value(void); - /* These are the ratio's for configuring ARM clock */ struct arm_clk_ratios { unsigned int arm_freq_mhz; /* Frequency of ARM core in MHz */ diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c index 0947d19d63..1e25771dbd 100644 --- a/src/soc/samsung/exynos5250/timer.c +++ b/src/soc/samsung/exynos5250/timer.c @@ -18,13 +18,14 @@ */ #include <arch/io.h> +#include <delay.h> #include <soc/clk.h> #include <stdint.h> #include <timer.h> static const uint32_t clocks_per_usec = MCT_HZ/1000000; -uint64_t mct_raw_value(void) +static uint64_t mct_raw_value(void) { uint64_t upper = readl(&exynos_mct->g_cnt_u); uint64_t lower = readl(&exynos_mct->g_cnt_l); @@ -32,7 +33,7 @@ uint64_t mct_raw_value(void) return (upper << 32) | lower; } -void mct_start(void) +void init_timer(void) { writel(readl(&exynos_mct->g_tcon) | (0x1 << 8), &exynos_mct->g_tcon); diff --git a/src/soc/samsung/exynos5420/bootblock.c b/src/soc/samsung/exynos5420/bootblock.c index f347677b94..59bc169204 100644 --- a/src/soc/samsung/exynos5420/bootblock.c +++ b/src/soc/samsung/exynos5420/bootblock.c @@ -30,11 +30,6 @@ void bootblock_soc_init(void) { - /* kick off the multi-core timer. - * We want to do this as early as we can. - */ - mct_start(); - if (get_wakeup_state() == WAKEUP_DIRECT) { wakeup(); /* Never returns. */ diff --git a/src/soc/samsung/exynos5420/include/soc/clk.h b/src/soc/samsung/exynos5420/include/soc/clk.h index ca1d721f85..1677a9c18c 100644 --- a/src/soc/samsung/exynos5420/include/soc/clk.h +++ b/src/soc/samsung/exynos5420/include/soc/clk.h @@ -725,9 +725,6 @@ int clock_set_rate(enum periph_id periph_id, unsigned int rate); /* Clock gate unused IP */ void clock_gate(void); -void mct_start(void); -uint64_t mct_raw_value(void); - /* These are the ratio's for configuring ARM clock */ struct arm_clk_ratios { unsigned int arm_freq_mhz; /* Frequency of ARM core in MHz */ diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c index 0947d19d63..1e25771dbd 100644 --- a/src/soc/samsung/exynos5420/timer.c +++ b/src/soc/samsung/exynos5420/timer.c @@ -18,13 +18,14 @@ */ #include <arch/io.h> +#include <delay.h> #include <soc/clk.h> #include <stdint.h> #include <timer.h> static const uint32_t clocks_per_usec = MCT_HZ/1000000; -uint64_t mct_raw_value(void) +static uint64_t mct_raw_value(void) { uint64_t upper = readl(&exynos_mct->g_cnt_u); uint64_t lower = readl(&exynos_mct->g_cnt_l); @@ -32,7 +33,7 @@ uint64_t mct_raw_value(void) return (upper << 32) | lower; } -void mct_start(void) +void init_timer(void) { writel(readl(&exynos_mct->g_tcon) | (0x1 << 8), &exynos_mct->g_tcon); |