Skip to content

Commit 3cbb9ce

Browse files
committed
Merge tag 'm68knommu-for-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer: "Just a single fix to correct the clock rate defined for the internal timer hardware blocks of the ColdFire 5441x family of SoC devices" * tag 'm68knommu-for-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: coldfire: Use proper clock rate for timers
2 parents ae38135 + a0a8306 commit 3cbb9ce

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

arch/m68k/coldfire/m5441x.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ DEFINE_CLK(0, "mcfuart.0", 24, MCF_BUSCLK);
3333
DEFINE_CLK(0, "mcfuart.1", 25, MCF_BUSCLK);
3434
DEFINE_CLK(0, "mcfuart.2", 26, MCF_BUSCLK);
3535
DEFINE_CLK(0, "mcfuart.3", 27, MCF_BUSCLK);
36-
DEFINE_CLK(0, "mcftmr.0", 28, MCF_CLK);
37-
DEFINE_CLK(0, "mcftmr.1", 29, MCF_CLK);
38-
DEFINE_CLK(0, "mcftmr.2", 30, MCF_CLK);
39-
DEFINE_CLK(0, "mcftmr.3", 31, MCF_CLK);
40-
DEFINE_CLK(0, "mcfpit.0", 32, MCF_CLK);
41-
DEFINE_CLK(0, "mcfpit.1", 33, MCF_CLK);
42-
DEFINE_CLK(0, "mcfpit.2", 34, MCF_CLK);
43-
DEFINE_CLK(0, "mcfpit.3", 35, MCF_CLK);
36+
DEFINE_CLK(0, "mcftmr.0", 28, MCF_BUSCLK);
37+
DEFINE_CLK(0, "mcftmr.1", 29, MCF_BUSCLK);
38+
DEFINE_CLK(0, "mcftmr.2", 30, MCF_BUSCLK);
39+
DEFINE_CLK(0, "mcftmr.3", 31, MCF_BUSCLK);
40+
DEFINE_CLK(0, "mcfpit.0", 32, MCF_BUSCLK);
41+
DEFINE_CLK(0, "mcfpit.1", 33, MCF_BUSCLK);
42+
DEFINE_CLK(0, "mcfpit.2", 34, MCF_BUSCLK);
43+
DEFINE_CLK(0, "mcfpit.3", 35, MCF_BUSCLK);
4444
DEFINE_CLK(0, "mcfeport.0", 37, MCF_CLK);
4545
DEFINE_CLK(0, "mcfadc.0", 38, MCF_CLK);
4646
DEFINE_CLK(0, "mcfdac.0", 39, MCF_CLK);
@@ -167,8 +167,8 @@ static struct clk * const disable_clks[] __initconst = {
167167
&__clk_0_14, /* i2c.1 */
168168
&__clk_0_22, /* i2c.0 */
169169
&__clk_0_23, /* dspi.0 */
170-
&__clk_0_28, /* tmr.1 */
171-
&__clk_0_29, /* tmr.2 */
170+
&__clk_0_28, /* tmr.0 */
171+
&__clk_0_29, /* tmr.1 */
172172
&__clk_0_30, /* tmr.2 */
173173
&__clk_0_31, /* tmr.3 */
174174
&__clk_0_32, /* pit.0 */

0 commit comments

Comments
 (0)