clk: mediatek: remove mtk_common_clk_infrasys_init()

Remove mtk_common_clk_infrasys_init() and replace callers with
mtk_common_clk_init() as there is no longer any difference between
these functions.

Link: https://patch.msgid.link/20260710-mtk-clk-parent-lookup-improvements-v2-20-f3f3a4a28dca@baylibre.com
Signed-off-by: David Lechner <dlechner@baylibre.com>

diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index aba870bf0f3713140ef4a7eaabcf7ee5f5b2a320..6cee27e2df9165aa050bda15798a2771a53ae1ed 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -699,12 +699,12 @@ static int mt7622_topckgen_probe(struct udevice *dev)
 
 static int mt7622_infracfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7622_infra_clk_tree);
+       return mtk_common_clk_init(dev, &mt7622_infra_clk_tree);
 }
 
 static int mt7622_pericfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7622_peri_clk_tree);
+       return mtk_common_clk_init(dev, &mt7622_peri_clk_tree);
 }
 
 static int mt7622_pciesys_probe(struct udevice *dev)

diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c
index 348b8c1e85f96af9d762b8ce0b15926273d5398a..38351e5c5d9576e52c64a901228e25142367cc7b 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7623.c
+++ b/drivers/clk/mediatek/clk-mt7623.c
@@ -1090,7 +1090,7 @@ static const struct mtk_clk_tree mt7623_clk_peri_tree = {
 
 static int mt7623_pericfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7623_clk_peri_tree);
+       return mtk_common_clk_init(dev, &mt7623_clk_peri_tree);
 }
 
 static int mt7623_hifsys_probe(struct udevice *dev)

diff --git a/drivers/clk/mediatek/clk-mt7981.c b/drivers/clk/mediatek/clk-mt7981.c
index 23d34a315fb95d3737f5424c7fdaf38e08e76972..debee21fcc5918809a94c491013992e70c6db9f9 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7981.c
+++ b/drivers/clk/mediatek/clk-mt7981.c
@@ -716,7 +716,7 @@ static const struct udevice_id mt7981_infracfg_compat[] = {
 
 static int mt7981_infracfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7981_infracfg_clk_tree);
+       return mtk_common_clk_init(dev, &mt7981_infracfg_clk_tree);
 }
 
 U_BOOT_DRIVER(mtk_clk_infracfg) = {

diff --git a/drivers/clk/mediatek/clk-mt7986.c b/drivers/clk/mediatek/clk-mt7986.c
index a5301fbe8cf439de1ead9857dd2af67fd05ea288..5f40b782f4d2a331578587c15dfdddb9d09fc0d5 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7986.c
+++ b/drivers/clk/mediatek/clk-mt7986.c
@@ -624,7 +624,7 @@ static const struct udevice_id mt7986_infracfg_compat[] = {
 
 static int mt7986_infracfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7986_infracfg_clk_tree);
+       return mtk_common_clk_init(dev, &mt7986_infracfg_clk_tree);
 }
 
 U_BOOT_DRIVER(mtk_clk_infracfg) = {

diff --git a/drivers/clk/mediatek/clk-mt7987.c b/drivers/clk/mediatek/clk-mt7987.c
index 27367de82ff14efc159017f59933838b86fefcf8..b45cd5106b4cede00ad702b1f333ee32f27db365 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7987.c
+++ b/drivers/clk/mediatek/clk-mt7987.c
@@ -803,7 +803,7 @@ static const struct udevice_id mt7987_infracfg_compat[] = {
 
 static int mt7987_infracfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7987_infracfg_clk_tree);
+       return mtk_common_clk_init(dev, &mt7987_infracfg_clk_tree);
 }
 
 U_BOOT_DRIVER(mtk_clk_infracfg) = {

diff --git a/drivers/clk/mediatek/clk-mt7988.c b/drivers/clk/mediatek/clk-mt7988.c
index 309b6e03ceb8b31aacab63b6af6201a42ef7477f..011dbc8e7aabb2e8af42ca882025e53400a45110 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7988.c
+++ b/drivers/clk/mediatek/clk-mt7988.c
@@ -900,7 +900,7 @@ static const struct udevice_id mt7988_infracfg_compat[] = {
 
 static int mt7988_infracfg_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt7988_infracfg_clk_tree);
+       return mtk_common_clk_init(dev, &mt7988_infracfg_clk_tree);
 }
 
 U_BOOT_DRIVER(mtk_clk_infracfg) = {

diff --git a/drivers/clk/mediatek/clk-mt8189.c b/drivers/clk/mediatek/clk-mt8189.c
index 25b88198fd85a4cc17b28d47c0a706deafb63669..c8804583b322b7535fac9041d5ceb935c003397b 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8189.c
+++ b/drivers/clk/mediatek/clk-mt8189.c
@@ -2031,7 +2031,7 @@ static int mt8189_topckgen_probe(struct udevice *dev)
 
 static int mt8189_infrasys_probe(struct udevice *dev)
 {
-       return mtk_common_clk_infrasys_init(dev, &mt8189_vlpckgen_clk_tree);
+       return mtk_common_clk_init(dev, &mt8189_vlpckgen_clk_tree);
 }
 
 static int mt8189_clk_gate_probe(struct udevice *dev)

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 52d3428438afcdde60f2ef76f5a8a69c226fbca5..61d718f162dd0bc4434994e9fd1cca72b93fad8b 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -1200,12 +1200,6 @@ int mtk_common_clk_init(struct udevice *dev, const struct mtk_clk_tree *tree)
        return mtk_clk_tree_register_provider(dev, tree);
 }
 
-int mtk_common_clk_infrasys_init(struct udevice *dev,
-                                const struct mtk_clk_tree *tree)
-{
-       return mtk_common_clk_init(dev, tree);
-}
-
 int mtk_common_clk_gate_init(struct udevice *dev,
                             const struct mtk_clk_tree *tree,
                             const struct mtk_gate *gates, int num_gates,

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 2993dc35efb5fe8c21e5ec0e6e559db390d55299..437797dd0df9ea831958b1fa36fe5c6f5f2f5e17 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -301,8 +301,6 @@ extern const struct clk_ops mtk_clk_gate_ops;
 int mtk_common_clk_parent_bind(struct udevice *dev);
 int mtk_common_clk_init(struct udevice *dev,
                        const struct mtk_clk_tree *tree);
-int mtk_common_clk_infrasys_init(struct udevice *dev,
-                                const struct mtk_clk_tree *tree);
 int mtk_common_clk_gate_init(struct udevice *dev,
                             const struct mtk_clk_tree *tree,
                             const struct mtk_gate *gates, int num_gates,