clk: mediatek: reset: Add new register reset function with device

mtk-rex-bc-chen · bebarino · commit 761bc64003e3 · 2022-06-15T17:24:13.000-07:00
Using device to register reset controller is a better implementation in current drivers. Howerver, some clock drviers of MediaTek only provide device_node. Therefore, we still remain the register reset function with device_node and add a new function with device to 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-11-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
@@ -66,7 +66,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701-g3d.c b/drivers/clk/mediatek/clk-mt2701-g3d.c
@@ -60,7 +60,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701-hif.c b/drivers/clk/mediatek/clk-mt2701-hif.c
@@ -65,7 +65,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_register_reset_controller(node, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
@@ -805,7 +805,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, &clk_rst_desc[0]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);
 
 	return 0;
 }
@@ -928,7 +928,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, &clk_rst_desc[1]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
@@ -1379,7 +1379,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, &clk_rst_desc[0]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);
 
 	return r;
 }
@@ -1401,7 +1401,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, &clk_rst_desc[1]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622-eth.c b/drivers/clk/mediatek/clk-mt7622-eth.c
@@ -90,7 +90,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622-hif.c b/drivers/clk/mediatek/clk-mt7622-hif.c
@@ -101,7 +101,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
@@ -123,7 +123,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
@@ -681,7 +681,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_register_reset_controller(node, &clk_rst_desc[0]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);
 
 	return 0;
 }
@@ -732,7 +732,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, &clk_rst_desc[1]);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);
 
 	return 0;
 }
diff --git a/drivers/clk/mediatek/clk-mt7629-eth.c b/drivers/clk/mediatek/clk-mt7629-eth.c
@@ -100,7 +100,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt7629-hif.c b/drivers/clk/mediatek/clk-mt7629-hif.c
@@ -96,7 +96,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
@@ -118,7 +118,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, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
@@ -1256,7 +1256,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_register_reset_controller(node, &clk_rst_desc);
+	mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
 
 	return r;
 }
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
@@ -169,4 +169,64 @@ int mtk_register_reset_controller(struct device_node *np,
 	return 0;
 }
 
+int mtk_register_reset_controller_with_dev(struct device *dev,
+					   const struct mtk_clk_rst_desc *desc)
+{
+	struct device_node *np = dev->of_node;
+	struct regmap *regmap;
+	const struct reset_control_ops *rcops = NULL;
+	struct mtk_clk_rst_data *data;
+	int ret;
+
+	if (!desc) {
+		dev_err(dev, "mtk clock reset desc is NULL\n");
+		return -EINVAL;
+	}
+
+	switch (desc->version) {
+	case MTK_RST_SIMPLE:
+		rcops = &mtk_reset_ops;
+		break;
+	case MTK_RST_SET_CLR:
+		rcops = &mtk_reset_ops_set_clr;
+		break;
+	default:
+		dev_err(dev, "Unknown reset version %d\n", desc->version);
+		return -EINVAL;
+	}
+
+	regmap = device_node_to_regmap(np);
+	if (IS_ERR(regmap)) {
+		dev_err(dev, "Cannot find regmap %pe\n", regmap);
+		return -EINVAL;
+	}
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	data->desc = desc;
+	data->regmap = regmap;
+	data->rcdev.owner = THIS_MODULE;
+	data->rcdev.ops = rcops;
+	data->rcdev.of_node = np;
+	data->rcdev.dev = dev;
+
+	if (data->desc->rst_idx_map_nr > 0) {
+		data->rcdev.of_reset_n_cells = 1;
+		data->rcdev.nr_resets = desc->rst_idx_map_nr;
+		data->rcdev.of_xlate = reset_xlate;
+	} else {
+		data->rcdev.nr_resets = desc->rst_bank_nr * RST_NR_PER_BANK;
+	}
+
+	ret = devm_reset_controller_register(dev, &data->rcdev);
+	if (ret) {
+		dev_err(dev, "could not register reset controller: %d\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/clk/mediatek/reset.h b/drivers/clk/mediatek/reset.h
@@ -62,4 +62,14 @@ struct mtk_clk_rst_data {
 int mtk_register_reset_controller(struct device_node *np,
 				  const struct mtk_clk_rst_desc *desc);
 
+/**
+ * mtk_register_reset_controller - Register mediatek clock reset controller with device
+ * @np: Pointer to device.
+ * @desc: Constant pointer to description of clock reset.
+ *
+ * Return: 0 on success and errorno otherwise.
+ */
+int mtk_register_reset_controller_with_dev(struct device *dev,
+					   const struct mtk_clk_rst_desc *desc);
+
 #endif /* __DRV_CLK_MTK_RESET_H */

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)`
`66`	`66`	`"could not register clock provider: %s: %d\n",`
`67`	`67`	`pdev->name, r);`
`68`	`68`
`69`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`69`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`70`	`70`
`71`	`71`	`return r;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)`
`60`	`60`	`"could not register clock provider: %s: %d\n",`
`61`	`61`	`pdev->name, r);`
`62`	`62`
`63`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`63`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`64`	`64`
`65`	`65`	`return r;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)`
`65`	`65`	`return r;`
`66`	`66`	`}`
`67`	`67`
`68`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`68`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`69`	`69`
`70`	`70`	`return 0;`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)`
`805`	`805`	`if (r)`
`806`	`806`	`return r;`
`807`	`807`
`808`		`- mtk_register_reset_controller(node, &clk_rst_desc[0]);`
	`808`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);`
`809`	`809`
`810`	`810`	`return 0;`
`811`	`811`	`}`
`@@ -928,7 +928,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)`
`928`	`928`	`if (r)`
`929`	`929`	`return r;`
`930`	`930`
`931`		`- mtk_register_reset_controller(node, &clk_rst_desc[1]);`
	`931`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);`
`932`	`932`
`933`	`933`	`return 0;`
`934`	`934`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1379,7 +1379,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)`
`1379`	`1379`	`pr_err("%s(): could not register clock provider: %d\n",`
`1380`	`1380`	`__func__, r);`
`1381`	`1381`
`1382`		`- mtk_register_reset_controller(node, &clk_rst_desc[0]);`
	`1382`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);`
`1383`	`1383`
`1384`	`1384`	`return r;`
`1385`	`1385`	`}`
`@@ -1401,7 +1401,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)`
`1401`	`1401`	`pr_err("%s(): could not register clock provider: %d\n",`
`1402`	`1402`	`__func__, r);`
`1403`	`1403`
`1404`		`- mtk_register_reset_controller(node, &clk_rst_desc[1]);`
	`1404`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);`
`1405`	`1405`
`1406`	`1406`	`return r;`
`1407`	`1407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)`
`90`	`90`	`"could not register clock provider: %s: %d\n",`
`91`	`91`	`pdev->name, r);`
`92`	`92`
`93`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`93`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`94`	`94`
`95`	`95`	`return r;`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)`
`101`	`101`	`"could not register clock provider: %s: %d\n",`
`102`	`102`	`pdev->name, r);`
`103`	`103`
`104`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`104`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`105`	`105`
`106`	`106`	`return r;`
`107`	`107`	`}`
`@@ -123,7 +123,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)`
`123`	`123`	`"could not register clock provider: %s: %d\n",`
`124`	`124`	`pdev->name, r);`
`125`	`125`
`126`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`126`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`127`	`127`
`128`	`128`	`return r;`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)`
`681`	`681`	`if (r)`
`682`	`682`	`return r;`
`683`	`683`
`684`		`- mtk_register_reset_controller(node, &clk_rst_desc[0]);`
	`684`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);`
`685`	`685`
`686`	`686`	`return 0;`
`687`	`687`	`}`
`@@ -732,7 +732,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)`
`732`	`732`
`733`	`733`	`clk_prepare_enable(clk_data->hws[CLK_PERI_UART0_PD]->clk);`
`734`	`734`
`735`		`- mtk_register_reset_controller(node, &clk_rst_desc[1]);`
	`735`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);`
`736`	`736`
`737`	`737`	`return 0;`
`738`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)`
`100`	`100`	`"could not register clock provider: %s: %d\n",`
`101`	`101`	`pdev->name, r);`
`102`	`102`
`103`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`103`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`104`	`104`
`105`	`105`	`return r;`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)`
`96`	`96`	`"could not register clock provider: %s: %d\n",`
`97`	`97`	`pdev->name, r);`
`98`	`98`
`99`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`99`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`100`	`100`
`101`	`101`	`return r;`
`102`	`102`	`}`
`@@ -118,7 +118,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)`
`118`	`118`	`"could not register clock provider: %s: %d\n",`
`119`	`119`	`pdev->name, r);`
`120`	`120`
`121`		`- mtk_register_reset_controller(node, &clk_rst_desc);`
	`121`	`+ mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);`
`122`	`122`
`123`	`123`	`return r;`
`124`	`124`	`}`