From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756718AbcGGIA4 (ORCPT ); Thu, 7 Jul 2016 04:00:56 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:33508 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756593AbcGGH7p (ORCPT ); Thu, 7 Jul 2016 03:59:45 -0400 To: Thomas Gleixner Cc: Ingo Molnar , Alexandre Belloni , Ben Dooks , huangtao , Matthew Leach , Neil Armstrong , Linux Kernel Mailing List , christophe.jaillet@wanadoo.fr From: Daniel Lezcano Subject: [GIT PULL] clockevents for 4.8 Message-ID: <577E0BED.3020608@linaro.org> Date: Thu, 7 Jul 2016 09:59:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Thomas, this pull request contains the following changes: - Convert the clocksource-probe init functions to return a value in order to prepare the consolidation of the drivers using the DT. It is a big patchset but went through 01.org (kbuild bot), linux next and kernel-ci (continuous integration) (Daniel Lezcano) - Fix a bad error handling by returning the right value for cadence_ttc (Christophe Jaillet) - Fix typo in the Kconfig for the Samsung pwm (Alexandre Belloni) - Change functions to static for armada-370-xp and digicolor (Ben Dooks) - Add support for the rk3399 SoC timer by adding bindings and a slight change in the base address. Take the opportunity to add the DYNIRQ flag (Huang Tao) - Fix endian accessors for the Samsung pwm timer (Matthew Leach) - Add Oxford Semiconductor RPS Dual Timer driver (Neil Armstrong) - Add a kernel parameter to swich on/off the event stream feature of the arch arm timer (Will Deacon) Thanks ! -- Daniel The following changes since commit c7d6b5a22c00a19b513353469d89062264a7235f: Merge branch 'fortglx/4.8/time' of https://git.linaro.org/people/john.stultz/linux into timers/core (2016-06-21 08:22:51 +0200) are available in the git repository at: http://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.8 for you to fetch changes up to 34c720a915857f168b98ab03f97b33784286e4ad: clocksource/drivers/cadence_ttc: fix a return value in case of error (2016-07-07 09:44:38 +0200) ---------------------------------------------------------------- Alexandre Belloni (1): clocksource/drivers/samsung_pwm: Fix typo in Kconfig Ben Dooks (2): clocksource/drivers/armada-370-xp: Make syscore_ops static clocksource/drivers/digicolor: Fix warning of non-static function Christophe Jaillet (1): clocksource/drivers/cadence_ttc: fix a return value in case of error Daniel Lezcano (81): of: Add a new macro to declare_of for one parameter function returning a value clocksource/drivers/clksrc-probe: Introduce init functions with return code clocksource/drivers/rockchip_timer: Convert init function to return error clocksource/drivers/mtk_timer: Convert init function to return error clocksource/drivers/exynos_mct: Convert init function to return error clocksource/drivers/asm9260: Convert init function to return error clocksource/drivers/cadence_ttc: Convert init function to return error clocksource/drivers/st_lpc: Convert init function to return error clocksource/drivers/dw_apb_timer: Convert init function to return error clocksource/drivers/clps711x: Convert init function to return error clocksource/drivers/digicolor: Convert init function to return error clocksource/drivers/armv7m_systick: Convert init function to return error clocksource/drivers/bcm2835_timer: Convert init function to return error clocksource/drivers/bcm_kona: Convert init function to return error clocksource/drivers/clksrc-dbx500: Convert init function to return error clocksource/drivers/fsl_ftm_timer: Convert init function to return error clocksource/drivers/arm_arch_timer: Convert init function to return error clocksource/drivers/arm_global_timer: Convert init function to return error clocksource/drivers/h8300_timer16: Convert init function to return error clocksource/drivers/h8300_timer8: Convert init function to return error clocksource/drivers/h8300_tpu: Convert init function to return error clocksource/drivers/meson6_timer.c: Convert init function to return error clocksource/drivers/mips-gic-timer: Convert init function to return error clocksource/drivers/moxart: Convert init function to return error clocksource/drivers/mps2-timer: Convert init function to return error clocksource/drivers/mxs: Convert init function to return error clocksource/drivers/nomadik-mtu: Convert init function to return error clocksource/drivers/pxa: Convert init function to return error clocksource/drivers/qcom: Convert init function to return error clocksource/drivers/samsung_pwm: Convert init function to return error clocksource/drivers/sun4i: Convert init function to return error clocksource/drivers/tango_xtal: Convert init function to return error clocksource/drivers/tegra20: Convert init function to return error clocksource/drivers/time-armada-370-xp: Convert init function to return error clocksource/drivers/time-efm32: Convert init function to return error clocksource/drivers/time-lpc32xx: Convert init function to return error clocksource/drivers/orion: Convert init function to return error clocksource/drivers/pistachio: Convert init function to return error clocksource/drivers/atlas7: Convert init function to return error clocksource/drivers/atmel-pit: Convert init function to return error clocksource/drivers/atmel-st: Convert init function to return error clocksource/drivers/prima2: Convert init function to return error clocksource/drivers/imx-gpt: Convert init function to return error clocksource/drivers/integrator-ap: Convert init function to return error clocksource/drivers/keystone: Convert init function to return error clocksource/drivers/sp804: Convert init function to return error clocksource/drivers/stm32: Convert init function to return error clocksource/drivers/sun5i: Convert init function to return error clocksource/drivers/ti-32k: Convert init function to return error clocksource/drivers/u300: Convert init function to return error clocksource/drivers/versatile: Convert init function to return error clocksource/drivers/vf_pit_timer: Convert init function to return error clocksource/drivers/vt8500: Convert init function to return error clocksource/drivers/zevio: Convert init function to return error clocksource/drivers/microblaze: Convert init function to return error clocksource/drivers/ralink: Convert init function to return error clocksource/drivers/nios2: Convert init function to return error clocksource/drivers/smp_twd: Convert init function to return error clocksource/drivers/nps: Convert init function to return error clocksource/drivers/arc: Convert init function to return error clocksource/drivers/oxnas-rps: Convert init function to return error clocksources: Switch back to the clksrc table clk: Add missing clk_get_sys() stub clocksource/drivers/bcm_kona: Remove useless header clocksource/drivers/bcm2835: Add the COMPILE_TEST option clocksource/drivers/armv7m_systick: Add the COMPILE_TEST option clocksource/drivers/bcm_kona: Add the COMPILE_TEST option clocksource/drivers/clps_711x: Add the COMPILE_TEST option clocksource/drivers/atlas7: Add the COMPILE_TEST option clocksource/drivers/moxart: Add the COMPILE_TEST option clocksource/drivers/mxs: Remove useless header clocksource/drivers/mxs: Add the COMPILE_TEST option clocksource/drivers/prima2: Remove useless header clocksource/drivers/prima2: Add the COMPILE_TEST option clocksource/drivers/u300: Add the COMPILE_TEST option clocksource/drivers/nspire: Add the COMPILE_TEST option clocksource/drivers/keystone: Add the COMPILE_TEST option clocksource/drivers/integrator-ap: Add the COMPILE_TEST option clocksource/drivers/arm_global_timer: Add the COMPILE_TEST option clocksource/drivers/timer-atmel-st: Add the COMPILE_TEST option clocksource/drivers/versatile: Add the COMPILE_TEST option Huang Tao (2): dt-bindings: Document rk3399 rk-timer bindings arm64: dts: rockchip: Add rktimer device node for rk3399 Huang, Tao (2): clocksource/drivers/rockchip: Add the dynamic irq flag to the timer clocksource/drivers/rockchip: Add support for the rk3399 SoC Matthew Leach (1): clocksource/drivers/samsung_pwm_timer: Fix endian accessors Neil Armstrong (2): clocksource/drivers/oxnas-rps: Add Oxford Semiconductor RPS Dual Timer dt-bindings: clocksource: Add Oxford Semiconductor RPS Timer bindings Will Deacon (1): clocksource/drivers/arm_arch_timer: Control the evtstrm via the cmdline .../devicetree/bindings/timer/oxsemi,rps-timer.txt | 17 ++ ...chip,rk3288-timer.txt => rockchip,rk-timer.txt} | 6 +- Documentation/kernel-parameters.txt | 8 + arch/arc/kernel/time.c | 63 +++-- arch/arm/Kconfig | 2 +- arch/arm/kernel/smp_twd.c | 3 +- arch/arm/mach-bcm/Kconfig | 2 + arch/arm/mach-integrator/Kconfig | 2 +- arch/arm/mach-keystone/Kconfig | 2 +- arch/arm/mach-moxart/Kconfig | 2 +- arch/arm/mach-mxs/Kconfig | 2 +- arch/arm/mach-nspire/Kconfig | 1 + arch/arm/mach-prima2/Kconfig | 2 + arch/arm/mach-u300/Kconfig | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 + arch/microblaze/kernel/timer.c | 49 +++- arch/mips/ralink/cevt-rt3352.c | 17 +- arch/nios2/kernel/time.c | 63 +++-- drivers/clocksource/Kconfig | 116 +++++++- drivers/clocksource/Makefile | 23 +- drivers/clocksource/arm_arch_timer.c | 56 ++-- drivers/clocksource/arm_global_timer.c | 26 +- drivers/clocksource/armv7m_systick.c | 17 +- drivers/clocksource/asm9260_timer.c | 22 +- drivers/clocksource/bcm2835_timer.c | 38 ++- drivers/clocksource/bcm_kona_timer.c | 12 +- drivers/clocksource/cadence_ttc_timer.c | 74 +++-- drivers/clocksource/clksrc-dbx500-prcmu.c | 4 +- drivers/clocksource/clksrc-probe.c | 14 +- drivers/clocksource/clksrc_st_lpc.c | 20 +- drivers/clocksource/clps711x-timer.c | 10 +- drivers/clocksource/dw_apb_timer_of.c | 4 +- drivers/clocksource/exynos_mct.c | 32 ++- drivers/clocksource/fsl_ftm_timer.c | 20 +- drivers/clocksource/h8300_timer16.c | 12 +- drivers/clocksource/h8300_timer8.c | 11 +- drivers/clocksource/h8300_tpu.c | 10 +- drivers/clocksource/meson6_timer.c | 19 +- drivers/clocksource/mips-gic-timer.c | 24 +- drivers/clocksource/moxart_timer.c | 39 ++- drivers/clocksource/mps2-timer.c | 8 +- drivers/clocksource/mtk_timer.c | 8 +- drivers/clocksource/mxs_timer.c | 26 +- drivers/clocksource/nomadik-mtu.c | 43 +-- drivers/clocksource/pxa_timer.c | 44 ++- drivers/clocksource/qcom-timer.c | 23 +- drivers/clocksource/rockchip_timer.c | 53 +++- drivers/clocksource/samsung_pwm_timer.c | 70 ++--- drivers/clocksource/sun4i_timer.c | 43 ++- drivers/clocksource/tango_xtal.c | 10 +- drivers/clocksource/tegra20_timer.c | 24 +- drivers/clocksource/time-armada-370-xp.c | 98 +++++-- drivers/clocksource/time-efm32.c | 17 +- drivers/clocksource/time-lpc32xx.c | 10 +- drivers/clocksource/time-orion.c | 50 +++- drivers/clocksource/time-pistachio.c | 18 +- drivers/clocksource/timer-atlas7.c | 30 ++- drivers/clocksource/timer-atmel-pit.c | 41 ++- drivers/clocksource/timer-atmel-st.c | 42 +-- drivers/clocksource/timer-digicolor.c | 16 +- drivers/clocksource/timer-imx-gpt.c | 51 ++-- drivers/clocksource/timer-integrator-ap.c | 57 ++-- drivers/clocksource/timer-keystone.c | 13 +- drivers/clocksource/timer-nps.c | 14 +- drivers/clocksource/timer-oxnas-rps.c | 297 +++++++++++++++++++++ drivers/clocksource/timer-prima2.c | 42 ++- drivers/clocksource/timer-sp804.c | 86 ++++-- drivers/clocksource/timer-stm32.c | 8 +- drivers/clocksource/timer-sun5i.c | 33 ++- drivers/clocksource/timer-ti-32k.c | 8 +- drivers/clocksource/timer-u300.c | 36 ++- drivers/clocksource/versatile.c | 6 +- drivers/clocksource/vf_pit_timer.c | 25 +- drivers/clocksource/vt8500_timer.c | 24 +- drivers/clocksource/zevio-timer.c | 4 +- include/clocksource/timer-sp804.h | 8 +- include/linux/clk.h | 4 + include/linux/clocksource.h | 2 +- include/linux/of.h | 3 + 79 files changed, 1628 insertions(+), 621 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt rename Documentation/devicetree/bindings/timer/{rockchip,rk3288-timer.txt => rockchip,rk-timer.txt} (75%) create mode 100644 drivers/clocksource/timer-oxnas-rps.c -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog