Commit 609cc5e1 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Stephen Boyd
Browse files

clk: mediatek: Replace 'struct clk' with 'struct clk_hw' 



As part of the effort to improve the MediaTek clk drivers, the next step
is to switch from the old 'struct clk' clk prodivder APIs to the new
'struct clk_hw' ones.

Instead of adding new APIs to the MediaTek clk driver library mirroring
the existing ones, moving all drivers to the new APIs, and then removing
the old ones, just migrate everything at the same time. This involves
replacing 'struct clk' with 'struct clk_hw', and 'struct clk_onecell_data'
with 'struct clk_hw_onecell_data', and fixing up all usages.

For now, the clk_register() and co. usage is retained, with __clk_get_hw()
and (struct clk_hw *)->clk used to bridge the difference between the APIs.
These will be replaced in subsequent patches.

Fix up mtk_{alloc,free}_clk_data to use 'struct clk_hw' by hand. Fix up
all other affected call sites with the following coccinelle script.

    // Replace type
    @@
    @@
    - struct clk_onecell_data
    + struct clk_hw_onecell_data

    // Replace of_clk_add_provider() & of_clk_src_simple_get()
    @@
    expression NP, DATA;
    symbol of_clk_src_onecell_get;
    @@
    - of_clk_add_provider(
    + of_clk_add_hw_provider(
	    NP,
    -	of_clk_src_onecell_get,
    +	of_clk_hw_onecell_get,
	    DATA
      )

    // Fix register/unregister
    @@
    identifier CD;
    expression E;
    identifier fn =~ "unregister";
    @@
      fn(...,
    -    CD->clks[E]
    +    CD->hws[E]->clk
	 ,...
	);

    // Fix calls to clk_prepare_enable()
    @@
    identifier CD;
    expression E;
    @@
      clk_prepare_enable(
    - 		     CD->clks[E]
    + 		     CD->hws[E]->clk
      );

    // Fix pointer assignment
    @@
    identifier CD;
    identifier CLK;
    expression E;
    @@
    - CD->clks[E]
    + CD->hws[E]
      =
    (
    - CLK
    + __clk_get_hw(CLK)
    |
      ERR_PTR(...)
    )
      ;

    // Fix pointer usage
    @@
    identifier CD;
    expression E;
    @@
    - CD->clks[E]
    + CD->hws[E]

    // Fix mtk_clk_pll_get_base()
    @@
    symbol clk, hw, data;
    @@
      mtk_clk_pll_get_base(
    - 		       struct clk *clk,
    + 		       struct clk_hw *hw,
			   const struct mtk_pll_data *data
      ) {
    - struct clk_hw *hw = __clk_get_hw(clk);
      ...
      }

    // Fix mtk_clk_pll_get_base() usage
    @@
    identifier CD;
    expression E;
    @@
      mtk_clk_pll_get_base(
    -    CD->clks[E]
    +    CD->hws[E]->clk
	 ,...
      );

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


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 012715ad

drivers/clk/mediatek/clk-cpumux.c

+10 −10
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void mtk_clk_unregister_cpumux(struct clk *clk) 


int mtk_clk_register_cpumuxes(struct device_node *node,

			      const struct mtk_composite *clks, int num,

			      struct clk_onecell_data *clk_data)

			      struct clk_hw_onecell_data *clk_data)

{

	int i;

	struct clk *clk;
@@ -120,7 +120,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
	for (i = 0; i < num; i++) {

		const struct mtk_composite *mux = &clks[i];



		if (!IS_ERR_OR_NULL(clk_data->clks[mux->id])) {

		if (!IS_ERR_OR_NULL(clk_data->hws[mux->id])) {

			pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",

				node, mux->id);

			continue;
@@ -132,7 +132,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
			goto err;

		}



		clk_data->clks[mux->id] = clk;

		clk_data->hws[mux->id] = __clk_get_hw(clk);

	}



	return 0;
@@ -141,29 +141,29 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
	while (--i >= 0) {

		const struct mtk_composite *mux = &clks[i];



		if (IS_ERR_OR_NULL(clk_data->clks[mux->id]))

		if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))

			continue;



		mtk_clk_unregister_cpumux(clk_data->clks[mux->id]);

		clk_data->clks[mux->id] = ERR_PTR(-ENOENT);

		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]->clk);

		clk_data->hws[mux->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

}



void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num,

				 struct clk_onecell_data *clk_data)

				 struct clk_hw_onecell_data *clk_data)

{

	int i;



	for (i = num; i > 0; i--) {

		const struct mtk_composite *mux = &clks[i - 1];



		if (IS_ERR_OR_NULL(clk_data->clks[mux->id]))

		if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))

			continue;



		mtk_clk_unregister_cpumux(clk_data->clks[mux->id]);

		clk_data->clks[mux->id] = ERR_PTR(-ENOENT);

		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]->clk);

		clk_data->hws[mux->id] = ERR_PTR(-ENOENT);

	}

}

drivers/clk/mediatek/clk-cpumux.h

+3 −3
Original line number Diff line number Diff line
@@ -7,15 +7,15 @@ 
#ifndef __DRV_CLK_CPUMUX_H

#define __DRV_CLK_CPUMUX_H



struct clk_onecell_data;

struct clk_hw_onecell_data;

struct device_node;

struct mtk_composite;



int mtk_clk_register_cpumuxes(struct device_node *node,

			      const struct mtk_composite *clks, int num,

			      struct clk_onecell_data *clk_data);

			      struct clk_hw_onecell_data *clk_data);



void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num,

				 struct clk_onecell_data *clk_data);

				 struct clk_hw_onecell_data *clk_data);



#endif /* __DRV_CLK_CPUMUX_H */

drivers/clk/mediatek/clk-gate.c

+11 −11
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void mtk_clk_unregister_gate(struct clk *clk) 


int mtk_clk_register_gates_with_dev(struct device_node *node,

				    const struct mtk_gate *clks, int num,

				    struct clk_onecell_data *clk_data,

				    struct clk_hw_onecell_data *clk_data,

				    struct device *dev)

{

	int i;
@@ -224,7 +224,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
	for (i = 0; i < num; i++) {

		const struct mtk_gate *gate = &clks[i];



		if (!IS_ERR_OR_NULL(clk_data->clks[gate->id])) {

		if (!IS_ERR_OR_NULL(clk_data->hws[gate->id])) {

			pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",

				node, gate->id);

			continue;
@@ -243,7 +243,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
			goto err;

		}



		clk_data->clks[gate->id] = clk;

		clk_data->hws[gate->id] = __clk_get_hw(clk);

	}



	return 0;
@@ -252,11 +252,11 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
	while (--i >= 0) {

		const struct mtk_gate *gate = &clks[i];



		if (IS_ERR_OR_NULL(clk_data->clks[gate->id]))

		if (IS_ERR_OR_NULL(clk_data->hws[gate->id]))

			continue;



		mtk_clk_unregister_gate(clk_data->clks[gate->id]);

		clk_data->clks[gate->id] = ERR_PTR(-ENOENT);

		mtk_clk_unregister_gate(clk_data->hws[gate->id]->clk);

		clk_data->hws[gate->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);
@@ -264,14 +264,14 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 


int mtk_clk_register_gates(struct device_node *node,

			   const struct mtk_gate *clks, int num,

			   struct clk_onecell_data *clk_data)

			   struct clk_hw_onecell_data *clk_data)

{

	return mtk_clk_register_gates_with_dev(node, clks, num, clk_data, NULL);

}

EXPORT_SYMBOL_GPL(mtk_clk_register_gates);



void mtk_clk_unregister_gates(const struct mtk_gate *clks, int num,

			      struct clk_onecell_data *clk_data)

			      struct clk_hw_onecell_data *clk_data)

{

	int i;
@@ -281,11 +281,11 @@ void mtk_clk_unregister_gates(const struct mtk_gate *clks, int num, 
	for (i = num; i > 0; i--) {

		const struct mtk_gate *gate = &clks[i - 1];



		if (IS_ERR_OR_NULL(clk_data->clks[gate->id]))

		if (IS_ERR_OR_NULL(clk_data->hws[gate->id]))

			continue;



		mtk_clk_unregister_gate(clk_data->clks[gate->id]);

		clk_data->clks[gate->id] = ERR_PTR(-ENOENT);

		mtk_clk_unregister_gate(clk_data->hws[gate->id]->clk);

		clk_data->hws[gate->id] = ERR_PTR(-ENOENT);

	}

}

EXPORT_SYMBOL_GPL(mtk_clk_unregister_gates);

drivers/clk/mediatek/clk-gate.h

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/types.h>



struct clk;

struct clk_onecell_data;

struct clk_hw_onecell_data;

struct clk_ops;

struct device;

struct device_node;
@@ -52,14 +52,14 @@ struct mtk_gate { 


int mtk_clk_register_gates(struct device_node *node,

			   const struct mtk_gate *clks, int num,

			   struct clk_onecell_data *clk_data);

			   struct clk_hw_onecell_data *clk_data);



int mtk_clk_register_gates_with_dev(struct device_node *node,

				    const struct mtk_gate *clks, int num,

				    struct clk_onecell_data *clk_data,

				    struct clk_hw_onecell_data *clk_data,

				    struct device *dev);



void mtk_clk_unregister_gates(const struct mtk_gate *clks, int num,

			      struct clk_onecell_data *clk_data);

			      struct clk_hw_onecell_data *clk_data);



#endif /* __DRV_CLK_GATE_H */

drivers/clk/mediatek/clk-mt2701-aud.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static const struct of_device_id of_match_clk_mt2701_aud[] = { 


static int clk_mt2701_aud_probe(struct platform_device *pdev)

{

	struct clk_onecell_data *clk_data;

	struct clk_hw_onecell_data *clk_data;

	struct device_node *node = pdev->dev.of_node;

	int r;
@@ -154,7 +154,7 @@ static int clk_mt2701_aud_probe(struct platform_device *pdev) 
	mtk_clk_register_gates(node, audio_clks, ARRAY_SIZE(audio_clks),

			       clk_data);



	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);

	if (r) {

		dev_err(&pdev->dev,

			"could not register clock provider: %s: %d\n",