From patchwork Mon Mar 18 12:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10857511 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 4C3D91390 for ; Mon, 18 Mar 2019 12:12:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25961291DA for ; Mon, 18 Mar 2019 12:12:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15E1F292C0; Mon, 18 Mar 2019 12:12:55 +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 A29AB291DA for ; Mon, 18 Mar 2019 12:12:54 +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=o3VuFhSQCt1IZijHxNhoDrWVGvKNldgr39GTBi1RmEI=; b=S5UCuUG6akzPM8 06xEZaYe9XjryDBCLe5GTRl1KIc9gga0GqQojK2QKQP+H+gKKetFR1Qeprt0cwQMtx6yG9eLLvqE8 7QREP37b/Cv843NRDUDAK3T7YUUFfFBZNjZh5xj2mibfMVMKovCShYSaP+BPWJOjbkXTmw3VBAnOI 4qr0vHJIO1uSoGs+UwZPmR8Hmqc0LcHockFSTVPU/nJe0kP2/owIp6DlnvwvWvFAMSmIUvPYr8ngy AVpOuy3lTHeVuuLDzc4zpMkXK8V3IKRdROr2afrQplti5maXXiTNdwinmb3HslVJCDQxzEjIlChoU L+ZjdXBVBvWni9y2I5hQ==; 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 1h5r8J-0007VG-MN; Mon, 18 Mar 2019 12:12:47 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5r70-0005jH-LT for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 12:11:28 +0000 Received: by mail-wr1-x442.google.com with SMTP id q1so1087883wrp.0 for ; Mon, 18 Mar 2019 05:11:26 -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=bK5pfEUqcjE/r0JENwN9BcU/JSZzzMAgebOVzPlDfQ8=; b=ToYSnhib7EXcQ2PSU4Yo/ZHfoGBz84jFDIScP+Wf6rDk/YwpABlVl+3zVEYQiJU3v/ WcaCZXiDYZGNdRU/tuul8NpikARCwr1qTl7IfsvsTyCCXSyXWIfkZZn4mZ77PWIoTGsq oMgVhOjNiCCQ6CbfSup76NrgQkvnSM1+6t6g71ErvmnjhDt5VIMb+CsK+uROpSUPwAZS /8BlecD1vE4/IWqon9boygmg01ooLINc83n+hWEt1rQjmG+ybnr8wuloTAdp7OX9H7Wd ueIb3Y5viehJMidXIYRT2IlzrVNQPYnfXgn3JxhAnlGNY6EJyvULSQlCAtbbF6Ew4AyX RB/Q== 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=bK5pfEUqcjE/r0JENwN9BcU/JSZzzMAgebOVzPlDfQ8=; b=OTscFyOR+zOaIFB7N/bP9+F34c3RTiGN/TwfJDHeikEFEk++Muz4ly3p48XPaZedk8 YHy28zNPcvpTQ27aBDsKvzKig2lMFR8ox6uLXWC5jmW+GF+UgAJJxL63Iqdyi4YxPlfd Gni91brpG7o2dqUfPKU03McbsuSzYxRVLgRLrPxujEQOyIcOacFjNlF8sbCrg+0tnice CcpeY5btotOrqMcAUxFPT0I43VYi0Qw2drIZjHBdB1iNpyJMDA4aHnX/U+iAbHdHQvBp cm98R8Xj5jV8cqVApjsQviZ4Ks4FZ64ov0L29q9XC1QCqhcz6W/P1X36qFN4S56D7b4H kIlg== X-Gm-Message-State: APjAAAWN5cufdc8Lx9j3LTdsIPkUSs3D/Jhnc/E8Lbt3mPSOyqnptWuC VDmiRJc7D/P5XlK34CxyymKDlw== X-Google-Smtp-Source: APXvYqzLmvLMb2MO25FAN0hO22IEA8JSy3X5uBSDGvA+L5DZHo7oLRQZb+GiwiAjEHl62n4XVaypUw== X-Received: by 2002:adf:f089:: with SMTP id n9mr11345446wro.313.1552911084988; Mon, 18 Mar 2019 05:11:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:11:23 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Thomas Gleixner , David Lechner Subject: [PATCH v4 08/11] ARM: davinci: dm365: switch to using the clocksource driver Date: Mon, 18 Mar 2019 13:10:57 +0100 Message-Id: <20190318121100.28132-9-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_051127_095815_E1479FA1 X-CRM114-Status: GOOD ( 15.14 ) 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 dm365 platform to using it. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/dm365.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 1d82bb630d11..5e93e0b6410b 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -34,7 +34,8 @@ #include #include #include -#include + +#include #include "asp.h" #include "davinci.h" @@ -659,10 +660,16 @@ static struct davinci_id dm365_ids[] = { }, }; -static struct davinci_timer_info dm365_timer_info = { - .timers = davinci_timer_instance, - .clockevent_id = T0_BOT, - .clocksource_id = T0_TOP, +/* + * Bottom half of timer0 is used for clockevent, top half is used for + * clocksource. + */ +static const struct davinci_timer_cfg dm365_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)), + }, }; #define DM365_UART1_BASE (IO_PHYS + 0x106000) @@ -722,7 +729,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), - .timer_info = &dm365_timer_info, .emac_pdata = &dm365_emac_pdata, .sram_dma = 0x00010000, .sram_len = SZ_32K, @@ -770,6 +776,7 @@ void __init dm365_init_time(void) { void __iomem *pll1, *pll2, *psc; struct clk *clk; + int rv; clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM365_REF_FREQ); @@ -788,7 +795,8 @@ void __init dm365_init_time(void) return; } - davinci_timer_init(clk); + rv = davinci_timer_register(clk, &dm365_timer_cfg); + WARN(rv, "Unable to register the timer: %d\n", rv); } void __init dm365_register_clocks(void)