Patch set updated for coreboot: 32d429e libpayload: ipq8064: Add rudimentary timer driver

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8002

-gerrit

commit 32d429ecbe4736c95a6242a09babe128db4f6fba
Author: Vadim Bendebury 
Date:   Wed May 21 16:28:57 2014 -0700

libpayload: ipq8064: Add rudimentary timer driver

This is still using the 32kHz timer coreboot uses. A finer granularity
    timer implementation for 806x is in the works.

BUG=chrome-os-partner:27784,chrome-os-partner:28880
    TEST=none yet.

Original-Change-Id: Iae206749000d45040090df48199c8d86d76bbae5
    Original-Signed-off-by: Vadim Bendebury 
    Original-Reviewed-on: https://chromium-review.googlesource.com/198021
    Original-Reviewed-by: Furquan Shaikh 
    (cherry picked from commit 8f49f752ab8f84b7c5dc189238732360e8d2aae2)
    Signed-off-by: Marc Jones

Change-Id: Ia150c974e5b66939de0b007cf7c1308c187f3289
---
 payloads/libpayload/Config.in               | 18 +++++++++++++
 payloads/libpayload/configs/defconfig-arm   |  3 ++-
 payloads/libpayload/drivers/Makefile.inc    |  1 +
 payloads/libpayload/drivers/timer/ipq806x.c | 41 +++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index bef0e05..3c5c342 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -354,6 +354,9 @@ config TIMER_MCT
 config TIMER_TEGRA_1US
    bool "Tegra 1us"

+config TIMER_IPQ806X
+	bool "Timer for ipq806x platforms"
+
 endchoice

config TIMER_MCT_HZ
@@ -371,6 +374,21 @@ config TIMER_TEGRA_1US_ADDRESS
    depends on TIMER_TEGRA_1US
    default 0x60005010

+config IPQ806X_TIMER_FREQ
+	int "Hardware timer frequency"
+	default 32000
+	depends on TIMER_IPQ806X
+	help
+	  IPQ hardware presently provides a single timer running at 32KHz, a
+	  finer granulariry timer is available but is not yet enabled.
+
+config IPQ806X_TIMER_REG
+	hex "Timer register address"
+	default 0x0200A008
+	depends on TIMER_IPQ806X
+	help
+	  Address of the register to read a free running timer value.
+
 config USB
    bool "USB Support"
    default n
diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm
index fe47d0c..83731bb 100644
--- a/payloads/libpayload/configs/defconfig-arm
+++ b/payloads/libpayload/configs/defconfig-arm
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # libpayload version: 0.2.0
-# Tue Dec 23 15:19:30 2014
+# Wed Dec 31 11:11:44 2014
 #

#
@@ -55,6 +55,7 @@ CONFIG_LP_STORAGE_ATAPI=y
 CONFIG_LP_TIMER_NONE=y
 # CONFIG_LP_TIMER_MCT is not set
 # CONFIG_LP_TIMER_TEGRA_1US is not set
+# CONFIG_LP_TIMER_IPQ806X is not set
 CONFIG_LP_USB=y
 CONFIG_LP_USB_OHCI=y
 CONFIG_LP_USB_EHCI=y
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index 7212389..d46bb11 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -48,6 +48,7 @@ libc-$(CONFIG_LP_NVRAM) += options.c
 libc-$(CONFIG_LP_TIMER_MCT) += timer/mct.c
 libc-$(CONFIG_LP_TIMER_RDTSC) += timer/rdtsc.c
 libc-$(CONFIG_LP_TIMER_TEGRA_1US) += timer/tegra_1us.c
+libc-$(CONFIG_LP_TIMER_IPQ806X) += timer/ipq806x.c

# Video console drivers
 libc-$(CONFIG_LP_VIDEO_CONSOLE) += video/video.c
diff --git a/payloads/libpayload/drivers/timer/ipq806x.c b/payloads/libpayload/drivers/timer/ipq806x.c
new file mode 100644
index 0000000..4edbf8e
--- /dev/null
+++ b/payloads/libpayload/drivers/timer/ipq806x.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the depthcharge project.
+ *
+ * Copyright (C) 2014 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <libpayload.h>
+
+uint64_t timer_hz(void)
+{
+	return CONFIG_LP_IPQ806X_TIMER_FREQ;
+}
+
+uint64_t timer_raw_value(void)
+{
+	return readl((void *)CONFIG_LP_IPQ806X_TIMER_REG);
+}
+