clk: mediatek: reset: Revise structure to control reset register

To declare the reset data easier, we add a strucure to do this instead
of using many input variables to mtk_register_reset_controller().

- Add mtk_clk_rst_desc to define the reset description when registering
  the reset controller.
- Rename "mtk_reset" to "mtk_clk_rst_data". We use it to store data of
  reset controller.
- Document mtk_clk_rst_desc and mtk_clk_rst_data.
- Modify the documentation of mtk_register_reset_controller.
- Extract container_of in update functions to to_mtk_clk_rst_data().

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-7-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
index 579343e0bba6b83d44b64da4fad813214b91309a..270d15ce58bfd0fe962bef8f3bae343e8562cd4c 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701-eth.c
+++ b/drivers/clk/mediatek/clk-mt2701-eth.c
@@ -36,6 +36,12 @@ static const struct mtk_gate eth_clks[] = {
        GATE_ETH(CLK_ETHSYS_CRYPTO, "crypto_clk", "ethif_sel", 29),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static const struct of_device_id of_match_clk_mt2701_eth[] = {
        { .compatible = "mediatek,mt2701-ethsys", },
        {}
@@ -58,7 +64,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt2701-g3d.c b/drivers/clk/mediatek/clk-mt2701-g3d.c
index bd77ed25b1019dc0fa5db7ba0f942402ad12ab9c..9cfd589939e5c93e67358dec38039fb09aa56aef 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701-g3d.c
+++ b/drivers/clk/mediatek/clk-mt2701-g3d.c
@@ -35,6 +35,12 @@ static const struct mtk_gate g3d_clks[] = {
        GATE_G3D(CLK_G3DSYS_CORE, "g3d_core", "mfg_sel", 0),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0xc,
+};
+
 static int clk_mt2701_g3dsys_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -52,7 +58,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt2701-hif.c b/drivers/clk/mediatek/clk-mt2701-hif.c
index ae3849b58db8158efaa87cb9638b436cc7ca3dce..a6b812fcc9222e81a4008377ecc72f158d7ef0cc 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701-hif.c
+++ b/drivers/clk/mediatek/clk-mt2701-hif.c
@@ -33,6 +33,12 @@ static const struct mtk_gate hif_clks[] = {
        GATE_HIF(CLK_HIFSYS_PCIE2, "pcie2_clk", "ethpll_500m_ck", 26),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static const struct of_device_id of_match_clk_mt2701_hif[] = {
        { .compatible = "mediatek,mt2701-hifsys", },
        {}
@@ -57,7 +63,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)
                return r;
        }
 
-       mtk_register_reset_controller(node, 1, 0x34, MTK_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return 0;
 }

diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
index 18f90657a6439580af4baa37805b60923e95b4db..f165126232d300fd0fcba9884191f250b0fc24ae 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701.c
+++ b/drivers/clk/mediatek/clk-mt2701.c
@@ -735,6 +735,21 @@ static const struct mtk_fixed_factor infra_fixed_divs[] = {
        FACTOR(CLK_INFRA_CLK_13M, "clk13m", "clk26m", 1, 2),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc[] = {
+       /* infrasys */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x30,
+       },
+       /* pericfg */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x0,
+       },
+};
+
 static struct clk_hw_onecell_data *infra_clk_data;
 
 static void __init mtk_infrasys_init_early(struct device_node *node)
@@ -787,7 +802,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
        if (r)
                return r;
 
-       mtk_register_reset_controller(node, 2, 0x30, MTK_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[0]);
 
        return 0;
 }
@@ -910,7 +925,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
        if (r)
                return r;
 
-       mtk_register_reset_controller(node, 2, 0x0, MTK_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[1]);
 
        return 0;
 }

diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
index 3385fc9634094a8a14ec22f99b26c8ccb5351a40..c7a8aafd44cc159c6e724e4eac2218e1257a3793 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2712.c
+++ b/drivers/clk/mediatek/clk-mt2712.c
@@ -1258,6 +1258,21 @@ static const struct mtk_pll_data plls[] = {
                0, 31, 0x0300, 4, 0, 0, 0, 0x0304, 0),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc[] = {
+       /* infra */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x30,
+       },
+       /* peri */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x0,
+       },
+};
+
 static int clk_mt2712_apmixed_probe(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -1361,7 +1376,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[0]);
 
        return r;
 }
@@ -1383,7 +1398,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[1]);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt7622-eth.c b/drivers/clk/mediatek/clk-mt7622-eth.c
index 424105b91b7dc0e7e134e0ddd943df0c9e1e6dbd..40eefed3d12bbecf8191df7158b6a7df56bfde7b 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7622-eth.c
+++ b/drivers/clk/mediatek/clk-mt7622-eth.c
@@ -65,6 +65,12 @@ static const struct mtk_gate sgmii_clks[] = {
                   "ssusb_cdr_fb", 5),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static int clk_mt7622_ethsys_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -82,7 +88,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt7622-hif.c b/drivers/clk/mediatek/clk-mt7622-hif.c
index 88bccf595ee4d06de2b3354e4f8555a718ebd61e..ca29d93ce2d080d7f52564539d76346912fdff24 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7622-hif.c
+++ b/drivers/clk/mediatek/clk-mt7622-hif.c
@@ -76,6 +76,12 @@ static const struct mtk_gate pcie_clks[] = {
        GATE_PCIE(CLK_SATA_PM_EN, "sata_pm_en", "univpll2_d4", 30),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -93,7 +99,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }
@@ -115,7 +121,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index 9b7ebccf75bc0727d88ddabff0fc9424ce7b36de..115db564a6d4f662b66cd1c01abfa218b8de1729 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -610,6 +610,21 @@ static struct mtk_composite peri_muxes[] = {
        MUX(CLK_PERIBUS_SEL, "peribus_ck_sel", peribus_ck_parents, 0x05C, 0, 1),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc[] = {
+       /* infrasys */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 1,
+               .reg_ofs = 0x30,
+       },
+       /* pericfg */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x0,
+       },
+};
+
 static int mtk_topckgen_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -663,7 +678,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
        if (r)
                return r;
 
-       mtk_register_reset_controller(node, 1, 0x30, MTK_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[0]);
 
        return 0;
 }
@@ -714,7 +729,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[1]);
 
        return 0;
 }

diff --git a/drivers/clk/mediatek/clk-mt7629-eth.c b/drivers/clk/mediatek/clk-mt7629-eth.c
index ba2548ef4031a138bbcaf766df93bac12a01a5f1..c20c7853500d2d35abb3132a5954f069af5082bc 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7629-eth.c
+++ b/drivers/clk/mediatek/clk-mt7629-eth.c
@@ -76,6 +76,12 @@ static const struct mtk_gate sgmii_clks[2][4] = {
        }
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static int clk_mt7629_ethsys_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -92,7 +98,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt7629-hif.c b/drivers/clk/mediatek/clk-mt7629-hif.c
index 5863ac799b70f6839e15191f69d2218cc7eaa2d4..5d7ec861afab7cfeef7a8fd1b75b529ae61b65dc 100644 (file)
--- a/drivers/clk/mediatek/clk-mt7629-hif.c
+++ b/drivers/clk/mediatek/clk-mt7629-hif.c
@@ -71,6 +71,12 @@ static const struct mtk_gate pcie_clks[] = {
        GATE_PCIE(CLK_PCIE_P0_PIPE_EN, "pcie_p0_pipe_en", "pcie0_pipe_en", 23),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SIMPLE,
+       .rst_bank_nr = 1,
+       .reg_ofs = 0x34,
+};
+
 static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -88,7 +94,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }
@@ -110,7 +116,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/clk-mt8135.c b/drivers/clk/mediatek/clk-mt8135.c
index b94433a1dde133e1814219eea53a342630c74316..f554574b25670b719589c64b84ce47d566ff148f 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8135.c
+++ b/drivers/clk/mediatek/clk-mt8135.c
@@ -514,6 +514,21 @@ static const struct mtk_composite peri_clks[] __initconst = {
        MUX(CLK_PERI_UART3_SEL, "uart3_ck_sel", uart_ck_sel_parents, 0x40c, 3, 1),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc[] = {
+       /* infrasys */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x30,
+       },
+       /* pericfg */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x0,
+       }
+};
+
 static void __init mtk_topckgen_init(struct device_node *node)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -559,7 +574,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[0]);
 }
 CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8135-infracfg", mtk_infrasys_init);
 
@@ -587,7 +602,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[1]);
 }
 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
index 9fbf26c96795ae699c62c22ba47d8a5708e63e8b..1e86210e9c66f9c4b7e1d99f19d5e91a4c981a92 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8173.c
+++ b/drivers/clk/mediatek/clk-mt8173.c
@@ -819,6 +819,21 @@ static const struct mtk_gate venclt_clks[] __initconst = {
        GATE_VENCLT(CLK_VENCLT_CKE1, "venclt_cke1", "venclt_sel", 4),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc[] = {
+       /* infrasys */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x30,
+       },
+       /* pericfg */
+       {
+               .version = MTK_RST_SIMPLE,
+               .rst_bank_nr = 2,
+               .reg_ofs = 0x0,
+       }
+};
+
 static struct clk_hw_onecell_data *mt8173_top_clk_data __initdata;
 static struct clk_hw_onecell_data *mt8173_pll_clk_data __initdata;
 
@@ -882,7 +897,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[0]);
 }
 CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8173-infracfg", mtk_infrasys_init);
 
@@ -910,7 +925,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_RST_SIMPLE);
+       mtk_register_reset_controller(node, &clk_rst_desc[1]);
 }
 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
index d0e89b015ffcea7333677da8a4a08f8549bc6b76..5708c5d8b3003a73b6b953ae43d6fa139279e31c 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8183.c
+++ b/drivers/clk/mediatek/clk-mt8183.c
@@ -1153,6 +1153,12 @@ static const struct mtk_pll_data plls[] = {
                0, 0, 32, 8, 0x02B4, 1, 0x02BC, 0x0014, 1, 0x02B8, 0, 0x02B4),
 };
 
+static const struct mtk_clk_rst_desc clk_rst_desc = {
+       .version = MTK_RST_SET_CLR,
+       .rst_bank_nr = 4,
+       .reg_ofs = INFRA_RST0_SET_OFFSET,
+};
+
 static int clk_mt8183_apmixed_probe(struct platform_device *pdev)
 {
        struct clk_hw_onecell_data *clk_data;
@@ -1240,8 +1246,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
                return r;
        }
 
-       mtk_register_reset_controller(node, 4,
-                                     INFRA_RST0_SET_OFFSET, MTK_RST_SET_CLR);
+       mtk_register_reset_controller(node, &clk_rst_desc);
 
        return r;
 }

diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
index 33745f7f144f1f816c69308daba74620da85b2a4..47bc6b1842fd5c97d0515302b67b6e9e6ccc2847 100644 (file)
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -12,14 +12,19 @@
 
 #include "reset.h"
 
+static inline struct mtk_clk_rst_data *to_mtk_clk_rst_data(struct reset_controller_dev *rcdev)
+{
+       return container_of(rcdev, struct mtk_clk_rst_data, rcdev);
+}
+
 static int mtk_reset_update(struct reset_controller_dev *rcdev,
                            unsigned long id, bool deassert)
 {
-       struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+       struct mtk_clk_rst_data *data = to_mtk_clk_rst_data(rcdev);
        unsigned int val = deassert ? 0 : ~0;
 
        return regmap_update_bits(data->regmap,
-                                 data->regofs + ((id / 32) << 2),
+                                 data->desc->reg_ofs + ((id / 32) << 2),
                                  BIT(id % 32), val);
 }
 
@@ -49,11 +54,11 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
 static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,
                                    unsigned long id, bool deassert)
 {
-       struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+       struct mtk_clk_rst_data *data = to_mtk_clk_rst_data(rcdev);
        unsigned int deassert_ofs = deassert ? 0x4 : 0;
 
        return regmap_write(data->regmap,
-                           data->regofs + ((id / 32) << 4) + deassert_ofs,
+                           data->desc->reg_ofs + ((id / 32) << 4) + deassert_ofs,
                            BIT(id % 32));
 }
 
@@ -93,15 +98,19 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = {
 };
 
 void mtk_register_reset_controller(struct device_node *np,
-                                  u32 rst_bank_nr, u16 reg_ofs,
-                                  enum mtk_reset_version version)
+                                  const struct mtk_clk_rst_desc *desc)
 {
-       struct mtk_reset *data;
-       int ret;
        struct regmap *regmap;
        const struct reset_control_ops *rcops = NULL;
+       struct mtk_clk_rst_data *data;
+       int ret;
+
+       if (!desc) {
+               pr_err("mtk clock reset desc is NULL\n");
+               return;
+       }
 
-       switch (version) {
+       switch (desc->version) {
        case MTK_RST_SIMPLE:
                rcops = &mtk_reset_ops;
                break;
@@ -109,7 +118,7 @@ void mtk_register_reset_controller(struct device_node *np,
                rcops = &mtk_reset_ops_set_clr;
                break;
        default:
-               pr_err("Unknown reset version %d\n", version);
+               pr_err("Unknown reset version %d\n", desc->version);
                return;
        }
 
@@ -123,10 +132,10 @@ void mtk_register_reset_controller(struct device_node *np,
        if (!data)
                return;
 
+       data->desc = desc;
        data->regmap = regmap;
-       data->regofs = reg_ofs;
        data->rcdev.owner = THIS_MODULE;
-       data->rcdev.nr_resets = rst_bank_nr * 32;
+       data->rcdev.nr_resets = desc->rst_bank_nr * 32;
        data->rcdev.ops = rcops;
        data->rcdev.of_node = np;
 

diff --git a/drivers/clk/mediatek/reset.h b/drivers/clk/mediatek/reset.h
index 851244bbd2addabc78c222058b757354b1f54acf..b4c2b468da4ae569fe5a6cc5cf43861f18258e52 100644 (file)
--- a/drivers/clk/mediatek/reset.h
+++ b/drivers/clk/mediatek/reset.h
@@ -21,21 +21,36 @@ enum mtk_reset_version {
        MTK_RST_MAX,
 };
 
-struct mtk_reset {
+/**
+ * struct mtk_clk_rst_desc - Description of MediaTek clock reset.
+ * @version: Reset version which is defined in enum mtk_reset_version.
+ * @reg_ofs: Base offset of the reset register.
+ * @rst_bank_nr: Quantity of reset bank.
+ */
+struct mtk_clk_rst_desc {
+       enum mtk_reset_version version;
+       u16 reg_ofs;
+       u32 rst_bank_nr;
+};
+
+/**
+ * struct mtk_clk_rst_data - Data of MediaTek clock reset controller.
+ * @regmap: Pointer to base address of reset register address.
+ * @rcdev: Reset controller device.
+ * @desc: Pointer to description of the reset controller.
+ */
+struct mtk_clk_rst_data {
        struct regmap *regmap;
-       int regofs;
        struct reset_controller_dev rcdev;
+       const struct mtk_clk_rst_desc *desc;
 };
 
 /**
  * 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.
+ * @desc: Constant pointer to description of clock reset.
  */
 void mtk_register_reset_controller(struct device_node *np,
-                                  u32 rst_bank_nr, u16 reg_ofs,
-                                  enum mtk_reset_version version);
+                                  const struct mtk_clk_rst_desc *desc);
 
 #endif /* __DRV_CLK_MTK_RESET_H */