From: Ingo Molnar <mingo@kernel.org>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: "Thomas Gleixner" <tglx@linutronix.de>,
"John Stultz" <john.stultz@linaro.org>,
"Stephen Boyd" <sboyd@codeaurora.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Soren Brinkmann" <soren.brinkmann@xilinx.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL - resend ] clocksource: new material for 3.13
Date: Thu, 3 Oct 2013 07:59:05 +0200 [thread overview]
Message-ID: <20131003055905.GB25345@gmail.com> (raw)
In-Reply-To: <524BFA57.6070506@linaro.org>
* Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
> Hi Thomas, Ingo
>
> this pull request has the following content:
>
> - Soren added FEAT_PERCPU to a clock device when it is local per cpu.
> This feature prevents the clock framework to choose a per cpu timer as
> a broadcast timer. This problem arised when the ARM global timer is
> used when switching to the broadcast timer which is the case now on
> Xillinx with its cpuidle driver.
>
> - Stephen extended the generic sched_clock code to support 64bit
> counters and removes the setup_sched_clock deprecation, as that causes
> lots of warnings since there's still users in the arch/arm tree. He
> added also the CLOCK_SOURCE_SUSPEND_NONSTOP flag on the architected
> timer as they continue counting during suspend.
>
> - Uwe added some missing __init sections and consolidated the code
> by moving the of_node_put call from the drivers to the function
> clocksource_of_init.
>
> Sorry for the last crappy pull request, I hope all is good now.
>
> Thanks !
>
> -- Daniel
>
> ps: Is it possible to update timers/core to v3.12-rc2/3 ?
>
> The following changes since commit 389e067032fbb96e439abafae848dd447e4cafb4:
>
> Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
> (2013-09-16 18:54:07 -0700)
>
> are available in the git repository at:
>
>
> git://git.linaro.org/people/dlezcano/linux.git clockevents/3.13
>
> for you to fetch changes up to 4fbcdc813fb9c0324fcff4c75414e717569d965e:
>
> clocksource: arm_arch_timer: Use clocksource for suspend
> timekeeping (2013-10-02 11:43:17 +0200)
>
> ----------------------------------------------------------------
> John Stultz (1):
> Merge remote-tracking branch 'tip/timers/core' into
> fordlezcano/3.13/sched-clock64-conversion
>
> Soren Brinkmann (4):
> clockchips: Add FEAT_PERCPU clockevent flag
> clocksource/arm_global_timer: Set FEAT_PERCPU flag
> tick: broadcast: Deny per-cpu clockevents from being broadcast
> sources
> arm: zynq: Enable arm_global_timer
>
> Stephen Boyd (11):
> clocksource: bcm2835: Switch to sched_clock_register()
> clocksource: dbx500-prcmu: Switch to sched_clock_register()
> clocksource: dw_apb_timer_of: Switch to sched_clock_register()
> clocksource: mxs_timer: Switch to sched_clock_register()
> clocksource: nomadik: Switch to sched_clock_register()
> clocksource: samsung_pwm_timer: Switch to sched_clock_register()
> clocksource: tegra: Switch to sched_clock_register()
> clocksource: time-armada-370-xp: Switch to sched_clock_register()
> clocksource: sirf: Switch to sched_clock_register() and use 64 bits
> clocksource: vf_pit_timer: Switch to sched_clock_register()
> clocksource: arm_arch_timer: Use clocksource for suspend timekeeping
>
> Uwe Kleine-König (2):
> clocksource: Put nodes passed to CLOCKSOURCE_OF_DECLARE
> callbacks centrally
> clocksource: dw_apb_timer_of: Mark a few more functions as __init
>
> arch/arm/boot/dts/zynq-7000.dtsi | 8 ++++++++
> arch/arm/mach-msm/timer.c | 1 -
> arch/arm/mach-zynq/Kconfig | 1 +
> drivers/clocksource/arm_arch_timer.c | 2 +-
> drivers/clocksource/arm_global_timer.c | 3 ++-
> drivers/clocksource/bcm2835_timer.c | 4 ++--
> drivers/clocksource/clksrc-dbx500-prcmu.c | 5 ++---
> drivers/clocksource/clksrc-of.c | 1 +
> drivers/clocksource/dw_apb_timer_of.c | 16 +++++++---------
> drivers/clocksource/mxs_timer.c | 4 ++--
> drivers/clocksource/nomadik-mtu.c | 4 ++--
> drivers/clocksource/samsung_pwm_timer.c | 4 ++--
> drivers/clocksource/tegra20_timer.c | 8 ++------
> drivers/clocksource/time-armada-370-xp.c | 4 ++--
> drivers/clocksource/timer-prima2.c | 6 +++---
> drivers/clocksource/vf_pit_timer.c | 4 ++--
> drivers/clocksource/vt8500_timer.c | 2 --
> include/linux/clockchips.h | 1 +
> kernel/time/tick-broadcast.c | 1 +
> 19 files changed, 41 insertions(+), 38 deletions(-)
Pulled into tip:timers/core, thanks Daniel!
Ingo
prev parent reply other threads:[~2013-10-03 5:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-02 10:49 [GIT PULL - resend ] clocksource: new material for 3.13 Daniel Lezcano
2013-10-03 5:59 ` Ingo Molnar [this message]
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=20131003055905.GB25345@gmail.com \
--to=mingo@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=john.stultz@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@codeaurora.org \
--cc=soren.brinkmann@xilinx.com \
--cc=tglx@linutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/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