From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ns.km20343-01.keymachine.de ([84.19.182.79] helo=km20343-01.keymachine.de) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UBMBE-0001vn-Je for barebox@lists.infradead.org; Fri, 01 Mar 2013 09:23:11 +0000 Received: from antimon.pengutronix.de (port-212-202-120-50.static.qsc.de [212.202.120.50]) by km20343-01.keymachine.de (Postfix) with ESMTPA id 71F9D7D44B5 for ; Fri, 1 Mar 2013 10:23:00 +0100 (CET) From: Lucas Stach Date: Fri, 1 Mar 2013 10:22:52 +0100 Message-Id: <1362129773-4579-7-git-send-email-dev@lynxeye.de> In-Reply-To: <1362129773-4579-1-git-send-email-dev@lynxeye.de> References: <1362129773-4579-1-git-send-email-dev@lynxeye.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 6/7] tegra: add proper timer driver To: barebox@lists.infradead.org Replace the ad-hoc clocksource implementation with a proper driver for the Tegra 20 timer. This driver is able to do the required hardware initialisation itself. Signed-off-by: Lucas Stach --- arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/clock.c | 56 ----------------- arch/arm/mach-tegra/tegra20-car.c | 6 ++ arch/arm/mach-tegra/tegra20-timer.c | 117 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-tegra/tegra20.c | 4 ++ 5 files changed, 128 insertions(+), 57 deletions(-) delete mode 100644 arch/arm/mach-tegra/clock.c create mode 100644 arch/arm/mach-tegra/tegra20-timer.c diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 3391528..6aa219c 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,4 +1,4 @@ -obj-y += clock.o obj-y += reset.o obj-y += tegra20.o obj-y += tegra20-car.o +obj-y += tegra20-timer.o diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c deleted file mode 100644 index 8a7525d..0000000 --- a/arch/arm/mach-tegra/clock.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2011 Antony Pavlov - * - * This file is part of barebox. - * See file CREDITS for list of people who contributed to this project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * 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. - * - */ - -/** - * @file - * @brief Clocksource based on Tegra internal timer - */ - -#include -#include -#include -#include -#include -#include -#include - -static void __iomem *timer_reg_base = (void __iomem *) (TEGRA_TMR1_BASE); - -#define timer_writel(value, reg) \ - __raw_writel(value, (u32)timer_reg_base + (reg)) -#define timer_readl(reg) \ - __raw_readl((u32)timer_reg_base + (reg)) - -static uint64_t tegra_clocksource_read(void) -{ - return timer_readl(0x10); -} - -static struct clocksource cs = { - .read = tegra_clocksource_read, - .mask = 0xffffffff, -}; - -/* FIXME: here we have no initialization. All initialization made by U-Boot */ -static int clocksource_init(void) -{ - cs.mult = clocksource_hz2mult(1000000, cs.shift); - init_clock(&cs); - - return 0; -} -core_initcall(clocksource_init); diff --git a/arch/arm/mach-tegra/tegra20-car.c b/arch/arm/mach-tegra/tegra20-car.c index 95b3051..89fa424 100644 --- a/arch/arm/mach-tegra/tegra20-car.c +++ b/arch/arm/mach-tegra/tegra20-car.c @@ -24,7 +24,9 @@ #include #include #include +#include #include +#include /* Register definitions */ #define OSC_CTRL 0x50 @@ -93,6 +95,10 @@ static int tegra20_car_probe(struct device_d *dev) /* timer is a gate, but as it's enabled by BOOTROM we needn't worry */ clks[timer] = clk_fixed_factor("timer", "clk_m", 1, 1); + + /* device to clock links */ + clkdev_add_physbase(clks[timer], TEGRA_TMR1_BASE, NULL); + return 0; } diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c new file mode 100644 index 0000000..62af5d2 --- /dev/null +++ b/arch/arm/mach-tegra/tegra20-timer.c @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2013 Lucas Stach + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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, see . + */ + +/** + * @file + * @brief Device driver for the Tegra 20 timer, which exposes a clocksource. + */ + +#include +#include +#include +#include +#include + +/* register definitions */ +#define TIMERUS_CNTR_1US 0x10 +#define TIMERUS_USEC_CFG 0x14 + +static void __iomem *timer_base; + +static uint64_t tegra20_timer_cs_read(void) +{ + return readl(timer_base + TIMERUS_CNTR_1US); +} + +static struct clocksource cs = { + .read = tegra20_timer_cs_read, + .mask = CLOCKSOURCE_MASK(32), + .mult = 1000, +}; + +static int tegra20_timer_probe(struct device_d *dev) +{ + struct clk *timer_clk; + unsigned long rate; + + /* use only one timer */ + if (timer_base) + return -EBUSY; + + timer_base = dev_request_mem_region(dev, 0); + if (!timer_base) { + dev_err(dev, "could not get memory region\n"); + return -ENODEV; + } + + timer_clk = clk_get(dev, NULL); + if (!timer_clk) { + dev_err(dev, "could not get clock\n"); + return -ENODEV; + } + + clk_enable(timer_clk); + + /* + * calibrate timer to run at 1MHz + * TIMERUS_USEC_CFG selects the scale down factor with bits [0:7] + * representing the divisor and bits [8:15] representing the dividend + * each in n+1 form. + */ + rate = clk_get_rate(timer_clk); + switch (rate) { + case 12000000: + writel(0x000b, timer_base + TIMERUS_USEC_CFG); + break; + case 13000000: + writel(0x000c, timer_base + TIMERUS_USEC_CFG); + break; + case 19200000: + writel(0x045f, timer_base + TIMERUS_USEC_CFG); + break; + case 26000000: + writel(0x0019, timer_base + TIMERUS_USEC_CFG); + break; + default: + dev_warn(dev, "unknown timer clock rate\n"); + break; + } + + init_clock(&cs); + + return 0; +} + +static __maybe_unused struct of_device_id tegra20_timer_dt_ids[] = { + { + .compatible = "nvidia,tegra20-timer", + }, { + /* sentinel */ + } +}; + +static struct driver_d tegra20_timer_driver = { + .probe = tegra20_timer_probe, + .name = "tegra20-timer", + .of_compatible = DRV_OF_COMPAT(tegra20_timer_dt_ids), +}; + +static int tegra20_timer_init(void) +{ + return platform_driver_register(&tegra20_timer_driver); +} + +coredevice_initcall(tegra20_timer_init); diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c index 08c6758..eccc7b8 100644 --- a/arch/arm/mach-tegra/tegra20.c +++ b/arch/arm/mach-tegra/tegra20.c @@ -24,6 +24,10 @@ static int tegra20_init(void) TEGRA_CLK_RESET_BASE, TEGRA_CLK_RESET_SIZE, IORESOURCE_MEM, NULL); + add_generic_device("tegra20-timer", DEVICE_ID_SINGLE, NULL, + TEGRA_TMR1_BASE, TEGRA_TMR1_SIZE, + IORESOURCE_MEM, NULL); + return 0; } -- 1.8.1.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox