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

Commit ad3a0569 authored by Liang He's avatar Liang He Committed by Greg Kroah-Hartman
Browse files

clk: meson: Hold reference returned by of_get_parent() 



[ Upstream commit 89ab396d712f7c91fe94f55cff23460426f5fc81 ]

We should hold the reference returned by of_get_parent() and use it
to call of_node_put() for refcount balance.

Fixes: 88e2da81 ("clk: meson: aoclk: refactor common code into dedicated file")
Fixes: 6682bd4d ("clk: meson: factorise meson64 peripheral clock controller drivers")
Fixes: bb6eddd1 ("clk: meson: meson8b: use the HHI syscon if available")

Signed-off-by: default avatarLiang He <windhl@126.com>
Link: https://lore.kernel.org/r/20220628141038.168383-1-windhl@126.com


Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 633c574e

drivers/clk/meson/meson-aoclk.c

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int meson_aoclkc_probe(struct platform_device *pdev) 
	struct meson_aoclk_reset_controller *rstc;

	struct meson_aoclk_data *data;

	struct device *dev = &pdev->dev;

	struct device_node *np;

	struct regmap *regmap;

	int ret, clkid;
@@ -47,7 +48,9 @@ int meson_aoclkc_probe(struct platform_device *pdev) 
	if (!rstc)

		return -ENOMEM;



	regmap = syscon_node_to_regmap(of_get_parent(dev->of_node));

	np = of_get_parent(dev->of_node);

	regmap = syscon_node_to_regmap(np);

	of_node_put(np);

	if (IS_ERR(regmap)) {

		dev_err(dev, "failed to get regmap\n");

		return PTR_ERR(regmap);

drivers/clk/meson/meson-eeclk.c

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ int meson_eeclkc_probe(struct platform_device *pdev) 
{

	const struct meson_eeclkc_data *data;

	struct device *dev = &pdev->dev;

	struct device_node *np;

	struct regmap *map;

	int ret, i;
@@ -25,7 +26,9 @@ int meson_eeclkc_probe(struct platform_device *pdev) 
		return -EINVAL;



	/* Get the hhi system controller node */

	map = syscon_node_to_regmap(of_get_parent(dev->of_node));

	np = of_get_parent(dev->of_node);

	map = syscon_node_to_regmap(np);

	of_node_put(np);

	if (IS_ERR(map)) {

		dev_err(dev,

			"failed to get HHI regmap\n");

drivers/clk/meson/meson8b.c

+4 −1
Original line number Diff line number Diff line
@@ -3684,13 +3684,16 @@ static void __init meson8b_clkc_init_common(struct device_node *np, 
			struct clk_hw_onecell_data *clk_hw_onecell_data)

{

	struct meson8b_clk_reset *rstc;

	struct device_node *parent_np;

	const char *notifier_clk_name;

	struct clk *notifier_clk;

	void __iomem *clk_base;

	struct regmap *map;

	int i, ret;



	map = syscon_node_to_regmap(of_get_parent(np));

	parent_np = of_get_parent(np);

	map = syscon_node_to_regmap(parent_np);

	of_node_put(parent_np);

	if (IS_ERR(map)) {

		pr_info("failed to get HHI regmap - Trying obsolete regs\n");