Skip to content

Commit 590a094

Browse files
committed
Merge tag 'sunxi-clk-fixes-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes
Pull an Allwinner clk driver fix from Chen-Yu Tsai: Only one patch, accidentally left out of the 6.13 pull request. The patch enables automatic clk reparenting for MMC clocks on A100, thereby fixing MMC support. * tag 'sunxi-clk-fixes-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi-ng: a100: enable MMC clock reparenting
2 parents e24b15d + 1641472 commit 590a094

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/clk/sunxi-ng/ccu-sun50i-a100.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,23 +436,23 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc0_clk, "mmc0", mmc_parents, 0x830,
436436
24, 2, /* mux */
437437
BIT(31), /* gate */
438438
2, /* post-div */
439-
CLK_SET_RATE_NO_REPARENT);
439+
0);
440440

441441
static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,
442442
0, 4, /* M */
443443
8, 2, /* P */
444444
24, 2, /* mux */
445445
BIT(31), /* gate */
446446
2, /* post-div */
447-
CLK_SET_RATE_NO_REPARENT);
447+
0);
448448

449449
static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,
450450
0, 4, /* M */
451451
8, 2, /* P */
452452
24, 2, /* mux */
453453
BIT(31), /* gate */
454454
2, /* post-div */
455-
CLK_SET_RATE_NO_REPARENT);
455+
0);
456456

457457
static SUNXI_CCU_GATE(bus_mmc0_clk, "bus-mmc0", "ahb3", 0x84c, BIT(0), 0);
458458
static SUNXI_CCU_GATE(bus_mmc1_clk, "bus-mmc1", "ahb3", 0x84c, BIT(1), 0);

0 commit comments

Comments
 (0)