From patchwork Mon Mar 18 12:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10857535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A97F6C2 for ; Mon, 18 Mar 2019 12:23:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECB8E23B32 for ; Mon, 18 Mar 2019 12:23:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E13562858F; Mon, 18 Mar 2019 12:23:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DBFD123B32 for ; Mon, 18 Mar 2019 12:23:10 +0000 (UTC) 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=CzD0VeMhSW+eRWL6WQVdsNcAFdJQuJ+WvL593fF2Pa0=; b=V6uTqOBohAPMpn /ZN+qyiAYje3xAn0pmvBsv6L092TCJfI25pC81kbdHY/0nE3unWuQE/Mi38Lmk4+MtPmW0Syc+VVW rCOFhZdDtAFi45lILGMJsdWQYcpUbuLHm0qRQxk+Xedm9tNgjn8+Nr2cDOZfMsOqU8iyDIGu2P8tt CzA2HyqmgrJsqQ1lNwKhW9fXWImdBsEkNtKQ6HZjPRLqaBeRH7QoZDG3fpmnC5x5M/hHofKD9p9cZ EvoXfrFS1+SJMXcvxQ2pcv5WFrKQ4KOus+fArYzVEXAEixDaNICBcLj7+e8gEHdvnX2/81dVCgNPu oL/YS91wsSJkpLnBN2YA==; 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 1h5rIJ-00043t-HF; Mon, 18 Mar 2019 12:23:07 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5r72-0005l2-8o for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 12:11:30 +0000 Received: by mail-wm1-x344.google.com with SMTP id e74so12717065wmg.3 for ; Mon, 18 Mar 2019 05:11:28 -0700 (PDT) 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=Z2AyPcpkMK2TUdGXpcbzsOcHrovJWMOKUOoUDNgEkKg=; b=bmOsXdySusZkb50ndIvDHGO/z46YLKHbbfxI9Ji7KJPyuu3vD1moakF7Jr5v24tRV9 XIkYN/Rmd/OgT9iZYogRII7KoS9ZQleRMoX9P88lQech/rSIJGLnQh8VfPJCoHekw63O 1lPdmDvORfncrzu2RbNIlSj8U6QQBNWVoiPSp0pp9MzNJqh2/CgCSF2ovetbhHEZ23Tc 4Vb++CwrC0bvmq3VX6yWePh4ha+MplwexHl3ptn1C/84Rloa2iIm5HEolo7aehq3GWA3 nnOFJR/fLpO3VFZsWe3pNW0qj6iSVOiuC/m+xdpkQ8qvpWqJQukNB6S7/o+xRKY4S/fM /aIQ== 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=Z2AyPcpkMK2TUdGXpcbzsOcHrovJWMOKUOoUDNgEkKg=; b=c8X6Yfmxf7v7ShOgbXlExFHPyQnjj3b5M1S6VmdZOiyG52x2R7d6ji5gYnkHy9u7Xj W6xA7Pq+gbzEZfWEtKqxPl1wknUCBqpvOBIxzncWd+/6Cdv+MsmxqBPa04xYo04wrjww vWK4gbIeDmiqIWMYKnCoit7OLkuM3yr+JeZkvLty0QXdWf0Qj3f7p8OFciDsDsxJcLtD EHeJ3Ny3ue97Cx6kJC3dQgRbhJyVdZYySJ23S1IT4kf9me5fb03wzK8Ui2sIpgPOFie8 nIkMimQZPkD+1TTHIv3zhdZIPDnywIpE8gjJjRFI/w8B10dXco0E0c6a9LDAELfg3vjh yMrQ== X-Gm-Message-State: APjAAAU1S9I+Pw9Kz7AN/WyhIte1fVEIyw22B+RWBhfyzJ64Fo0KnRHT 9fAn8MP0v5pFlWS/BQ9C5R/d03wZjB4= X-Google-Smtp-Source: APXvYqyI1rTqMDt6mClmYnjgytNnavXPygYSdJe6dkTw8eCi/XyT564xzWLmEP97wiAlZy0n0KQFvA== X-Received: by 2002:a7b:c3c5:: with SMTP id t5mr10745333wmj.110.1552911086370; Mon, 18 Mar 2019 05:11:26 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id n13sm8220132wrw.67.2019.03.18.05.11.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:11:25 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Thomas Gleixner , David Lechner Subject: [PATCH v4 09/11] ARM: davinci: dm644x: switch to using the clocksource driver Date: Mon, 18 Mar 2019 13:10:58 +0100 Message-Id: <20190318121100.28132-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318121100.28132-1-brgl@bgdev.pl> References: <20190318121100.28132-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_051128_394862_BE9FB778 X-CRM114-Status: GOOD ( 15.46 ) 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: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We now have a proper clocksource driver for davinci. Switch the dm644x platform to using it. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/dm644x.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 2b0e921aa755..9f7c348d8efe 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -26,7 +26,8 @@ #include #include #include -#include + +#include #include "asp.h" #include "davinci.h" @@ -560,15 +561,15 @@ static struct davinci_id dm644x_ids[] = { }; /* - * T0_BOT: Timer 0, bottom: clockevent source for hrtimers - * T0_TOP: Timer 0, top : clocksource for generic timekeeping - * T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code) - * T1_TOP: Timer 1, top : + * Bottom half of timer0 is used for clockevent, top half is used for + * clocksource. */ -static struct davinci_timer_info dm644x_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id = T0_BOT, - .clocksource_id = T0_TOP, +static const struct davinci_timer_cfg dm644x_timer_cfg = { + .reg = DEFINE_RES_IO(DAVINCI_TIMER0_BASE, SZ_4K), + .irq = { + DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12)), + DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34)), + }, }; static struct plat_serial8250_port dm644x_serial0_platform_data[] = { @@ -646,7 +647,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), - .timer_info = &dm644x_timer_info, .emac_pdata = &dm644x_emac_pdata, .sram_dma = 0x00008000, .sram_len = SZ_16K, @@ -668,6 +668,7 @@ void __init dm644x_init_time(void) { void __iomem *pll1, *psc; struct clk *clk; + int rv; clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM644X_REF_FREQ); @@ -683,7 +684,8 @@ void __init dm644x_init_time(void) return; } - davinci_timer_init(clk); + rv = davinci_timer_register(clk, &dm644x_timer_cfg); + WARN(rv, "Unable to register the timer: %d\n", rv); } static struct resource dm644x_pll2_resources[] = {