clk: mediatek: reset: Merge and revise reset register function

mtk-rex-bc-chen · bebarino · commit 370bf6286969 · 2022-06-15T17:24:12.000-07:00
There are two versions for clock reset register control for MediaTek SoCs. The old hardware is one bit per reset control, and does not have separate registers for bit set, clear and read-back operations. This matches the scheme supported by the simple reset driver. However, because we need to use different data structure from reset_simple_data, we can not use the operation of simple reset driver. For this reason, we keep the original functions and name this version as "MTK_RST_SIMPLE". In this patch: - Add a version enumeration to separate different reset hardware. - Merge the reset register function of simple and set_clr into one function "mtk_register_reset_controller". - Rename input variable "num_regs" to "rst_bank_nr" to avoid confusion. This variable is used to define the quantity of reset bank. - Document mtk_reset_version and mtk_register_reset_controller. Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Link: https://lore.kernel.org/r/20220523093346.28493-6-rex-bc.chen@mediatek.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
diff --git a/drivers/clk/mediatek/clk-mt2701-eth.c b/drivers/clk/mediatek/clk-mt2701-eth.c
@@ -58,7 +58,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701-g3d.c b/drivers/clk/mediatek/clk-mt2701-g3d.c
@@ -52,7 +52,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0xc);
+	mtk_register_reset_controller(node, 1, 0xc, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701-hif.c b/drivers/clk/mediatek/clk-mt2701-hif.c
@@ -57,7 +57,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
@@ -787,7 +787,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, 2, 0x30);
+	mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);
 
 	return 0;
 }
@@ -910,7 +910,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, 2, 0x0);
+	mtk_register_reset_controller(node, 2, 0x0, MTK_RST_SIMPLE);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
@@ -1361,7 +1361,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0x30);
+	mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);
 
 	return r;
 }
@@ -1383,7 +1383,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0);
+	mtk_register_reset_controller(node, 2, 0, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622-eth.c b/drivers/clk/mediatek/clk-mt7622-eth.c
@@ -82,7 +82,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622-hif.c b/drivers/clk/mediatek/clk-mt7622-hif.c
@@ -93,7 +93,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
@@ -115,7 +115,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
@@ -663,7 +663,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, 1, 0x30);
+	mtk_register_reset_controller(node, 1, 0x30, MTK_RST_SIMPLE);
 
 	return 0;
 }
@@ -714,7 +714,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
 
 	clk_prepare_enable(clk_data->hws[CLK_PERI_UART0_PD]->clk);
 
-	mtk_register_reset_controller(node, 2, 0x0);
+	mtk_register_reset_controller(node, 2, 0x0, MTK_RST_SIMPLE);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt7629-eth.c b/drivers/clk/mediatek/clk-mt7629-eth.c
@@ -92,7 +92,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7629-hif.c b/drivers/clk/mediatek/clk-mt7629-hif.c
@@ -88,7 +88,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
@@ -110,7 +110,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)
 			"could not register clock provider: %s: %d\n",
 			pdev->name, r);
 
-	mtk_register_reset_controller(node, 1, 0x34);
+	mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt8135.c b/drivers/clk/mediatek/clk-mt8135.c
@@ -559,7 +559,7 @@ static void __init mtk_infrasys_init(struct device_node *node)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0x30);
+	mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);
 }
 CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8135-infracfg", mtk_infrasys_init);
 
@@ -587,7 +587,7 @@ static void __init mtk_pericfg_init(struct device_node *node)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0);
+	mtk_register_reset_controller(node, 2, 0, MTK_RST_SIMPLE);
 }
 CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8135-pericfg", mtk_pericfg_init);
 
diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c
@@ -882,7 +882,7 @@ static void __init mtk_infrasys_init(struct device_node *node)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0x30);
+	mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);
 }
 CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8173-infracfg", mtk_infrasys_init);
 
@@ -910,7 +910,7 @@ static void __init mtk_pericfg_init(struct device_node *node)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
 
-	mtk_register_reset_controller(node, 2, 0);
+	mtk_register_reset_controller(node, 2, 0, MTK_RST_SIMPLE);
 }
 CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8173-pericfg", mtk_pericfg_init);
 
diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
@@ -1240,7 +1240,8 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_register_reset_controller_set_clr(node, 4, INFRA_RST0_SET_OFFSET);
+	mtk_register_reset_controller(node, 4,
+				      INFRA_RST0_SET_OFFSET, MTK_RST_SET_CLR);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
@@ -92,14 +92,26 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = {
 	.reset = mtk_reset_set_clr,
 };
 
-static void mtk_register_reset_controller_common(struct device_node *np,
-						 unsigned int num_regs,
-						 int regofs,
-						 const struct reset_control_ops *reset_ops)
+void mtk_register_reset_controller(struct device_node *np,
+				   u32 rst_bank_nr, u16 reg_ofs,
+				   enum mtk_reset_version version)
 {
 	struct mtk_reset *data;
 	int ret;
 	struct regmap *regmap;
+	const struct reset_control_ops *rcops = NULL;
+
+	switch (version) {
+	case MTK_RST_SIMPLE:
+		rcops = &mtk_reset_ops;
+		break;
+	case MTK_RST_SET_CLR:
+		rcops = &mtk_reset_ops_set_clr;
+		break;
+	default:
+		pr_err("Unknown reset version %d\n", version);
+		return;
+	}
 
 	regmap = device_node_to_regmap(np);
 	if (IS_ERR(regmap)) {
@@ -112,32 +124,17 @@ static void mtk_register_reset_controller_common(struct device_node *np,
 		return;
 
 	data->regmap = regmap;
-	data->regofs = regofs;
+	data->regofs = reg_ofs;
 	data->rcdev.owner = THIS_MODULE;
-	data->rcdev.nr_resets = num_regs * 32;
-	data->rcdev.ops = reset_ops;
+	data->rcdev.nr_resets = rst_bank_nr * 32;
+	data->rcdev.ops = rcops;
 	data->rcdev.of_node = np;
 
 	ret = reset_controller_register(&data->rcdev);
 	if (ret) {
 		pr_err("could not register reset controller: %d\n", ret);
 		kfree(data);
-		return;
 	}
 }
 
-void mtk_register_reset_controller(struct device_node *np,
-				   unsigned int num_regs, int regofs)
-{
-	mtk_register_reset_controller_common(np, num_regs, regofs,
-					     &mtk_reset_ops);
-}
-
-void mtk_register_reset_controller_set_clr(struct device_node *np,
-					   unsigned int num_regs, int regofs)
-{
-	mtk_register_reset_controller_common(np, num_regs, regofs,
-					     &mtk_reset_ops_set_clr);
-}
-
 MODULE_LICENSE("GPL");
diff --git a/drivers/clk/mediatek/reset.h b/drivers/clk/mediatek/reset.h
@@ -9,16 +9,33 @@
 #include <linux/reset-controller.h>
 #include <linux/types.h>
 
+/**
+ * enum mtk_reset_version - Version of MediaTek clock reset controller.
+ * @MTK_RST_SIMPLE: Use the same registers for bit set and clear.
+ * @MTK_RST_SET_CLR: Use separate registers for bit set and clear.
+ * @MTK_RST_MAX: Total quantity of version for MediaTek clock reset controller.
+ */
+enum mtk_reset_version {
+	MTK_RST_SIMPLE = 0,
+	MTK_RST_SET_CLR,
+	MTK_RST_MAX,
+};
+
 struct mtk_reset {
 	struct regmap *regmap;
 	int regofs;
 	struct reset_controller_dev rcdev;
 };
 
+/**
+ * mtk_register_reset_controller - Register MediaTek clock reset controller
+ * @np: Pointer to device node.
+ * @rst_bank_nr: Quantity of reset bank.
+ * @reg_ofs: Base offset of the reset register.
+ * @version: Version of MediaTek clock reset controller.
+ */
 void mtk_register_reset_controller(struct device_node *np,
-				   unsigned int num_regs, int regofs);
-
-void mtk_register_reset_controller_set_clr(struct device_node *np,
-					   unsigned int num_regs, int regofs);
+				   u32 rst_bank_nr, u16 reg_ofs,
+				   enum mtk_reset_version version);
 
 #endif /* __DRV_CLK_MTK_RESET_H */

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)`
`58`	`58`	`"could not register clock provider: %s: %d\n",`
`59`	`59`	`pdev->name, r);`
`60`	`60`
`61`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`61`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`62`	`62`
`63`	`63`	`return r;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)`
`52`	`52`	`"could not register clock provider: %s: %d\n",`
`53`	`53`	`pdev->name, r);`
`54`	`54`
`55`		`- mtk_register_reset_controller(node, 1, 0xc);`
	`55`	`+ mtk_register_reset_controller(node, 1, 0xc, MTK_RST_SIMPLE);`
`56`	`56`
`57`	`57`	`return r;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)`
`57`	`57`	`return r;`
`58`	`58`	`}`
`59`	`59`
`60`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`60`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`61`	`61`
`62`	`62`	`return 0;`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)`
`787`	`787`	`if (r)`
`788`	`788`	`return r;`
`789`	`789`
`790`		`- mtk_register_reset_controller(node, 2, 0x30);`
	`790`	`+ mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);`
`791`	`791`
`792`	`792`	`return 0;`
`793`	`793`	`}`
`@@ -910,7 +910,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)`
`910`	`910`	`if (r)`
`911`	`911`	`return r;`
`912`	`912`
`913`		`- mtk_register_reset_controller(node, 2, 0x0);`
	`913`	`+ mtk_register_reset_controller(node, 2, 0x0, MTK_RST_SIMPLE);`
`914`	`914`
`915`	`915`	`return 0;`
`916`	`916`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1361,7 +1361,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)`
`1361`	`1361`	`pr_err("%s(): could not register clock provider: %d\n",`
`1362`	`1362`	`__func__, r);`
`1363`	`1363`
`1364`		`- mtk_register_reset_controller(node, 2, 0x30);`
	`1364`	`+ mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);`
`1365`	`1365`
`1366`	`1366`	`return r;`
`1367`	`1367`	`}`
`@@ -1383,7 +1383,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)`
`1383`	`1383`	`pr_err("%s(): could not register clock provider: %d\n",`
`1384`	`1384`	`__func__, r);`
`1385`	`1385`
`1386`		`- mtk_register_reset_controller(node, 2, 0);`
	`1386`	`+ mtk_register_reset_controller(node, 2, 0, MTK_RST_SIMPLE);`
`1387`	`1387`
`1388`	`1388`	`return r;`
`1389`	`1389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)`
`82`	`82`	`"could not register clock provider: %s: %d\n",`
`83`	`83`	`pdev->name, r);`
`84`	`84`
`85`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`85`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`86`	`86`
`87`	`87`	`return r;`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)`
`93`	`93`	`"could not register clock provider: %s: %d\n",`
`94`	`94`	`pdev->name, r);`
`95`	`95`
`96`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`96`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`97`	`97`
`98`	`98`	`return r;`
`99`	`99`	`}`
`@@ -115,7 +115,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)`
`115`	`115`	`"could not register clock provider: %s: %d\n",`
`116`	`116`	`pdev->name, r);`
`117`	`117`
`118`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`118`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`119`	`119`
`120`	`120`	`return r;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)`
`663`	`663`	`if (r)`
`664`	`664`	`return r;`
`665`	`665`
`666`		`- mtk_register_reset_controller(node, 1, 0x30);`
	`666`	`+ mtk_register_reset_controller(node, 1, 0x30, MTK_RST_SIMPLE);`
`667`	`667`
`668`	`668`	`return 0;`
`669`	`669`	`}`
`@@ -714,7 +714,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)`
`714`	`714`
`715`	`715`	`clk_prepare_enable(clk_data->hws[CLK_PERI_UART0_PD]->clk);`
`716`	`716`
`717`		`- mtk_register_reset_controller(node, 2, 0x0);`
	`717`	`+ mtk_register_reset_controller(node, 2, 0x0, MTK_RST_SIMPLE);`
`718`	`718`
`719`	`719`	`return 0;`
`720`	`720`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)`
`92`	`92`	`"could not register clock provider: %s: %d\n",`
`93`	`93`	`pdev->name, r);`
`94`	`94`
`95`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`95`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`96`	`96`
`97`	`97`	`return r;`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)`
`88`	`88`	`"could not register clock provider: %s: %d\n",`
`89`	`89`	`pdev->name, r);`
`90`	`90`
`91`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`91`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`92`	`92`
`93`	`93`	`return r;`
`94`	`94`	`}`
`@@ -110,7 +110,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)`
`110`	`110`	`"could not register clock provider: %s: %d\n",`
`111`	`111`	`pdev->name, r);`
`112`	`112`
`113`		`- mtk_register_reset_controller(node, 1, 0x34);`
	`113`	`+ mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);`
`114`	`114`
`115`	`115`	`return r;`
`116`	`116`	`}`