hakim giydan (hgiydan@marvell.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16692
-gerrit
commit 2f29d61103a1c6fcbbc3e2308135a0d182be8aaf Author: Hakim Giydan hgiydan@marvell.com Date: Wed Sep 21 15:50:39 2016 -0700
libpayload: mvmap2315: Introduce timer driver
Testing: booted successfully.
Change-Id: I4a50c9fb7aec929ea29a3cf2eec3e424e3629c92 Signed-off-by: Hakim Giydan hgiydan@marvell.com --- payloads/libpayload/drivers/Makefile.inc | 1 + payloads/libpayload/drivers/timer/Kconfig | 13 ++++++++ payloads/libpayload/drivers/timer/mvmap2315.c | 44 +++++++++++++++++++++++++++ 3 files changed, 58 insertions(+)
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index 75f08f2..899c5d2 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -57,6 +57,7 @@ libc-$(CONFIG_LP_TIMER_BG4CD) += timer/bg4cd.c libc-$(CONFIG_LP_TIMER_IMG_PISTACHIO) += timer/img_pistachio.c libc-$(CONFIG_LP_TIMER_CYGNUS) += timer/cygnus.c libc-$(CONFIG_LP_TIMER_ARMADA38X) += timer/armada38x.c +libc-$(CONFIG_LP_TIMER_MVMAP2315) += timer/mvmap2315.c
# Video console drivers libc-$(CONFIG_LP_VIDEO_CONSOLE) += video/video.c diff --git a/payloads/libpayload/drivers/timer/Kconfig b/payloads/libpayload/drivers/timer/Kconfig index 0b981b0..b3ab6ec 100644 --- a/payloads/libpayload/drivers/timer/Kconfig +++ b/payloads/libpayload/drivers/timer/Kconfig @@ -61,6 +61,9 @@ config TIMER_IMG_PISTACHIO config TIMER_MTK bool "Timer for MediaTek MT8173"
+config TIMER_MVMAP2315 + bool "Timer for Marvell MVMAP2315" + endchoice
config TIMER_MCT_HZ @@ -108,6 +111,16 @@ config ARMADA38X_TIMER_REG default 0xF1020314 depends on TIMER_ARMADA38X
+config MVMAP2315_TIMER_FREQ + int "Hardware timer frequency" + depends on TIMER_MVMAP2315 + default 1000000 + +config MVMAP2315_TIMER_REG + hex "Timer register address" + depends on TIMER_MVMAP2315 + default 0xE1020004 + config IPROC_PERIPH_GLB_TIM_REG_BASE hex "Cygnus timer base address" depends on TIMER_CYGNUS diff --git a/payloads/libpayload/drivers/timer/mvmap2315.c b/payloads/libpayload/drivers/timer/mvmap2315.c new file mode 100644 index 0000000..5b1f813 --- /dev/null +++ b/payloads/libpayload/drivers/timer/mvmap2315.c @@ -0,0 +1,44 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Marvell Inc. + * + * 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 <assert.h> +#include <libpayload.h> + +static u32 *reg = (void *)CONFIG_LP_MVMAP2315_TIMER_REG; + +uint64_t timer_hz(void) +{ + return CONFIG_LP_MVMAP2315_TIMER_FREQ; +} + +uint64_t timer_raw_value(void) +{ + /* invert count to change from down to up count */ + return ~readl(reg); +}
-
hakim giydan