Commit 8840f546 authored by Anthoine Bourgeois's avatar Anthoine Bourgeois Committed by Tony Lindgren
Browse files

ARM: dts: Use 32KiHz oscillator on devkit8000 



Devkit8000 board seems to always used 32k_counter as clocksource.
Restore this behavior.

If clocksource is back to 32k_counter, timer12 is now the clockevent
source (as before) and timer2 is not longer needed here.

This commit fixes the same issue observed with commit 23885389
("ARM: dts: Fix timer regression for beagleboard revision c") when sleep
is blocked until hitting keys over serial console.

Fixes: aba1ad05 ("clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support")
Fixes: e428e250 ("ARM: dts: Configure system timers for omap3")
Signed-off-by: default avatarAnthoine Bourgeois <anthoine.bourgeois@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 64324ef3

arch/arm/boot/dts/omap3-devkit8000-common.dtsi

+1 −16
Original line number Diff line number Diff line
@@ -158,11 +158,6 @@ 
	status = "disabled";

};



/* Unusable as clocksource because of unreliable oscillator */

&counter32k {

	status = "disabled";

};



/* Unusable as clockevent because if unreliable oscillator, allow to idle */

&timer1_target {

	/delete-property/ti,no-reset-on-init;
@@ -172,7 +167,7 @@ 
	};

};



/* Preferred always-on timer for clocksource */

/* Preferred timer for clockevent */

&timer12_target {

	ti,no-reset-on-init;

	ti,no-idle;
@@ -181,16 +176,6 @@ 
	};

};



/* Preferred timer for clockevent */

&timer2_target {

	ti,no-reset-on-init;

	ti,no-idle;

	timer@0 {

		assigned-clocks = <&gpt2_fck>;

		assigned-clock-parents = <&sys_ck>;

	};

};



&twl_gpio {

	ti,use-leds;

	/*

drivers/clocksource/timer-ti-dm-systimer.c

+1 −2
Original line number Diff line number Diff line
@@ -241,8 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void) 
	bool quirk_unreliable_oscillator = false;



	/* Quirk unreliable 32 KiHz oscillator with incomplete dts */

	if (of_machine_is_compatible("ti,omap3-beagle-ab4") ||

	    of_machine_is_compatible("timll,omap3-devkit8000")) {

	if (of_machine_is_compatible("ti,omap3-beagle-ab4")) {

		quirk_unreliable_oscillator = true;

		counter_32k = -ENODEV;

	}