clk: ingenic: Don't tag custom clocks with CLK_SET_RATE_PARENT (2e4ee634) · Commits · 戴 / test

The custom clocks have custom functions to round, get or set their rate. Therefore, we can't assume that they need the CLK_SET_RATE_PARENT flag. Signed-off-by:

Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20200903015048.3091523-4-paul@crapouillou.net Signed-off-by:

Stephen Boyd <sboyd@kernel.org>

drivers/clk/ingenic/cgu.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -629,6 +629,13 @@ static int ingenic_register_clock(struct ingenic_cgu *cgu, unsigned idx)

		caps = clk_info->type;

		if (caps & CGU_CLK_DIV) {
		caps &= ~CGU_CLK_DIV;
		} else if (!(caps & CGU_CLK_CUSTOM)) {
		/* pass rate changes to the parent clock */
		clk_init.flags \|= CLK_SET_RATE_PARENT;
		}

		if (caps & (CGU_CLK_MUX \| CGU_CLK_CUSTOM)) {
		clk_init.num_parents = 0;

		@@ -690,13 +697,6 @@ static int ingenic_register_clock(struct ingenic_cgu *cgu, unsigned idx)
		caps &= ~(CGU_CLK_MUX \| CGU_CLK_MUX_GLITCHFREE);
		}

		if (caps & CGU_CLK_DIV) {
		caps &= ~CGU_CLK_DIV;
		} else {
		/* pass rate changes to the parent clock */
		clk_init.flags \|= CLK_SET_RATE_PARENT;
		}

		if (caps) {
		pr_err("%s: unknown clock type 0x%x\n", __func__, caps);
		goto out;

Admin message