Commit 096f0a2e authored Nov 17, 2019 by Martin Blumenstingl Committed by Jerome Brunet Dec 11, 2019

clk: meson: meson8b: don't register the XTAL clock when provided via OF



The XTAL clock is an actual crystal on the PCB. Thus the meson8b clock
driver should not register the XTAL clock - instead it should be
provided via .dts and then passed to the clock controller.

Skip the registration of the XTAL clock if a parent clock is provided
via OF. Fall back to registering the XTAL clock if this is not the case
to keep support for old .dtbs.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

parent 5668f765

drivers/clk/meson/meson8b.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -3687,10 +3687,16 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
		meson8b_clk_regmaps[i]->map = map;

		/*
		* register all clks
		* CLKID_UNUSED = 0, so skip it and start with CLKID_XTAL = 1
		* always skip CLKID_UNUSED and also skip XTAL if the .dtb provides the
		* XTAL clock as input.
		*/
		for (i = CLKID_XTAL; i < CLK_NR_CLKS; i++) {
		if (!IS_ERR(of_clk_get_by_name(np, "xtal")))
		i = CLKID_PLL_FIXED;
		else
		i = CLKID_XTAL;

		/* register all clks */
		for (; i < CLK_NR_CLKS; i++) {
		/* array might be sparse */
		if (!clk_hw_onecell_data->hws[i])
		continue;

Admin message