Skip to content

Commit

Permalink
ARM: dts: switch timer config to common devkit8000 devicetree
Browse files Browse the repository at this point in the history
[ Upstream commit 64324ef ]

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 <anthoine.bourgeois@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Alucowie authored and gregkh committed Mar 8, 2022
1 parent 8b20c19 commit 298f6fa
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
33 changes: 33 additions & 0 deletions arch/arm/boot/dts/omap3-devkit8000-common.dtsi
Expand Up @@ -158,6 +158,39 @@
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;
/delete-property/ti,no-idle;
timer@0 {
/delete-property/ti,timer-alwon;
};
};

/* Preferred always-on timer for clocksource */
&timer12_target {
ti,no-reset-on-init;
ti,no-idle;
timer@0 {
/* Always clocked by secure_32k_fck */
};
};

/* 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;
/*
Expand Down
33 changes: 0 additions & 33 deletions arch/arm/boot/dts/omap3-devkit8000.dts
Expand Up @@ -14,36 +14,3 @@
display2 = &tv0;
};
};

/* 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;
/delete-property/ti,no-idle;
timer@0 {
/delete-property/ti,timer-alwon;
};
};

/* Preferred always-on timer for clocksource */
&timer12_target {
ti,no-reset-on-init;
ti,no-idle;
timer@0 {
/* Always clocked by secure_32k_fck */
};
};

/* 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>;
};
};

0 comments on commit 298f6fa

Please sign in to comment.