From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Thu, 12 Nov 2015 19:36:52 +0100 Subject: [PATCH] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init In-Reply-To: <20151112180832.GE32142@lukather> References: <1447348278-16277-1-git-send-email-daniel.lezcano@linaro.org> <20151112180832.GE32142@lukather> Message-ID: <5644DC44.40808@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 11/12/2015 07:08 PM, Maxime Ripard wrote: > Hi Daniel, > > On Thu, Nov 12, 2015 at 06:11:18PM +0100, Daniel Lezcano wrote: >> The current code to initialize, register and read the clocksource is >> already factored out in mmio.c via the clocksource_mmio_init function. >> >> The only difference is the readl vs readl_relaxed. >> >> Factor out the code with the clocksource_mmio_init function. >> >> Signed-off-by: Daniel Lezcano >> --- >> drivers/clocksource/timer-sun5i.c | 16 ++-------------- >> 1 file changed, 2 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c >> index bca9573..dc3793c 100644 >> --- a/drivers/clocksource/timer-sun5i.c >> +++ b/drivers/clocksource/timer-sun5i.c >> @@ -152,13 +152,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id) >> return IRQ_HANDLED; >> } >> >> -static cycle_t sun5i_clksrc_read(struct clocksource *clksrc) >> -{ >> - struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc); >> - >> - return ~readl(cs->timer.base + TIMER_CNTVAL_LO_REG(1)); >> -} >> - >> static int sun5i_rate_cb_clksrc(struct notifier_block *nb, >> unsigned long event, void *data) >> { >> @@ -217,13 +210,8 @@ static int __init sun5i_setup_clocksource(struct device_node *node, >> writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD, >> base + TIMER_CTL_REG(1)); >> >> - cs->clksrc.name = node->name; >> - cs->clksrc.rating = 340; >> - cs->clksrc.read = sun5i_clksrc_read; >> - cs->clksrc.mask = CLOCKSOURCE_MASK(32); >> - cs->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS; >> - >> - ret = clocksource_register_hz(&cs->clksrc, rate); >> + ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name, >> + rate, 340, UINT_MAX, clocksource_mmio_readw_down); > > Shouldn't it be clocksource_mmio_readl_down? Ah yes. Thanks for catching this. I will fix it. -- Daniel -- Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754389AbbKLSg5 (ORCPT ); Thu, 12 Nov 2015 13:36:57 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36825 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbbKLSg4 (ORCPT ); Thu, 12 Nov 2015 13:36:56 -0500 Subject: Re: [PATCH] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init To: Maxime Ripard References: <1447348278-16277-1-git-send-email-daniel.lezcano@linaro.org> <20151112180832.GE32142@lukather> Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, "moderated list:ARM/Allwinner A1X..." From: Daniel Lezcano Message-ID: <5644DC44.40808@linaro.org> Date: Thu, 12 Nov 2015 19:36:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151112180832.GE32142@lukather> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/12/2015 07:08 PM, Maxime Ripard wrote: > Hi Daniel, > > On Thu, Nov 12, 2015 at 06:11:18PM +0100, Daniel Lezcano wrote: >> The current code to initialize, register and read the clocksource is >> already factored out in mmio.c via the clocksource_mmio_init function. >> >> The only difference is the readl vs readl_relaxed. >> >> Factor out the code with the clocksource_mmio_init function. >> >> Signed-off-by: Daniel Lezcano >> --- >> drivers/clocksource/timer-sun5i.c | 16 ++-------------- >> 1 file changed, 2 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c >> index bca9573..dc3793c 100644 >> --- a/drivers/clocksource/timer-sun5i.c >> +++ b/drivers/clocksource/timer-sun5i.c >> @@ -152,13 +152,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id) >> return IRQ_HANDLED; >> } >> >> -static cycle_t sun5i_clksrc_read(struct clocksource *clksrc) >> -{ >> - struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc); >> - >> - return ~readl(cs->timer.base + TIMER_CNTVAL_LO_REG(1)); >> -} >> - >> static int sun5i_rate_cb_clksrc(struct notifier_block *nb, >> unsigned long event, void *data) >> { >> @@ -217,13 +210,8 @@ static int __init sun5i_setup_clocksource(struct device_node *node, >> writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD, >> base + TIMER_CTL_REG(1)); >> >> - cs->clksrc.name = node->name; >> - cs->clksrc.rating = 340; >> - cs->clksrc.read = sun5i_clksrc_read; >> - cs->clksrc.mask = CLOCKSOURCE_MASK(32); >> - cs->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS; >> - >> - ret = clocksource_register_hz(&cs->clksrc, rate); >> + ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name, >> + rate, 340, UINT_MAX, clocksource_mmio_readw_down); > > Shouldn't it be clocksource_mmio_readl_down? Ah yes. Thanks for catching this. I will fix it. -- Daniel -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog