Skip to content

Commit 8840f54

Browse files
Alucowietmlind
authored andcommitted
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 2388538 ("ARM: dts: Fix timer regression for beagleboard revision c") when sleep is blocked until hitting keys over serial console. Fixes: aba1ad0 ("clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support") Fixes: e428e25 ("ARM: dts: Configure system timers for omap3") Signed-off-by: Anthoine Bourgeois <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 64324ef commit 8840f54

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,6 @@
158158
status = "disabled";
159159
};
160160

161-
/* Unusable as clocksource because of unreliable oscillator */
162-
&counter32k {
163-
status = "disabled";
164-
};
165-
166161
/* Unusable as clockevent because if unreliable oscillator, allow to idle */
167162
&timer1_target {
168163
/delete-property/ti,no-reset-on-init;
@@ -172,7 +167,7 @@
172167
};
173168
};
174169

175-
/* Preferred always-on timer for clocksource */
170+
/* Preferred timer for clockevent */
176171
&timer12_target {
177172
ti,no-reset-on-init;
178173
ti,no-idle;
@@ -181,16 +176,6 @@
181176
};
182177
};
183178

184-
/* Preferred timer for clockevent */
185-
&timer2_target {
186-
ti,no-reset-on-init;
187-
ti,no-idle;
188-
timer@0 {
189-
assigned-clocks = <&gpt2_fck>;
190-
assigned-clock-parents = <&sys_ck>;
191-
};
192-
};
193-
194179
&twl_gpio {
195180
ti,use-leds;
196181
/*

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void)
241241
bool quirk_unreliable_oscillator = false;
242242

243243
/* Quirk unreliable 32 KiHz oscillator with incomplete dts */
244-
if (of_machine_is_compatible("ti,omap3-beagle-ab4") ||
245-
of_machine_is_compatible("timll,omap3-devkit8000")) {
244+
if (of_machine_is_compatible("ti,omap3-beagle-ab4")) {
246245
quirk_unreliable_oscillator = true;
247246
counter_32k = -ENODEV;
248247
}

0 commit comments

Comments
 (0)