From patchwork Wed Jun 26 14:53:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 2785881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B294C0AB1 for ; Wed, 26 Jun 2013 14:57:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFE0820584 for ; Wed, 26 Jun 2013 14:57:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96D8A20583 for ; Wed, 26 Jun 2013 14:57:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urr8Z-0007b5-61; Wed, 26 Jun 2013 14:56:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urr7h-0000dc-Fi; Wed, 26 Jun 2013 14:55:05 +0000 Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urr6c-0000WM-K7 for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2013 14:54:05 +0000 Received: by mail-la0-f47.google.com with SMTP id fe20so13855710lab.20 for ; Wed, 26 Jun 2013 07:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=4y4LOPNx3KBUanCO9qOQjcNg1CV7FpfvJwbrnhuta60=; b=c53gN63WSzq/qYQicQjvC+ytFBFPTQvse56nkOdKkV+z80mNEk+wIzzDwzjX1Uad8c bcEYxxMSJNWbcedC8+h3Uj8BfJad1pFBZB2ruJ4Pd6fBl+cMUiQZGvQ6QU5pc6smrFdK tx2/nmSteC7tjR39nVQNuBmP9KfUI+OcC17uJpa3zc07wdyFaTeAMnge2ATVQVErBNSS FRp4nI4zOWedwvaXi5BYA5hPuMVEddBZ6zTBi5Tz99jIfYWK9a8bcGyxltOvRV6+X9gO ex6fHDoQT9JHy8lBvbFBmuATybfJAqZFQVFvdD+RXtFZiQkjjBTTH2BmGHZ9oM0zWO/G bxSQ== X-Received: by 10.152.6.169 with SMTP id c9mr2091920laa.47.1372258415315; Wed, 26 Jun 2013 07:53:35 -0700 (PDT) Received: from localhost.localdomain (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id e9sm10707826lbj.3.2013.06.26.07.53.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 07:53:34 -0700 (PDT) From: Jonas Jensen To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: clocksource: add support for MOXA ART SoCs Date: Wed, 26 Jun 2013 16:53:03 +0200 Message-Id: <1372258383-24524-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1371549604-7201-1-git-send-email-jonas.jensen@gmail.com> References: <1371549604-7201-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130626_105359_511814_85F86F32 X-CRM114-Status: GOOD ( 21.06 ) X-Spam-Score: -2.0 (--) Cc: thomas.petazzoni@free-electrons.com, arnd@arndb.de, linus.walleij@linaro.org, tomasz.figa@gmail.com, linux-kernel@vger.kernel.org, arm@kernel.org, john.stultz@linaro.org, u.kleine-koenig@pengutronix.de, tglx@linutronix.de, Jonas Jensen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds an clocksource driver for the main timer(s) found on MOXA ART SoCs. Changes since v2: 1. use clocksource/clockevents infrastructures 2. clock frequency read from system clock Applies to next-20130619 Signed-off-by: Jonas Jensen --- drivers/clocksource/Makefile | 1 + drivers/clocksource/moxart_timer.c | 184 ++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 drivers/clocksource/moxart_timer.c diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 8d979c7..c93e1a8 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -29,3 +29,4 @@ obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o +obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c new file mode 100644 index 0000000..376df31 --- /dev/null +++ b/drivers/clocksource/moxart_timer.c @@ -0,0 +1,184 @@ +/* + * MOXA ART SoCs timer handling. + * + * Copyright (C) 2013 Jonas Jensen + * + * Jonas Jensen + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MAX_TIMER 2 +#define USED_TIMER 1 +#define APB_CLK 48000000 + +/* note: timer count is writable */ + +#define TIMER1_COUNT 0x0 +#define TIMER1_LOAD 0x4 +#define TIMER1_MATCH1 0x8 +#define TIMER1_MATCH2 0xC + +#define TIMER2_COUNT 0x10 +#define TIMER2_LOAD 0x14 +#define TIMER2_MATCH1 0x18 +#define TIMER2_MATCH2 0x1C + +#define TIMER3_COUNT 0x20 +#define TIMER3_LOAD 0x24 +#define TIMER3_MATCH1 0x28 +#define TIMER3_MATCH2 0x2C + +#define TIMER_CR 0x30 +#define TIMER_INTR_STATE 0x34 +#define TIMER_INTR_MASK 0x38 + +/* TIMER_CR flags: + TIMEREG_CR_1_CLOCK 0: PCLK, 1: EXT1CLK + TIMEREG_CR_1_INT over flow interrupt enable bit */ + +#define TIMEREG_CR_1_ENABLE (1 << 0) +#define TIMEREG_CR_1_CLOCK (1 << 1) +#define TIMEREG_CR_1_INT (1 << 2) +#define TIMEREG_CR_2_ENABLE (1 << 3) +#define TIMEREG_CR_2_CLOCK (1 << 4) +#define TIMEREG_CR_2_INT (1 << 5) +#define TIMEREG_CR_3_ENABLE (1 << 6) +#define TIMEREG_CR_3_CLOCK (1 << 7) +#define TIMEREG_CR_3_INT (1 << 8) +#define TIMEREG_CR_COUNT_UP (1 << 9) +#define TIMEREG_CR_COUNT_DOWN (0 << 9) + +static void __iomem *timer_base; +static unsigned int clock_frequency; + +static void moxart_clkevt_mode(enum clock_event_mode mode, + struct clock_event_device *clk) +{ + u32 u = readl(timer_base + TIMER_CR); + + switch (mode) { + case CLOCK_EVT_MODE_RESUME: + case CLOCK_EVT_MODE_ONESHOT: + u |= TIMEREG_CR_1_ENABLE; + writel(u, timer_base + TIMER_CR); + writel(~0, timer_base + TIMER1_LOAD); + pr_debug("%s: CLOCK_EVT_MODE_ONESHOT\n", __func__); + break; + case CLOCK_EVT_MODE_PERIODIC: + u |= TIMEREG_CR_1_ENABLE; + writel(u, timer_base + TIMER_CR); + writel(clock_frequency / HZ, timer_base + TIMER1_LOAD); + pr_debug("%s: CLOCK_EVT_MODE_PERIODIC\n", __func__); + break; + case CLOCK_EVT_MODE_UNUSED: + case CLOCK_EVT_MODE_SHUTDOWN: + default: + u &= ~TIMEREG_CR_1_ENABLE; + writel(u, timer_base + TIMER_CR); + break; + } +} + +static int moxart_clkevt_next_event(unsigned long cycles, + struct clock_event_device *unused) +{ + u32 alarm = readl(timer_base + TIMER1_COUNT) - cycles; + writel(alarm, timer_base + TIMER1_MATCH1); + return 0; +} + +static struct clock_event_device moxart_clockevent = { + .name = "moxart_timer", + .rating = 300, + .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, + .set_mode = moxart_clkevt_mode, + .set_next_event = moxart_clkevt_next_event, +}; + +static irqreturn_t moxart_timer_interrupt(int irq, void *dev_id) +{ + struct clock_event_device *evt = (struct clock_event_device *)dev_id; + evt->event_handler(evt); + return IRQ_HANDLED; +} + +static struct irqaction moxart_timer_irq = { + .name = "moxart-timer", + .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .handler = moxart_timer_interrupt, + .dev_id = &moxart_clockevent, +}; + +static void __init moxart_timer_init(struct device_node *node) +{ + int ret, irq; + struct clk *clk; + + timer_base = of_iomap(node, 0); + if (!timer_base) + panic("%s: failed to map base\n", node->full_name); + + irq = irq_of_parse_and_map(node, 0); + if (irq <= 0) + panic("%s: can't parse IRQ\n", node->full_name); + + ret = setup_irq(irq, &moxart_timer_irq); + if (ret) { + pr_err("%s: failed to setup IRQ %d\n", node->full_name, irq); + return; + } + + clock_frequency = APB_CLK; + /* it might be a good idea to have a default other than 0 for + clock_frequency, should any attempt at getting a valid + frequency fail, not that i see how it could, it probably could.. + having it APB_CLK can certainly be wrong on some hardware, + why it is set again with the DT specific property: */ + + ret = of_property_read_u32(node, "clock-frequency", &clock_frequency); + if (ret) + pr_err("%s: can't read clock-frequency DT property\n", + node->full_name); + + clk = of_clk_get(node, 0); + if (IS_ERR(clk)) + pr_err("%s: of_clk_get failed\n", __func__); + else { + clock_frequency = clk_get_rate(clk); + pr_debug("%s: clk_get_rate=%u success\n", __func__, + clock_frequency); + } + + writel(~0, timer_base + TIMER2_LOAD); + + writel(TIMEREG_CR_1_ENABLE | TIMEREG_CR_2_ENABLE | + TIMEREG_CR_COUNT_DOWN, timer_base + TIMER_CR); + + if (clocksource_mmio_init(timer_base + TIMER2_COUNT, "moxart_timer", + clock_frequency, 200, 32, clocksource_mmio_readl_down)) + pr_err("%s: clocksource_mmio_init failed\n", __func__); + + moxart_clockevent.cpumask = cpumask_of(0); + + clockevents_config_and_register(&moxart_clockevent, clock_frequency, + 0x4, 0xf0000000); + + pr_info("%s: %s finished clock_frequency=%d HZ=%d IRQ=%d\n", + node->full_name, __func__, clock_frequency, HZ, irq); +} +CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init); +