Skip to content

Commit 64324ef

Browse files
Alucowietmlind
authored andcommitted
ARM: dts: switch timer config to common devkit8000 devicetree
This patch allow lcd43 and lcd70 flavors to benefit from timer evolution. 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 486343d commit 64324ef

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,39 @@
158158
status = "disabled";
159159
};
160160

161+
/* Unusable as clocksource because of unreliable oscillator */
162+
&counter32k {
163+
status = "disabled";
164+
};
165+
166+
/* Unusable as clockevent because if unreliable oscillator, allow to idle */
167+
&timer1_target {
168+
/delete-property/ti,no-reset-on-init;
169+
/delete-property/ti,no-idle;
170+
timer@0 {
171+
/delete-property/ti,timer-alwon;
172+
};
173+
};
174+
175+
/* Preferred always-on timer for clocksource */
176+
&timer12_target {
177+
ti,no-reset-on-init;
178+
ti,no-idle;
179+
timer@0 {
180+
/* Always clocked by secure_32k_fck */
181+
};
182+
};
183+
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+
161194
&twl_gpio {
162195
ti,use-leds;
163196
/*

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,3 @@
1414
display2 = &tv0;
1515
};
1616
};
17-
18-
/* Unusable as clocksource because of unreliable oscillator */
19-
&counter32k {
20-
status = "disabled";
21-
};
22-
23-
/* Unusable as clockevent because if unreliable oscillator, allow to idle */
24-
&timer1_target {
25-
/delete-property/ti,no-reset-on-init;
26-
/delete-property/ti,no-idle;
27-
timer@0 {
28-
/delete-property/ti,timer-alwon;
29-
};
30-
};
31-
32-
/* Preferred always-on timer for clocksource */
33-
&timer12_target {
34-
ti,no-reset-on-init;
35-
ti,no-idle;
36-
timer@0 {
37-
/* Always clocked by secure_32k_fck */
38-
};
39-
};
40-
41-
/* Preferred timer for clockevent */
42-
&timer2_target {
43-
ti,no-reset-on-init;
44-
ti,no-idle;
45-
timer@0 {
46-
assigned-clocks = <&gpt2_fck>;
47-
assigned-clock-parents = <&sys_ck>;
48-
};
49-
};

0 commit comments

Comments
 (0)