Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68e90740 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into timers/core 



Pull (mostly) ARM clocksource driver updates from Daniel Lezcano:

" - Soren Brinkmann 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 Boyd 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 Kleine-König 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. "

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 19f29887 4fbcdc81

arch/arm/boot/dts/zynq-7000.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ 
			};

		};



		global_timer: timer@f8f00200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0xf8f00200 0x20>;

			interrupts = <1 11 0x301>;

			interrupt-parent = <&intc>;

			clocks = <&clkc 4>;

		};



		ttc0: ttc0@f8001000 {

			interrupt-parent = <&intc>;

			interrupts = < 0 10 4 0 11 4 0 12 4 >;

arch/arm/mach-msm/timer.c

+0 −1
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ static void __init msm_dt_timer_init(struct device_node *np) 
		pr_err("Unknown frequency\n");

		return;

	}

	of_node_put(np);



	event_base = base + 0x4;

	sts_base = base + 0x88;

arch/arm/mach-zynq/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ config ARCH_ZYNQ 
	select HAVE_SMP

	select SPARSE_IRQ

	select CADENCE_TTC_TIMER

	select ARM_GLOBAL_TIMER

	help

	  Support for Xilinx Zynq ARM Cortex A9 Platform

drivers/clocksource/arm_arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static struct clocksource clocksource_counter = { 
	.rating	= 400,

	.read	= arch_counter_read,

	.mask	= CLOCKSOURCE_MASK(56),

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP,

};



static struct cyclecounter cyclecounter = {

drivers/clocksource/arm_global_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ static int gt_clockevents_init(struct clock_event_device *clk) 
	int cpu = smp_processor_id();



	clk->name = "arm_global_timer";

	clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

	clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |

		CLOCK_EVT_FEAT_PERCPU;

	clk->set_mode = gt_clockevent_set_mode;

	clk->set_next_event = gt_clockevent_set_next_event;

	clk->cpumask = cpumask_of(cpu);