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

Commit 95492b1e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940" 



This reverts commit 33058471 which is
commit 25de4ce5ed02994aea8bc111d133308f6fd62566 upstream.

It breaks the build and is not needed in this android branch.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I409b1d804cc06c189827a82b48e8a95afd9ced01
parent ec10e358

arch/arm/boot/dts/dra7.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 


	timer {

		compatible = "arm,armv7-timer";

		status = "disabled";	/* See ARM architected timer wrap erratum i940 */

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
@@ -911,8 +910,6 @@ 
			reg = <0x48032000 0x80>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer2";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER2_CLKCTRL 24>;

		};



		timer3: timer@48034000 {
@@ -920,10 +917,6 @@ 
			reg = <0x48034000 0x80>;

			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer3";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER3_CLKCTRL 24>;

			assigned-clocks = <&l4per_clkctrl DRA7_TIMER3_CLKCTRL 24>;

			assigned-clock-parents = <&timer_sys_clk_div>;

		};



		timer4: timer@48036000 {
@@ -931,10 +924,6 @@ 
			reg = <0x48036000 0x80>;

			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "timer4";

			clock-names = "fck";

			clocks = <&l4per_clkctrl DRA7_TIMER4_CLKCTRL 24>;

			assigned-clocks = <&l4per_clkctrl DRA7_TIMER4_CLKCTRL 24>;

			assigned-clock-parents = <&timer_sys_clk_div>;

		};



		timer5: timer@48820000 {

arch/arm/mach-omap2/board-generic.c

+2 −2
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)") 
	.init_late	= dra7xx_init_late,

	.init_irq	= omap_gic_of_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap3_gptimer_timer_init,

	.init_time	= omap5_realtime_timer_init,

	.dt_compat	= dra74x_boards_compat,

	.restart	= omap44xx_restart,

MACHINE_END
@@ -353,7 +353,7 @@ DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)") 
	.init_late	= dra7xx_init_late,

	.init_irq	= omap_gic_of_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap3_gptimer_timer_init,

	.init_time	= omap5_realtime_timer_init,

	.dt_compat	= dra72x_boards_compat,

	.restart	= omap44xx_restart,

MACHINE_END

arch/arm/mach-omap2/timer.c

+1 −52
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/platform_device.h>

#include <linux/platform_data/dmtimer-omap.h>

#include <linux/sched_clock.h>

#include <linux/cpu.h>



#include <asm/mach/time.h>

#include <asm/smp_twd.h>
@@ -422,53 +421,6 @@ static void __init dmtimer_clkevt_init_common(struct dmtimer_clockevent *clkevt, 
		timer->rate);

}



static DEFINE_PER_CPU(struct dmtimer_clockevent, dmtimer_percpu_timer);



static int omap_gptimer_starting_cpu(unsigned int cpu)

{

	struct dmtimer_clockevent *clkevt = per_cpu_ptr(&dmtimer_percpu_timer, cpu);

	struct clock_event_device *dev = &clkevt->dev;

	struct omap_dm_timer *timer = &clkevt->timer;



	clockevents_config_and_register(dev, timer->rate, 3, ULONG_MAX);

	irq_force_affinity(dev->irq, cpumask_of(cpu));



	return 0;

}



static int __init dmtimer_percpu_quirk_init(void)

{

	struct dmtimer_clockevent *clkevt;

	struct clock_event_device *dev;

	struct device_node *arm_timer;

	struct omap_dm_timer *timer;

	int cpu = 0;



	arm_timer = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");

	if (of_device_is_available(arm_timer)) {

		pr_warn_once("ARM architected timer wrap issue i940 detected\n");

		return 0;

	}



	for_each_possible_cpu(cpu) {

		clkevt = per_cpu_ptr(&dmtimer_percpu_timer, cpu);

		dev = &clkevt->dev;

		timer = &clkevt->timer;



		dmtimer_clkevt_init_common(clkevt, 0, "timer_sys_ck",

					   CLOCK_EVT_FEAT_ONESHOT,

					   cpumask_of(cpu),

					   "assigned-clock-parents",

					   500, "percpu timer");

	}



	cpuhp_setup_state(CPUHP_AP_OMAP_DM_TIMER_STARTING,

			  "clockevents/omap/gptimer:starting",

			  omap_gptimer_starting_cpu, NULL);



	return 0;

}



/* Clocksource code */

static struct omap_dm_timer clksrc;

static bool use_gptimer_clksrc __initdata;
@@ -613,9 +565,6 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src 
					3, /* Timer internal resynch latency */

					0xffffffff);



	if (soc_is_dra7xx())

		dmtimer_percpu_quirk_init();



	/* Enable the use of clocksource="gp_timer" kernel parameter */

	if (use_gptimer_clksrc || gptimer)

		omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,
@@ -643,7 +592,7 @@ void __init omap3_secure_sync32k_timer_init(void) 
#endif /* CONFIG_ARCH_OMAP3 */



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \

	defined(CONFIG_SOC_AM43XX) || defined(CONFIG_SOC_DRA7XX)

	defined(CONFIG_SOC_AM43XX)

void __init omap3_gptimer_timer_init(void)

{

	__omap_sync32k_timer_init(2, "timer_sys_ck", NULL,

drivers/clk/ti/clk-7xx.c

+0 −1
Original line number Diff line number Diff line
@@ -733,7 +733,6 @@ const struct omap_clkctrl_data dra7_clkctrl_data[] __initconst = { 
static struct ti_dt_clk dra7xx_clks[] = {

	DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),

	DT_CLK(NULL, "sys_clkin_ck", "timer_sys_clk_div"),

	DT_CLK(NULL, "timer_sys_ck", "timer_sys_clk_div"),

	DT_CLK(NULL, "sys_clkin", "sys_clkin1"),

	DT_CLK(NULL, "atl_dpll_clk_mux", "atl_cm:0000:24"),

	DT_CLK(NULL, "atl_gfclk_mux", "atl_cm:0000:26"),

include/linux/cpuhotplug.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ enum cpuhp_state { 
	CPUHP_AP_ARM_L2X0_STARTING,

	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

	CPUHP_AP_OMAP_DM_TIMER_STARTING,

	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

	CPUHP_AP_JCORE_TIMER_STARTING,

	CPUHP_AP_ARM_TWD_STARTING,