Commit f0b3140f authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Stephen Boyd
Browse files

clk: mediatek: cpumux: Propagate struct device where possible 



Take a pointer to a struct device in mtk_clk_register_cpumuxes() and
propagate the same to mtk_clk_register_cpumux() => clk_hw_register().
Even though runtime pm is unlikely to be used with CPU muxes, this
helps with code consistency and possibly opens to commonization of
some mtk_clk_register_(x) functions.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
Tested-by: default avatarMiles Chen <miles.chen@mediatek.com>
Link: https://lore.kernel.org/r/20230120092053.182923-5-angelogioacchino.delregno@collabora.com


Tested-by: default avatarMingming Su <mingming.su@mediatek.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 20498d52

drivers/clk/mediatek/clk-cpumux.c

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static const struct clk_ops clk_cpumux_ops = { 
};



static struct clk_hw *

mtk_clk_register_cpumux(const struct mtk_composite *mux,

mtk_clk_register_cpumux(struct device *dev, const struct mtk_composite *mux,

			struct regmap *regmap)

{

	struct mtk_clk_cpumux *cpumux;
@@ -81,7 +81,7 @@ mtk_clk_register_cpumux(const struct mtk_composite *mux, 
	cpumux->regmap = regmap;

	cpumux->hw.init = &init;



	ret = clk_hw_register(NULL, &cpumux->hw);

	ret = clk_hw_register(dev, &cpumux->hw);

	if (ret) {

		kfree(cpumux);

		return ERR_PTR(ret);
@@ -102,7 +102,7 @@ static void mtk_clk_unregister_cpumux(struct clk_hw *hw) 
	kfree(cpumux);

}



int mtk_clk_register_cpumuxes(struct device_node *node,

int mtk_clk_register_cpumuxes(struct device *dev, struct device_node *node,

			      const struct mtk_composite *clks, int num,

			      struct clk_hw_onecell_data *clk_data)

{
@@ -125,7 +125,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
			continue;

		}



		hw = mtk_clk_register_cpumux(mux, regmap);

		hw = mtk_clk_register_cpumux(dev, mux, regmap);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", mux->name,

			       hw);

drivers/clk/mediatek/clk-cpumux.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct clk_hw_onecell_data; 
struct device_node;

struct mtk_composite;



int mtk_clk_register_cpumuxes(struct device_node *node,

int mtk_clk_register_cpumuxes(struct device *dev, struct device_node *node,

			      const struct mtk_composite *clks, int num,

			      struct clk_hw_onecell_data *clk_data);

drivers/clk/mediatek/clk-mt2701.c

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static void __init mtk_infrasys_init_early(struct device_node *node) 
	mtk_clk_register_factors(infra_fixed_divs, ARRAY_SIZE(infra_fixed_divs),

						infra_clk_data);



	mtk_clk_register_cpumuxes(node, cpu_muxes, ARRAY_SIZE(cpu_muxes),

	mtk_clk_register_cpumuxes(NULL, node, cpu_muxes, ARRAY_SIZE(cpu_muxes),

				  infra_clk_data);



	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get,

drivers/clk/mediatek/clk-mt6795-infracfg.c

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ static int clk_mt6795_infracfg_probe(struct platform_device *pdev) 
	if (ret)

		goto free_clk_data;



	ret = mtk_clk_register_cpumuxes(node, cpu_muxes, ARRAY_SIZE(cpu_muxes), clk_data);

	ret = mtk_clk_register_cpumuxes(&pdev->dev, node, cpu_muxes,

					ARRAY_SIZE(cpu_muxes), clk_data);

	if (ret)

		goto unregister_gates;

drivers/clk/mediatek/clk-mt7622.c

+2 −2
Original line number Diff line number Diff line
@@ -673,8 +673,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) 
	mtk_clk_register_gates(&pdev->dev, node, infra_clks,

			       ARRAY_SIZE(infra_clks), clk_data);



	mtk_clk_register_cpumuxes(node, infra_muxes, ARRAY_SIZE(infra_muxes),

				  clk_data);

	mtk_clk_register_cpumuxes(&pdev->dev, node, infra_muxes,

				  ARRAY_SIZE(infra_muxes), clk_data);



	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get,

				   clk_data);