lkml.org 
[lkml]   [2017]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subject[GIT PULL] clockevents for 4.13
    Hi Thomas,

    the clockevents/4.13 branch contains the following changes:

    - Factored out moxart, aspeed, cortina drivers into a generic timer fttrm010.
    Take the opportunity to add the delay timer (Linus Walleij)

    - Saved / restored tcb atmel context at suspend/resume (Alexandre Belloni)

    - Added ast2500 compatible string and fixed aspeed2500 initialization (Daniel
    Lezcano)

    - Added clock names property for aspeed (Andrew Jeffery)

    - Renamed clocksource_of to timer_of (Daniel Lezcano)

    - Added a common timer init routine (Daniel Lezcano)

    Thanks.

    -- Daniel

    The following changes since commit f2c45807d3992fe0f173f34af9c347d907c31686:

    alarmtimer: Switch over to generic set/get/rearm routine (2017-06-04 15:40:32 +0200)

    are available in the git repository at:

    https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.13

    for you to fetch changes up to c477990295a78f1248283322bd1ad964c22151bc:

    clocksource/drivers/fttmr010: Factor out clock read code (2017-06-14 12:02:50 +0200)

    ----------------------------------------------------------------
    Alexandre Belloni (1):
    clocksource/drivers/tcb_clksrc: Save timer context on suspend/resume

    Andrew Jeffery (1):
    arm: aspeed: Add clock-names property to timer node

    Daniel Lezcano (11):
    clocksource/drivers/fttmr010: Add AST2500 compatible string
    clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
    Revert "clockevents: Add a clkevt-of mechanism like clksrc-of"
    clocksource/drivers: Rename CLOCKSOURCE_OF_DECLARE to TIMER_OF_DECLARE
    clocksource/drivers: Rename clocksource_probe to timer_probe
    clocksource/drivers: Rename CLOCKSOURCE_ACPI_DECLARE to TIMER_ACPI_DECLARE
    clocksource/drivers: Rename clksrc table to timer
    clocksource/drivers: Rename CLKSRC_OF to TIMER_OF
    clocksource/drivers: Rename CLKSRC_ACPI to TIMER_ACPI
    clocksource/drivers: Add an alias macro CLOCKSOURCE_OF_DECLARE
    clocksource/drivers: Add timer-of common init routine

    Linus Walleij (10):
    clocksource/drivers/fttmr010: Fix the clock handling
    clocksource/drivers/fttmr010: Merge FTTMR010 DT bindings
    clocksource/drivers/fttmr010: Drop Gemini specifics
    clocksource/drivers/fttmr010: Use state container
    clocksource/drivers/fttmr010: Switch to use bitops
    clocksource/drivers/fttmr010: Switch to use TIMER2 src
    clocksource/drivers/fttmr010: Merge Moxa into FTTMR010
    clocksource/drivers/fttmr010: Optimize sched_clock()
    clocksource/drivers/fttmr010: Implement delay timer
    clocksource/drivers/fttmr010: Factor out clock read code

    .../devicetree/bindings/timer/faraday,fttmr010.txt | 6 +-
    .../bindings/timer/moxa,moxart-timer.txt | 19 -
    arch/arc/kernel/setup.c | 2 +-
    arch/arm/Kconfig | 10 +-
    arch/arm/boot/dts/aspeed-g4.dtsi | 1 +
    arch/arm/boot/dts/aspeed-g5.dtsi | 1 +
    arch/arm/kernel/smp_twd.c | 6 +-
    arch/arm/kernel/time.c | 2 +-
    arch/arm/mach-aspeed/Kconfig | 2 +-
    arch/arm/mach-bcm/Kconfig | 2 +-
    arch/arm/mach-clps711x/Kconfig | 2 +-
    arch/arm/mach-mediatek/mediatek.c | 2 +-
    arch/arm/mach-moxart/Kconfig | 2 +-
    arch/arm/mach-omap2/timer.c | 10 +-
    arch/arm/mach-rockchip/rockchip.c | 2 +-
    arch/arm/mach-s3c24xx/Kconfig | 2 +-
    arch/arm/mach-s3c64xx/Kconfig | 2 +-
    arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +-
    arch/arm/mach-spear/spear13xx.c | 2 +-
    arch/arm/mach-sunxi/sunxi.c | 2 +-
    arch/arm/mach-u300/core.c | 2 +-
    arch/arm/mach-zynq/common.c | 2 +-
    arch/arm64/Kconfig.platforms | 4 +-
    arch/arm64/kernel/time.c | 2 +-
    arch/h8300/Kconfig | 2 +-
    arch/h8300/kernel/setup.c | 2 +-
    arch/microblaze/Kconfig | 2 +-
    arch/microblaze/kernel/setup.c | 2 +-
    arch/microblaze/kernel/timer.c | 2 +-
    arch/mips/generic/init.c | 2 +-
    arch/mips/mti-malta/malta-time.c | 2 +-
    arch/mips/pic32/pic32mzda/time.c | 2 +-
    arch/mips/pistachio/time.c | 2 +-
    arch/mips/ralink/Kconfig | 2 +-
    arch/mips/ralink/cevt-rt3352.c | 2 +-
    arch/mips/ralink/clk.c | 2 +-
    arch/mips/ralink/timer-gic.c | 2 +-
    arch/mips/xilfpga/time.c | 2 +-
    arch/nios2/Kconfig | 2 +-
    arch/nios2/kernel/time.c | 4 +-
    arch/sh/boards/Kconfig | 2 +-
    arch/sh/boards/of-generic.c | 2 +-
    arch/xtensa/kernel/time.c | 2 +-
    drivers/clocksource/Kconfig | 79 ++--
    drivers/clocksource/Makefile | 5 +-
    drivers/clocksource/arc_timer.c | 6 +-
    drivers/clocksource/arm_arch_timer.c | 8 +-
    drivers/clocksource/arm_global_timer.c | 2 +-
    drivers/clocksource/armv7m_systick.c | 2 +-
    drivers/clocksource/asm9260_timer.c | 2 +-
    drivers/clocksource/bcm2835_timer.c | 2 +-
    drivers/clocksource/bcm_kona_timer.c | 4 +-
    drivers/clocksource/cadence_ttc_timer.c | 2 +-
    drivers/clocksource/clkevt-probe.c | 56 ---
    drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +-
    drivers/clocksource/clksrc_st_lpc.c | 2 +-
    drivers/clocksource/clps711x-timer.c | 4 +-
    drivers/clocksource/dw_apb_timer_of.c | 8 +-
    drivers/clocksource/exynos_mct.c | 4 +-
    drivers/clocksource/fsl_ftm_timer.c | 2 +-
    drivers/clocksource/h8300_timer16.c | 2 +-
    drivers/clocksource/h8300_timer8.c | 2 +-
    drivers/clocksource/h8300_tpu.c | 2 +-
    drivers/clocksource/jcore-pit.c | 2 +-
    drivers/clocksource/meson6_timer.c | 2 +-
    drivers/clocksource/mips-gic-timer.c | 2 +-
    drivers/clocksource/moxart_timer.c | 256 -----------
    drivers/clocksource/mps2-timer.c | 2 +-
    drivers/clocksource/mtk_timer.c | 2 +-
    drivers/clocksource/mxs_timer.c | 2 +-
    drivers/clocksource/nomadik-mtu.c | 2 +-
    drivers/clocksource/pxa_timer.c | 2 +-
    drivers/clocksource/qcom-timer.c | 4 +-
    drivers/clocksource/renesas-ostm.c | 2 +-
    drivers/clocksource/rockchip_timer.c | 4 +-
    drivers/clocksource/samsung_pwm_timer.c | 10 +-
    drivers/clocksource/sun4i_timer.c | 2 +-
    drivers/clocksource/tango_xtal.c | 2 +-
    drivers/clocksource/tcb_clksrc.c | 51 +++
    drivers/clocksource/tegra20_timer.c | 4 +-
    drivers/clocksource/time-armada-370-xp.c | 6 +-
    drivers/clocksource/time-efm32.c | 4 +-
    drivers/clocksource/time-lpc32xx.c | 2 +-
    drivers/clocksource/time-orion.c | 2 +-
    drivers/clocksource/time-pistachio.c | 2 +-
    drivers/clocksource/timer-atlas7.c | 2 +-
    drivers/clocksource/timer-atmel-pit.c | 2 +-
    drivers/clocksource/timer-atmel-st.c | 2 +-
    drivers/clocksource/timer-digicolor.c | 2 +-
    drivers/clocksource/timer-fttmr010.c | 476 +++++++++++++--------
    drivers/clocksource/timer-imx-gpt.c | 24 +-
    drivers/clocksource/timer-integrator-ap.c | 2 +-
    drivers/clocksource/timer-keystone.c | 2 +-
    drivers/clocksource/timer-nps.c | 6 +-
    drivers/clocksource/timer-of.c | 172 ++++++++
    drivers/clocksource/timer-of.h | 69 +++
    drivers/clocksource/timer-oxnas-rps.c | 4 +-
    drivers/clocksource/timer-prima2.c | 2 +-
    .../clocksource/{clksrc-probe.c => timer-probe.c} | 20 +-
    drivers/clocksource/timer-sp804.c | 4 +-
    drivers/clocksource/timer-stm32.c | 2 +-
    drivers/clocksource/timer-sun5i.c | 4 +-
    drivers/clocksource/timer-ti-32k.c | 2 +-
    drivers/clocksource/timer-u300.c | 2 +-
    drivers/clocksource/versatile.c | 4 +-
    drivers/clocksource/vf_pit_timer.c | 2 +-
    drivers/clocksource/vt8500_timer.c | 2 +-
    drivers/clocksource/zevio-timer.c | 2 +-
    include/asm-generic/vmlinux.lds.h | 9 +-
    include/linux/clockchips.h | 9 -
    include/linux/clocksource.h | 15 +-
    111 files changed, 791 insertions(+), 743 deletions(-)
    delete mode 100644 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
    delete mode 100644 drivers/clocksource/clkevt-probe.c
    delete mode 100644 drivers/clocksource/moxart_timer.c
    create mode 100644 drivers/clocksource/timer-of.c
    create mode 100644 drivers/clocksource/timer-of.h
    rename drivers/clocksource/{clksrc-probe.c => timer-probe.c} (72%)


    --

    <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

    \
     
     \ /
      Last update: 2017-06-14 14:38    [W:3.896 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site