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

Commit da3dd58a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update the rumi clock freq for sdm855"

parents 27c972cc 28b54c2b

arch/arm64/boot/dts/qcom/sdm855-rumi.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
	};



	timer {

		clock-frequency = <287000>;

		clock-frequency = <95000>;

	};



	timer@0x17c00000 {

		clock-frequency = <287000>;

		clock-frequency = <95000>;

	};



	qcom,icnss@18800000 {

kernel/time/timer.c

+4 −5
Original line number Diff line number Diff line
@@ -830,8 +830,7 @@ static inline struct timer_base *get_timer_cpu_base(u32 tflags, u32 cpu) 
	 * If the timer is deferrable and NO_HZ_COMMON is set then we need

	 * to use the deferrable base.

	 */

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active &&

	    (tflags & TIMER_DEFERRABLE)) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && (tflags & TIMER_DEFERRABLE)) {

		base = &timer_base_deferrable;

		if (tflags & TIMER_PINNED)

			base = per_cpu_ptr(&timer_bases[BASE_DEF], cpu);
@@ -847,8 +846,7 @@ static inline struct timer_base *get_timer_this_cpu_base(u32 tflags) 
	 * If the timer is deferrable and NO_HZ_COMMON is set then we need

	 * to use the deferrable base.

	 */

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active &&

	    (tflags & TIMER_DEFERRABLE)) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && (tflags & TIMER_DEFERRABLE)) {

		base = &timer_base_deferrable;

		if (tflags & TIMER_PINNED)

			base = this_cpu_ptr(&timer_bases[BASE_DEF]);
@@ -1669,7 +1667,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h) 
	base->must_forward_clk = false;



	__run_timers(base);

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active) {

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON)) {

		__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));

		__run_timers(&timer_base_deferrable);

	}

}