From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7222C43387 for ; Fri, 11 Jan 2019 17:23:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CDDE20652 for ; Fri, 11 Jan 2019 17:23:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZXaLhLdL"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="bR3HvUbw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CDDE20652 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/4P4yprnKSHZg+NPqPHQ83RrRBhn/bYyzwzIcdbxg0c=; b=ZXaLhLdLOf7L67 Z8QiPgIh5SY6EpQU4mt2foqIqqKEb+Q8hsQ7HN+OFRf1xYK4jsVOkyl1FjZEEHi4mMBSsPFzfa07/ PDzjfkqbnjavjZIL/Del/FsMzYhp/ivPFx2Kl733rVDHBXNcHpvuYciT5W/vvFioz6BvN/rRr1H1M j0n5zKkwUU374P3nYKRBbJuEm8pCPOVLhKI1gqrdB4u7FONNt8qxOc1f/3ac48gCKpntwWgG6wQBm 9iZyReWmM4TrqE9lTTJbsehVPaSLxSwVAVRctZDyAfBkBLpfP9pPRPgvlaEMMeQr9drtTi0IVzpbZ +HXetea5mCv45Aq+Izmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gi0Wr-00022M-AQ; Fri, 11 Jan 2019 17:23:33 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gi0VQ-0000Ss-Bx for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2019 17:22:10 +0000 Received: by mail-wm1-x342.google.com with SMTP id p6so3118092wmc.1 for ; Fri, 11 Jan 2019 09:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lKz95RPwvt2A/xPxVUtkplb+bX/m8U+Ej4ZHCejgW/g=; b=bR3HvUbw1A9FSWsGkazEtBy0Z/4OV/WnUOmskjXcGhacgJPbOXAzo+lxNsrDFmU8px sOf60AWKlYUTfwbZ37YkbObGUXXg2IPOkO5PgXjZaZLfuKC8FWNGa91F2nDbPJponva0 ptcADkszquHBZCOGlDZlHh4ih/I6DGmDC93fYv9Y9T4+HVn7OS/i1VjjfuuERhycpZrs 3A1FaD8KW8W9j4yZKH3E8xWAhZKBEspRGTfV97+I1H9VkgZ7R+UzAjqqHKkDUwOT6s8l gO1znEOQGpZbPb4xxUbPPlG3oK4AKA2kIwwEM4a+VU2J+nsYyWoWPFWaBRwNWqjcMEDe z16A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lKz95RPwvt2A/xPxVUtkplb+bX/m8U+Ej4ZHCejgW/g=; b=DbwmLu9DpqyEb/WpOa5klxA99Wfq4Jg3UqSFwgqTnVnf3gU6wU/+htBh6Ssl4qdU7z uyWezrEeSvS5wZEeIHcPZ8dY+MZSwU0k7v+DRCUl2KWE0xMehZONXhMC3wqKXtQF6fM8 lrXKlRfX18ikfnXQEpZH+ZgMP06OWAnT1BCF/Ri3PGKScFzR7pCf8nAK6f6E9E6rXP5Y 2y4AaK1fNsCM8P+KjgIzVq/za6VQSplfmQWcBUnXORz+iPdBSbA1NT1FIxjWWPJG4zjP vmjseA0uEs/fGmgYEwAKxi05pIHDU3zHD7C5KBwh2eRUvbSuSvCV4qZtESqCp6y7YAM2 0dig== X-Gm-Message-State: AJcUukf/0FGnYXXgbk0Mu5rAp1Ca1TMeARYhH2L28JFnLM24Ztxoo7v5 xkVlEBYQ8IRGBsrK+3RxbCkA9A== X-Google-Smtp-Source: ALg8bN5YHnef8R1zm0Hvr114J04J+D9r9t7XMpRiqcgwILuZ6dplkgz147VYMi7k29o6nyK9G4go4A== X-Received: by 2002:a1c:f605:: with SMTP id w5mr3206561wmc.116.1547227322452; Fri, 11 Jan 2019 09:22:02 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id o16sm78534408wrn.11.2019.01.11.09.22.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 09:22:01 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Rob Herring , Mark Rutland , Thomas Gleixner Subject: [PATCH 10/17] ARM: davinci: da850: switch to using the clocksource driver Date: Fri, 11 Jan 2019 18:21:27 +0100 Message-Id: <20190111172134.30147-11-brgl@bgdev.pl> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190111172134.30147-1-brgl@bgdev.pl> References: <20190111172134.30147-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190111_092205_201701_563B231D X-CRM114-Status: GOOD ( 14.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski We now have a proper clocksource driver for davinci. Switch the platform to using it. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da850.c | 56 ++++++++++++++--------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 9ff377f26c4b..e5b855103193 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -34,7 +34,8 @@ #include #include #include -#include + +#include #include "mux.h" @@ -436,38 +437,24 @@ static struct davinci_id da850_ids[] = { }, }; -static struct davinci_timer_instance da850_timer_instance[4] = { - { - .base = DA8XX_TIMER64P0_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_0, - .top_irq = IRQ_DA8XX_TINT34_0, - }, - { - .base = DA8XX_TIMER64P1_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_1, - .top_irq = IRQ_DA8XX_TINT34_1, - }, - { - .base = DA850_TIMER64P2_BASE, - .bottom_irq = IRQ_DA850_TINT12_2, - .top_irq = IRQ_DA850_TINT34_2, - }, - { - .base = DA850_TIMER64P3_BASE, - .bottom_irq = IRQ_DA850_TINT12_3, - .top_irq = IRQ_DA850_TINT34_3, +static const struct davinci_timer_cfg da850_timer_cfg = { + .reg = { + .start = DA8XX_TIMER64P0_BASE, + .end = DA8XX_TIMER64P0_BASE + SZ_4K, + .flags = IORESOURCE_MEM, }, -}; - -/* - * T0_BOT: Timer 0, bottom : Used for clock_event - * T0_TOP: Timer 0, top : Used for clocksource - * T1_BOT, T1_TOP: Timer 1, bottom & top: Used for watchdog timer - */ -static struct davinci_timer_info da850_timer_info = { - .timers = da850_timer_instance, - .clockevent_id = T0_BOT, - .clocksource_id = T0_TOP, + .irq = { + { + .start = IRQ_DA8XX_TINT12_0, + .end = IRQ_DA8XX_TINT12_0, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA8XX_TINT34_0, + .end = IRQ_DA8XX_TINT34_0, + .flags = IORESOURCE_IRQ, + } + } }; #ifdef CONFIG_CPU_FREQ @@ -742,7 +729,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .intc_type = DAVINCI_INTC_TYPE_CP_INTC, .intc_irq_prios = da850_default_priorities, .intc_irq_num = DA850_N_CP_INTC_IRQ, - .timer_info = &da850_timer_info, .emac_pdata = &da8xx_emac_pdata, .sram_dma = DA8XX_SHARED_RAM_BASE, .sram_len = SZ_128K, @@ -765,6 +751,7 @@ void __init da850_init_time(void) void __iomem *pll0; struct regmap *cfgchip; struct clk *clk; + int rv; clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DA850_REF_FREQ); @@ -776,7 +763,8 @@ void __init da850_init_time(void) clk = clk_get(NULL, "timer0"); WARN(IS_ERR(clk), "Unable to get the timer clock\n"); - davinci_timer_init(clk); + rv = davinci_timer_register(clk, &da850_timer_cfg); + WARN(rv, "Unable to register the timer: %d\n", rv); } static struct resource da850_pll1_resources[] = { -- 2.19.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel