* [PULL] clockevents for 4.9 @ 2016-09-12 9:10 Daniel Lezcano [not found] ` <1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org> 0 siblings, 1 reply; 2+ messages in thread From: Daniel Lezcano @ 2016-09-12 9:10 UTC (permalink / raw) To: linux-arm-kernel Hi Thomas, Ingo, This pull request for 4.9 contains a few changes: - Cleanup the atmel-pit timer (Alexander Belloni) - Add the Aspeed support (Joel Stanley) - Replaced setup_irq/request_irq and panic/pr_err on moxart (Daniel Lezcano) - Add the Ox820 compatible string for oxnas (Neil Armstrong) Thanks ! -- Daniel The following changes since commit 950d8381d915ee293a5b57f91e59dd8115684af1: Merge branch 'linus' into timers/core, to refresh the branch (2016-09-08 14:05:16 +0200) are available in the git repository at: http://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.9 for you to fetch changes up to 2ea3401e2a84eed3f5f55b2075706f88df160d85: clocksource/drivers/oxnas: Add OX820 compatible (2016-09-12 07:28:46 +0200) ---------------------------------------------------------------- Alexandre Belloni (3): clocksource/drivers/timer-atmel-pit: Drop at91sam926x_pit_common_init clocksource/drivers/timer-atmel-pit: Remove uselesss WARN_ON_ONCE clocksource/drivers/timer-atmel-pit: Simplify IRQ handler Daniel Lezcano (2): clocksource/drivers/moxart: Replace setup_irq by request_irq clocksource/drivers/moxart: Replace panic by pr_err Joel Stanley (3): clocksource/drivers/moxart: Refactor enable/disable clocksource/drivers/moxart: Use struct to hold state clocksource/drivers/moxart: Add Aspeed support Neil Armstrong (1): clocksource/drivers/oxnas: Add OX820 compatible Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 4 +++- Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt | 2 +- drivers/clocksource/moxart_timer.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- drivers/clocksource/timer-atmel-pit.c | 96 +++++++++++++++++++++++++++++++++++++----------------------------------------------------------- drivers/clocksource/timer-oxnas-rps.c | 2 ++ 5 files changed, 172 insertions(+), 125 deletions(-) -- <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog ^ permalink raw reply [flat|nested] 2+ messages in thread
[parent not found: <1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org>]
* [PATCH 9/9] clocksource/drivers/oxnas: Add OX820 compatible [not found] ` <1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org> @ 2016-09-12 9:15 ` Daniel Lezcano 0 siblings, 0 replies; 2+ messages in thread From: Daniel Lezcano @ 2016-09-12 9:15 UTC (permalink / raw) To: linux-arm-kernel From: Neil Armstrong <narmstrong@baylibre.com> In order to support the Oxford Semiconductor OX820 SoC, add new compatible string to rps timer driver. Also add new string in the dt-bindings. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt | 2 +- drivers/clocksource/timer-oxnas-rps.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt b/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt index 3ca89cd..d191612 100644 --- a/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt +++ b/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt @@ -2,7 +2,7 @@ Oxford Semiconductor OXNAS SoCs Family RPS Timer ================================================ Required properties: -- compatible: Should be "oxsemi,ox810se-rps-timer" +- compatible: Should be "oxsemi,ox810se-rps-timer" or "oxsemi,ox820-rps-timer" - reg : Specifies base physical address and size of the registers. - interrupts : The interrupts of the two timers - clocks : The phandle of the timer clock source diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c index bd887e2..d630bf4 100644 --- a/drivers/clocksource/timer-oxnas-rps.c +++ b/drivers/clocksource/timer-oxnas-rps.c @@ -295,3 +295,5 @@ err_alloc: CLOCKSOURCE_OF_DECLARE(ox810se_rps, "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); +CLOCKSOURCE_OF_DECLARE(ox820_rps, + "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init); -- 2.7.4 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-12 9:15 UTC | newest] Thread overview: 2+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-12 9:10 [PULL] clockevents for 4.9 Daniel Lezcano [not found] ` <1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org> 2016-09-12 9:15 ` [PATCH 9/9] clocksource/drivers/oxnas: Add OX820 compatible Daniel Lezcano
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).