Commit 838c0a41 authored by Changhuang Liang's avatar Changhuang Liang Committed by Stephen Boyd
Browse files

clk: starfive: Make _clk_get become a common helper function 



Introduce num_reg to store the number of clocks, this helps to make
_clk_get become a common helper function which called jh71x0_clk_get().
With this, it helps to simplify the code and extend the code in the
future.

Signed-off-by: default avatarChanghuang Liang <changhuang.liang@starfivetech.com>
Link: https://lore.kernel.org/r/20250114081300.36600-1-changhuang.liang@starfivetech.com


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

drivers/clk/starfive/clk-starfive-jh7100-audio.c

+2 −12
Original line number Diff line number Diff line
@@ -84,17 +84,6 @@ static const struct jh71x0_clk_data jh7100_audclk_data[] = { 
		    JH7100_AUDCLK_AUDIO_12288),

};



static struct clk_hw *jh7100_audclk_get(struct of_phandle_args *clkspec, void *data)

{

	struct jh71x0_clk_priv *priv = data;

	unsigned int idx = clkspec->args[0];



	if (idx < JH7100_AUDCLK_END)

		return &priv->reg[idx].hw;



	return ERR_PTR(-EINVAL);

}



static int jh7100_audclk_probe(struct platform_device *pdev)

{

	struct jh71x0_clk_priv *priv;
@@ -106,6 +95,7 @@ static int jh7100_audclk_probe(struct platform_device *pdev) 
		return -ENOMEM;



	spin_lock_init(&priv->rmw_lock);

	priv->num_reg = JH7100_AUDCLK_END;

	priv->dev = &pdev->dev;

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))
@@ -146,7 +136,7 @@ static int jh7100_audclk_probe(struct platform_device *pdev) 
			return ret;

	}



	return devm_of_clk_add_hw_provider(priv->dev, jh7100_audclk_get, priv);

	return devm_of_clk_add_hw_provider(priv->dev, jh71x0_clk_get, priv);

}



static const struct of_device_id jh7100_audclk_match[] = {

drivers/clk/starfive/clk-starfive-jh7110-aon.c

+2 −12
Original line number Diff line number Diff line
@@ -54,17 +54,6 @@ static const struct jh71x0_clk_data jh7110_aonclk_data[] = { 
	JH71X0_GATE(JH7110_AONCLK_RTC_CAL, "rtc_cal", 0, JH7110_AONCLK_OSC),

};



static struct clk_hw *jh7110_aonclk_get(struct of_phandle_args *clkspec, void *data)

{

	struct jh71x0_clk_priv *priv = data;

	unsigned int idx = clkspec->args[0];



	if (idx < JH7110_AONCLK_END)

		return &priv->reg[idx].hw;



	return ERR_PTR(-EINVAL);

}



static int jh7110_aoncrg_probe(struct platform_device *pdev)

{

	struct jh71x0_clk_priv *priv;
@@ -78,6 +67,7 @@ static int jh7110_aoncrg_probe(struct platform_device *pdev) 
		return -ENOMEM;



	spin_lock_init(&priv->rmw_lock);

	priv->num_reg = JH7110_AONCLK_END;

	priv->dev = &pdev->dev;

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))
@@ -127,7 +117,7 @@ static int jh7110_aoncrg_probe(struct platform_device *pdev) 
			return ret;

	}



	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh7110_aonclk_get, priv);

	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh71x0_clk_get, priv);

	if (ret)

		return ret;

drivers/clk/starfive/clk-starfive-jh7110-isp.c

+2 −12
Original line number Diff line number Diff line
@@ -75,17 +75,6 @@ static inline int jh7110_isp_top_rst_init(struct jh71x0_clk_priv *priv) 
	return reset_control_deassert(top_rsts);

}



static struct clk_hw *jh7110_ispclk_get(struct of_phandle_args *clkspec, void *data)

{

	struct jh71x0_clk_priv *priv = data;

	unsigned int idx = clkspec->args[0];



	if (idx < JH7110_ISPCLK_END)

		return &priv->reg[idx].hw;



	return ERR_PTR(-EINVAL);

}



#ifdef CONFIG_PM

static int jh7110_ispcrg_suspend(struct device *dev)

{
@@ -126,6 +115,7 @@ static int jh7110_ispcrg_probe(struct platform_device *pdev) 
		return -ENOMEM;



	spin_lock_init(&priv->rmw_lock);

	priv->num_reg = JH7110_ISPCLK_END;

	priv->dev = &pdev->dev;

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))
@@ -186,7 +176,7 @@ static int jh7110_ispcrg_probe(struct platform_device *pdev) 
			goto err_exit;

	}



	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh7110_ispclk_get, priv);

	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh71x0_clk_get, priv);

	if (ret)

		goto err_exit;

drivers/clk/starfive/clk-starfive-jh7110-stg.c

+2 −12
Original line number Diff line number Diff line
@@ -75,17 +75,6 @@ static const struct jh71x0_clk_data jh7110_stgclk_data[] = { 
	JH71X0_GATE(JH7110_STGCLK_DMA1P_AHB, "dma1p_ahb", 0, JH7110_STGCLK_STG_AXIAHB),

};



static struct clk_hw *jh7110_stgclk_get(struct of_phandle_args *clkspec, void *data)

{

	struct jh71x0_clk_priv *priv = data;

	unsigned int idx = clkspec->args[0];



	if (idx < JH7110_STGCLK_END)

		return &priv->reg[idx].hw;



	return ERR_PTR(-EINVAL);

}



static int jh7110_stgcrg_probe(struct platform_device *pdev)

{

	struct jh71x0_clk_priv *priv;
@@ -98,6 +87,7 @@ static int jh7110_stgcrg_probe(struct platform_device *pdev) 
		return -ENOMEM;



	spin_lock_init(&priv->rmw_lock);

	priv->num_reg = JH7110_STGCLK_END;

	priv->dev = &pdev->dev;

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))
@@ -145,7 +135,7 @@ static int jh7110_stgcrg_probe(struct platform_device *pdev) 
			return ret;

	}



	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh7110_stgclk_get, priv);

	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh71x0_clk_get, priv);

	if (ret)

		return ret;

drivers/clk/starfive/clk-starfive-jh7110-sys.c

+2 −12
Original line number Diff line number Diff line
@@ -323,17 +323,6 @@ static const struct jh71x0_clk_data jh7110_sysclk_data[] __initconst = { 
		    JH7110_SYSCLK_OSC),

};



static struct clk_hw *jh7110_sysclk_get(struct of_phandle_args *clkspec, void *data)

{

	struct jh71x0_clk_priv *priv = data;

	unsigned int idx = clkspec->args[0];



	if (idx < JH7110_SYSCLK_END)

		return &priv->reg[idx].hw;



	return ERR_PTR(-EINVAL);

}



static void jh7110_reset_unregister_adev(void *_adev)

{

	struct auxiliary_device *adev = _adev;
@@ -425,6 +414,7 @@ static int __init jh7110_syscrg_probe(struct platform_device *pdev) 
		return -ENOMEM;



	spin_lock_init(&priv->rmw_lock);

	priv->num_reg = JH7110_SYSCLK_END;

	priv->dev = &pdev->dev;

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))
@@ -526,7 +516,7 @@ static int __init jh7110_syscrg_probe(struct platform_device *pdev) 
			return ret;

	}



	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh7110_sysclk_get, priv);

	ret = devm_of_clk_add_hw_provider(&pdev->dev, jh71x0_clk_get, priv);

	if (ret)

		return ret;