Skip to content

Commit ac08bda

Browse files
committed
ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
Commit 0840242 ("ARM: dts: Configure clock parent for pwm vibra") attempted to fix the PWM settings but ended up causin an additional clock reparenting error: clk: failed to reparent abe-clkctrl:0060:24 to sys_clkin_ck: -22 Only timer9 is in the PER domain and can use the sys_clkin_ck clock source. For timer8, the there is no sys_clkin_ck available as it's in the ABE domain, instead it should use syc_clk_div_ck. However, for power management, we want to use the always on sys_32k_ck instead. Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Cc: Carl Philipp Klemm <philipp@uvos.xyz> Cc: Merlijn Wajer <merlijn@wizzup.org> Cc: Pavel Machek <pavel@ucw.cz> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Fixes: 0840242 ("ARM: dts: Configure clock parent for pwm vibra") Depends-on: 6197861 ("ARM: dts: Add minimal support for Droid Bionic xt875") Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent 6469b2f commit ac08bda

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,12 +614,12 @@
614614
/* Configure pwm clock source for timers 8 & 9 */
615615
&timer8 {
616616
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
617-
assigned-clock-parents = <&sys_clkin_ck>;
617+
assigned-clock-parents = <&sys_32k_ck>;
618618
};
619619

620620
&timer9 {
621621
assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
622-
assigned-clock-parents = <&sys_clkin_ck>;
622+
assigned-clock-parents = <&sys_32k_ck>;
623623
};
624624

625625
/*

0 commit comments

Comments
 (0)