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

Commit b92a3bcc authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Ulf Hansson
Browse files

clk: apn806: Turn the eMMC clock as optional for dts backwards compatible 



First version of the binding didn't have the eMMC clock. This patch
allows to not registering the eMMC clock if it is not present in the
device tree. Then the device tree can be backwards compatible.

Suggested-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a8309ced

drivers/clk/mvebu/ap806-system-controller.c

+13 −7
Original line number Diff line number Diff line
@@ -136,14 +136,20 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev) 
	}



	/* eMMC Clock is fixed clock divided by 3 */

	of_property_read_string_index(np, "clock-output-names",

				      4, &name);

	ap806_clks[4] = clk_register_fixed_factor(NULL, name, fixedclk_name,

	if (of_property_read_string_index(np, "clock-output-names",

					  4, &name)) {

		ap806_clk_data.clk_num--;

		dev_warn(&pdev->dev,

			 "eMMC clock mising: update the device tree!\n");

	} else {

		ap806_clks[4] = clk_register_fixed_factor(NULL, name,

							  fixedclk_name,

							  0, 1, 3);

		if (IS_ERR(ap806_clks[4])) {

			ret = PTR_ERR(ap806_clks[4]);

			goto fail4;

		}

	}



	of_clk_add_provider(np, of_clk_src_onecell_get, &ap806_clk_data);

	ret = of_clk_add_provider(np, of_clk_src_onecell_get, &ap806_clk_data);