From: "Heiko Stübner" <heiko@sntech.de>
To: Alexander Kochetkov <al.kochet@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
Thomas Gleixner <tglx@linutronix.de>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Caesar Wang <wxt@rock-chips.com>,
Huang Tao <huangtao@rock-chips.com>
Subject: Re: [PATCH v5 5/8] clocksource/drivers/rockchip_timer: split bc_timer into rk_timer and rk_clock_event_device
Date: Tue, 24 Jan 2017 16:02:53 +0100 [thread overview]
Message-ID: <3890508.0j97LNriXL@diego> (raw)
In-Reply-To: <1485260203-14216-6-git-send-email-al.kochet@gmail.com>
Am Dienstag, 24. Januar 2017, 15:16:40 CET schrieb Alexander Kochetkov:
> The patch move ce field out of struct bc_timer into struct
> rk_clock_event_device and rename struct bc_timer to struct rk_timer.
>
> The main idea for the commit is to exctact low level timer
> routines from current implementation so they could be
> reused in the following clocksource implementation commit.
>
> This is refactoring step without functional changes.
>
> Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
> Reviwed-by: Heiko Stübner <heiko@sntech.de>
Please don't add Reviewed-by tags without explicit mention of them by
reviewers. (Also it's spelled wrong).
I haven't looked that deeply into the driver itself and the changes made to
feel comfortable with a "Reviewed-by".
> ---
> drivers/clocksource/rockchip_timer.c | 33
> ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11
> deletions(-)
>
> diff --git a/drivers/clocksource/rockchip_timer.c
> b/drivers/clocksource/rockchip_timer.c index 23e267a..6d68d4c 100644
> --- a/drivers/clocksource/rockchip_timer.c
> +++ b/drivers/clocksource/rockchip_timer.c
> @@ -29,18 +29,28 @@
> #define TIMER_MODE_USER_DEFINED_COUNT (1 << 1)
> #define TIMER_INT_UNMASK (1 << 2)
>
> -struct bc_timer {
> - struct clock_event_device ce;
> +struct rk_timer {
> void __iomem *base;
> void __iomem *ctrl;
> u32 freq;
> };
>
> -static struct bc_timer bc_timer;
> +struct rk_clock_event_device {
> + struct clock_event_device ce;
> + struct rk_timer timer;
> +};
> +
> +static struct rk_clock_event_device bc_timer;
> +
> +static inline struct rk_clock_event_device*
> +rk_clock_event_device(struct clock_event_device *ce)
> +{
> + return container_of(ce, struct rk_clock_event_device, ce);
> +}
>
> -static inline struct bc_timer *rk_timer(struct clock_event_device *ce)
> +static inline struct rk_timer *rk_timer(struct clock_event_device *ce)
> {
> - return container_of(ce, struct bc_timer, ce);
> + return &rk_clock_event_device(ce)->timer;
> }
>
> static inline void __iomem *rk_base(struct clock_event_device *ce)
> @@ -116,16 +126,17 @@ static irqreturn_t rk_timer_interrupt(int irq, void
> *dev_id) static int __init rk_timer_init(struct device_node *np, u32
> ctrl_reg) {
> struct clock_event_device *ce = &bc_timer.ce;
> + struct rk_timer *timer = &bc_timer.timer;
> struct clk *timer_clk;
> struct clk *pclk;
> int ret = -EINVAL, irq;
>
> - bc_timer.base = of_iomap(np, 0);
> - if (!bc_timer.base) {
> + timer->base = of_iomap(np, 0);
> + if (!timer->base) {
> pr_err("Failed to get base address for '%s'\n", TIMER_NAME);
> return -ENXIO;
> }
> - bc_timer.ctrl = bc_timer.base + ctrl_reg;
> + timer->ctrl = timer->base + ctrl_reg;
>
> pclk = of_clk_get_by_name(np, "pclk");
> if (IS_ERR(pclk)) {
> @@ -153,7 +164,7 @@ static int __init rk_timer_init(struct device_node *np,
> u32 ctrl_reg) goto out_timer_clk;
> }
>
> - bc_timer.freq = clk_get_rate(timer_clk);
> + timer->freq = clk_get_rate(timer_clk);
>
> irq = irq_of_parse_and_map(np, 0);
> if (!irq) {
> @@ -181,7 +192,7 @@ static int __init rk_timer_init(struct device_node *np,
> u32 ctrl_reg) goto out_irq;
> }
>
> - clockevents_config_and_register(ce, bc_timer.freq, 1, UINT_MAX);
> + clockevents_config_and_register(ce, timer->freq, 1, UINT_MAX);
>
> return 0;
>
> @@ -190,7 +201,7 @@ static int __init rk_timer_init(struct device_node *np,
> u32 ctrl_reg) out_timer_clk:
> clk_disable_unprepare(pclk);
> out_unmap:
> - iounmap(bc_timer.base);
> + iounmap(timer->base);
>
> return ret;
> }
next prev parent reply other threads:[~2017-01-24 15:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 12:16 [PATCH v5 0/8] Implement clocksource for rockchip SoC using rockchip timer Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 1/8] dt-bindings: clarify compatible property for rockchip timers Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 2/8] ARM: dts: rockchip: update compatible property for rk322x timer Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 3/8] ARM: dts: rockchip: add timer entries to rk3188 SoC Alexander Kochetkov
2017-01-30 11:04 ` Daniel Lezcano
2017-01-30 11:20 ` Alexander Kochetkov
2017-01-30 12:04 ` Daniel Lezcano
2017-01-30 13:13 ` Alexander Kochetkov
2017-01-30 13:35 ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 4/8] ARM: dts: rockchip: disable arm-global-timer for rk3188 Alexander Kochetkov
2017-01-30 10:21 ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 5/8] clocksource/drivers/rockchip_timer: split bc_timer into rk_timer and rk_clock_event_device Alexander Kochetkov
2017-01-24 15:02 ` Heiko Stübner [this message]
2017-01-24 15:16 ` Alexander Kochetkov
2017-01-29 20:30 ` Heiko Stuebner
2017-01-30 13:12 ` Daniel Lezcano
2017-01-30 13:55 ` Alexander Kochetkov
2017-01-30 14:20 ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 6/8] clocksource/drivers/rockchip_timer: low level routines take rk_timer as parameter Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 7/8] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable() Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 8/8] clocksource/drivers/rockchip_timer: implement clocksource timer Alexander Kochetkov
2017-01-30 13:54 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3890508.0j97LNriXL@diego \
--to=heiko@sntech.de \
--cc=al.kochet@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=huangtao@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
--cc=wxt@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).