Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed3fb5af authored by Jerome Brunet's avatar Jerome Brunet
Browse files

clk: meson: gxbb: remove IGNORE_UNUSED from mmc clocks



Remove CLK_IGNORE_UNUSED from mmc clocks. This was only needed while the
mmc driver incorrectly used the xtal as source instead of the mmc
clock. Now, the driver takes the correct clock, CCF is aware that the
clock is being used and we can remove this flag.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 75eccf5e
Loading
Loading
Loading
Loading
+3 −13
Original line number Original line Diff line number Diff line
@@ -1031,17 +1031,7 @@ static struct clk_gate gxbb_sd_emmc_a_clk0 = {
		.ops = &clk_gate_ops,
		.ops = &clk_gate_ops,
		.parent_names = (const char *[]){ "sd_emmc_a_clk0_div" },
		.parent_names = (const char *[]){ "sd_emmc_a_clk0_div" },
		.num_parents = 1,
		.num_parents = 1,

		.flags = CLK_SET_RATE_PARENT,
		/*
		 * FIXME:
		 * We need CLK_IGNORE_UNUSED because mmc DT node point to xtal
		 * instead of this clock. CCF would gate this on boot, killing
		 * the mmc controller. Please remove this flag once DT properly
		 * point to this clock instead of xtal
		 *
		 * Same goes for emmc B and C clocks
		 */
		.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
	},
	},
};
};


@@ -1084,7 +1074,7 @@ static struct clk_gate gxbb_sd_emmc_b_clk0 = {
		.ops = &clk_gate_ops,
		.ops = &clk_gate_ops,
		.parent_names = (const char *[]){ "sd_emmc_b_clk0_div" },
		.parent_names = (const char *[]){ "sd_emmc_b_clk0_div" },
		.num_parents = 1,
		.num_parents = 1,
		.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
		.flags = CLK_SET_RATE_PARENT,
	},
	},
};
};


@@ -1127,7 +1117,7 @@ static struct clk_gate gxbb_sd_emmc_c_clk0 = {
		.ops = &clk_gate_ops,
		.ops = &clk_gate_ops,
		.parent_names = (const char *[]){ "sd_emmc_c_clk0_div" },
		.parent_names = (const char *[]){ "sd_emmc_c_clk0_div" },
		.num_parents = 1,
		.num_parents = 1,
		.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
		.flags = CLK_SET_RATE_PARENT,
	},
	},
};
};