rk3288/exynos5250/exynos5420: Consolidate timer files

Some boards spread their timer implementation out in multiple files with
one function each for no discernable reason. Let's clean that up to make
things a little simpler to find.

BRANCH=None
BUG=None
TEST=Booted Pinky, compiled Daisy and Pit.

Change-Id: I43d29cd1b4a1d89cfd40f6cba5ca99ada3b00f82
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/234061
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/soc/rockchip/rk3288/Makefile.inc

@@ -25,7 +25,6 @@ ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)
 bootblock-$(CONFIG_CONSOLE_SERIAL_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_CONSOLE_SERIAL_UART) += uart.c
@@ -43,13 +41,10 @@ verstage-y += i2c.c
 verstage-y += media.c
 
 romstage-y += cbmem.c
-romstage-y += timer.c
-romstage-y += monotonic_timer.c
 ifeq ($(CONFIG_EARLY_CONSOLE),y)
 romstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c
 endif
 romstage-y += timer.c
-romstage-y += monotonic_timer.c
 romstage-y += i2c.c
 romstage-y += clock.c
 romstage-y += gpio.c
@@ -63,7 +58,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

src/soc/rockchip/rk3288/monotonic_timer.c

@@ -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);
-}

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);

src/soc/samsung/exynos5250/Makefile.inc

@@ -1,10 +1,9 @@
 bootblock-y += spi.c alternate_cbfs.c
 bootblock-y += bootblock.c
-bootblock-y += pinmux.c mct.c power.c
+bootblock-y += pinmux.c timer.c power.c
 # Clock is required for UART
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock_init.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += monotonic_timer.c
 ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
 endif
@@ -18,8 +17,7 @@ romstage-y += pinmux.c  # required by s3c24x0_i2c and uart.
 romstage-y += dmc_common.c
 romstage-y += dmc_init_ddr3.c
 romstage-y += power.c
-romstage-y += mct.c
-romstage-y += monotonic_timer.c
+romstage-y += timer.c
 ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
 romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
 endif
@@ -38,8 +36,7 @@ ramstage-y += power.c
 ramstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c
 ramstage-y += cpu.c
 ramstage-y += tmu.c
-ramstage-y += mct.c
-ramstage-y += monotonic_timer.c
+ramstage-y += timer.c
 ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp-reg.c

src/soc/samsung/exynos5250/mct.c

@@ -1,36 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2012 Google 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/clk.h>
-#include <stdint.h>
-
-uint64_t mct_raw_value(void)
-{
-	uint64_t upper = readl(&exynos_mct->g_cnt_u);
-	uint64_t lower = readl(&exynos_mct->g_cnt_l);
-
-	return (upper << 32) | lower;
-}
-
-void mct_start(void)
-{
-	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
-		&exynos_mct->g_tcon);
-}

src/soc/samsung/exynos5250/timer.c

@@ -17,12 +17,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.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)
+{
+	uint64_t upper = readl(&exynos_mct->g_cnt_u);
+	uint64_t lower = readl(&exynos_mct->g_cnt_l);
+
+	return (upper << 32) | lower;
+}
+
+void mct_start(void)
+{
+	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
+		&exynos_mct->g_tcon);
+}
+
 void timer_monotonic_get(struct mono_time *mt)
 {
 	/* We don't have to call mct_start() here

src/soc/samsung/exynos5420/Makefile.inc

@@ -1,10 +1,9 @@
 bootblock-y += spi.c alternate_cbfs.c
 bootblock-y += bootblock.c
-bootblock-y += pinmux.c mct.c power.c
+bootblock-y += pinmux.c timer.c power.c
 # Clock is required for UART
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock_init.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += monotonic_timer.c
 ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
 endif
@@ -19,8 +18,7 @@ romstage-y += pinmux.c  # required by s3c24x0_i2c and uart.
 romstage-y += dmc_common.c
 romstage-y += dmc_init_ddr3.c
 romstage-y += power.c
-romstage-y += mct.c
-romstage-y += monotonic_timer.c
+romstage-y += timer.c
 ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
 romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
 endif
@@ -39,19 +37,16 @@ ramstage-y += power.c
 ramstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c
 ramstage-y += cpu.c
 ramstage-y += tmu.c
-ramstage-y += mct.c
-ramstage-y += monotonic_timer.c
+ramstage-y += timer.c
 ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp.c dp_lowlevel.c fimd.c
 ramstage-y += usb.c
 ramstage-y += cbmem.c
 
-rmodules_$(ARCH-ROMSTAGE-y)-y += monotonic_timer.c
-rmodules_$(ARCH-ROMSTAGE-y)-y += mct.c
+rmodules_$(ARCH-ROMSTAGE-y)-y += timer.c
 
-VBOOT_STUB_DEPS += $(obj)/soc/samsung/exynos5420/monotonic_timer.rmodules_$(ARCH-ROMSTAGE-y).o
-VBOOT_STUB_DEPS += $(obj)/soc/samsung/exynos5420/mct.rmodules_$(ARCH-ROMSTAGE-y).o
+VBOOT_STUB_DEPS += $(obj)/soc/samsung/exynos5420/timer.rmodules_$(ARCH-ROMSTAGE-y).o
 
 INCLUDES += -Isrc/soc/samsung/exynos5420/include/
 

src/soc/samsung/exynos5420/mct.c

@@ -1,36 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2012 Google 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/clk.h>
-#include <stdint.h>
-
-uint64_t mct_raw_value(void)
-{
-	uint64_t upper = readl(&exynos_mct->g_cnt_u);
-	uint64_t lower = readl(&exynos_mct->g_cnt_l);
-
-	return (upper << 32) | lower;
-}
-
-void mct_start(void)
-{
-	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
-		&exynos_mct->g_tcon);
-}

src/soc/samsung/exynos5420/timer.c

@@ -17,12 +17,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.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)
+{
+	uint64_t upper = readl(&exynos_mct->g_cnt_u);
+	uint64_t lower = readl(&exynos_mct->g_cnt_l);
+
+	return (upper << 32) | lower;
+}
+
+void mct_start(void)
+{
+	writel(readl(&exynos_mct->g_tcon) | (0x1 << 8),
+		&exynos_mct->g_tcon);
+}
+
 void timer_monotonic_get(struct mono_time *mt)
 {
 	/* We don't have to call mct_start() here