reset: mediatek: Move mediatek system clock reset to reset folder
Subsystems (3)
RFC PATCH 1/1 reset: mediatek: Move mediatek system clock reset to reset folder
To manager mediatek system clock reset easier, we move the driver to drivers/reset.
The modifications in this series:
- Move drivers/clk/mediatek/reset.c to drivers/reset/reset-mediatek-sysclk.c
- Move reset data which are scattered around the mediatek drivers to reset-mediatek-sysclk.c
- Use mtk_rst_init/mtk_rst_remove for each clock driver to use this reset drivers. We only need to put in device or device node and reset compatible name.
- The reason we need to pass device or device node is because some mediatek clock drivers are not support device.
-----
This series is based on linux-next next-20220527 and [1].
[1]: https://lore.kernel.org/all/[email protected]/
----
--- drivers/clk/mediatek/Kconfig | 1 + drivers/clk/mediatek/Makefile | 2 +- drivers/clk/mediatek/clk-mt2701-eth.c | 10 +- drivers/clk/mediatek/clk-mt2701-g3d.c | 10 +- drivers/clk/mediatek/clk-mt2701-hif.c | 10 +- drivers/clk/mediatek/clk-mt2701.c | 22 +- drivers/clk/mediatek/clk-mt2712.c | 22 +- drivers/clk/mediatek/clk-mt7622-eth.c | 10 +- drivers/clk/mediatek/clk-mt7622-hif.c | 12 +- drivers/clk/mediatek/clk-mt7622.c | 22 +- drivers/clk/mediatek/clk-mt7629-eth.c | 10 +- drivers/clk/mediatek/clk-mt7629-hif.c | 12 +- drivers/clk/mediatek/clk-mt8135.c | 22 +- drivers/clk/mediatek/clk-mt8173.c | 22 +- drivers/clk/mediatek/clk-mt8183.c | 15 +- drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 +- drivers/clk/mediatek/clk-mt8192.c | 26 +- drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 +- drivers/clk/mediatek/clk-mtk.c | 11 +- drivers/clk/mediatek/clk-mtk.h | 9 +- drivers/clk/mediatek/reset.c | 232 --------- drivers/clk/mediatek/reset.h | 82 ---- drivers/reset/Kconfig | 6 + drivers/reset/Makefile | 1 + drivers/reset/reset-mediatek-sysclk.c | 531 +++++++++++++++++++++ 25 files changed, 574 insertions(+), 573 deletions(-) delete mode 100644 drivers/clk/mediatek/reset.c delete mode 100644 drivers/clk/mediatek/reset.h create mode 100644 drivers/reset/reset-mediatek-sysclk.c
drivers/clk/mediatek/Kconfig +1 -0
@@ -8,6 +8,7 @@ menu "Clock driver for MediaTek SoC" config COMMON_CLK_MEDIATEK tristate select RESET_CONTROLLER + select RESET_MEDIATEK_SYSCLK help MediaTek SoCs' clock support.
drivers/clk/mediatek/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.o +obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o clk-mux.o obj-$(CONFIG_COMMON_CLK_MT6765) += clk-mt6765.o obj-$(CONFIG_COMMON_CLK_MT6765_AUDIOSYS) += clk-mt6765-audio.o
drivers/clk/mediatek/clk-mt2701-eth.c +1 -9
@@ -36,14 +36,6 @@ static const struct mtk_gate eth_clks[] = { GATE_ETH(CLK_ETHSYS_CRYPTO, "crypto_clk", "ethif_sel", 29), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static const struct of_device_id of_match_clk_mt2701_eth[] = { { .compatible ="mediatek,mt2701-ethsys" , }, {}
@@ -66,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt2701-eth-rst" );return r; }
drivers/clk/mediatek/clk-mt2701-g3d.c +1 -9
@@ -35,14 +35,6 @@ static const struct mtk_gate g3d_clks[] = { GATE_G3D(CLK_G3DSYS_CORE, "g3d_core", "mfg_sel", 0), }; -static u16 rst_ofs[] = {0xC , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static int clk_mt2701_g3dsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -60,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt2701-g3d-rst" );return r; }
drivers/clk/mediatek/clk-mt2701-hif.c +1 -9
@@ -33,14 +33,6 @@ static const struct mtk_gate hif_clks[] = { GATE_HIF(CLK_HIFSYS_PCIE2, "pcie2_clk", "ethpll_500m_ck", 26), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static const struct of_device_id of_match_clk_mt2701_hif[] = { { .compatible ="mediatek,mt2701-hifsys" , }, {}
@@ -65,7 +57,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt2701-hif-rst" );return 0 ; }
drivers/clk/mediatek/clk-mt2701.c +2 -20
@@ -735,24 +735,6 @@ static const struct mtk_fixed_factor infra_fixed_divs[] = { FACTOR(CLK_INFRA_CLK_13M, "clk13m", "clk26m", 1, 2), }; -static u16 infrasys_rst_ofs[] = {0x30 ,0x34 , }; -static u16 pericfg_rst_ofs[] = {0x0 ,0x4 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc[] = { -/* infrasys */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = infrasys_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), - }, -/* pericfg */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = pericfg_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), - }, -}; -static struct clk_hw_onecell_data *infra_clk_data;static void __init mtk_infrasys_init_early (struct device_node *node)
@@ -805,7 +787,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]); +mtk_rst_init (&pdev->dev, node,"mt2701-infrasys-rst" );return 0 ; }
@@ -928,7 +910,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[1 ]); +mtk_rst_init (&pdev->dev, node,"mt2701-pericfg-rst" );return 0 ; }
drivers/clk/mediatek/clk-mt2712.c +2 -20
@@ -1258,24 +1258,6 @@ static const struct mtk_pll_data plls[] = { 0, 31, 0x0300, 4, 0, 0, 0, 0x0304, 0), }; -static u16 infrasys_rst_ofs[] = {0x30 ,0x34 , }; -static u16 pericfg_rst_ofs[] = {0x0 ,0x4 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc[] = { -/* infra */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = infrasys_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), - }, -/* peri */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = pericfg_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), - }, -}; -static int clk_mt2712_apmixed_probe (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -1379,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_with_dev (&pdev->dev, &clk_rst_desc[0 ]); +mtk_rst_init (&pdev->dev, node,"mt2712-infra-rst" );return r; }
@@ -1401,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_with_dev (&pdev->dev, &clk_rst_desc[1 ]); +mtk_rst_init (&pdev->dev, node,"mt2712-peri-rst" );return r; }
drivers/clk/mediatek/clk-mt7622-eth.c +1 -9
@@ -65,14 +65,6 @@ static const struct mtk_gate sgmii_clks[] = { "ssusb_cdr_fb", 5), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static int clk_mt7622_ethsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -90,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7622-eth-rst" );return r; }
drivers/clk/mediatek/clk-mt7622-hif.c +2 -10
@@ -76,14 +76,6 @@ static const struct mtk_gate pcie_clks[] = { GATE_PCIE(CLK_SATA_PM_EN, "sata_pm_en", "univpll2_d4", 30), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static int clk_mt7622_ssusbsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -101,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7622-ssusbsys-rst" );return r; }
@@ -123,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7622-pciesys-rst" );return r; }
drivers/clk/mediatek/clk-mt7622.c +2 -20
@@ -610,24 +610,6 @@ static struct mtk_composite peri_muxes[] = { MUX(CLK_PERIBUS_SEL, "peribus_ck_sel", peribus_ck_parents, 0x05C, 0, 1), }; -static u16 infrasys_rst_ofs[] = {0x30 , }; -static u16 pericfg_rst_ofs[] = {0x0 ,0x4 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc[] = { -/* infrasys */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = infrasys_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), - }, -/* pericfg */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = pericfg_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), - }, -}; -static int mtk_topckgen_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -681,7 +663,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]); +mtk_rst_init (&pdev->dev, node,"mt7622-infrasys-rst" );return 0 ; }
@@ -732,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_with_dev (&pdev->dev, &clk_rst_desc[1 ]); +mtk_rst_init (&pdev->dev, node,"mt7622-pericfg-rst" );return 0 ; }
drivers/clk/mediatek/clk-mt7629-eth.c +1 -9
@@ -76,14 +76,6 @@ static const struct mtk_gate sgmii_clks[2][4] = { } }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static int clk_mt7629_ethsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -100,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7629-ethsys-rst" );return r; }
drivers/clk/mediatek/clk-mt7629-hif.c +2 -10
@@ -71,14 +71,6 @@ static const struct mtk_gate pcie_clks[] = { GATE_PCIE(CLK_PCIE_P0_PIPE_EN, "pcie_p0_pipe_en", "pcie0_pipe_en", 23), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static int clk_mt7629_ssusbsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -96,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7629-ssusbsys-rst" );return r; }
@@ -118,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt7629-pciesys-rst" );return r; }
drivers/clk/mediatek/clk-mt8135.c +2 -20
@@ -514,24 +514,6 @@ static const struct mtk_composite peri_clks[] __initconst = { MUX(CLK_PERI_UART3_SEL, "uart3_ck_sel", uart_ck_sel_parents, 0x40c, 3, 1), }; -static u16 infrasys_rst_ofs[] = {0x30 ,0x34 , }; -static u16 pericfg_rst_ofs[] = {0x0 ,0x4 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc[] = { -/* infrasys */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = infrasys_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), - }, -/* pericfg */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = pericfg_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), - } -}; -static void __init mtk_topckgen_init (struct device_node *node) {struct clk_hw_onecell_data *clk_data;
@@ -577,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, &clk_rst_desc[0 ]); +mtk_rst_init (NULL , node,"mt8135-infrasys-rst" ); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8135-infracfg" , mtk_infrasys_init);
@@ -605,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, &clk_rst_desc[1 ]); +mtk_rst_init (NULL , node,"mt8135-pericfg-rst" ); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8135-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8173.c +2 -20
@@ -819,24 +819,6 @@ static const struct mtk_gate venclt_clks[] __initconst = { GATE_VENCLT(CLK_VENCLT_CKE1, "venclt_cke1", "venclt_sel", 4), }; -static u16 infrasys_rst_ofs[] = {0x30 ,0x34 , }; -static u16 pericfg_rst_ofs[] = {0x0 ,0x4 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc[] = { -/* infrasys */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = infrasys_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), - }, -/* pericfg */ - { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = pericfg_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), - } -}; -static struct clk_hw_onecell_data *mt8173_top_clk_data__initdata ;static struct clk_hw_onecell_data *mt8173_pll_clk_data__initdata ;
@@ -900,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, &clk_rst_desc[0 ]); +mtk_rst_init (NULL , node,"mt8173-infracfg-rst" ); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8173-infracfg" , mtk_infrasys_init);
@@ -928,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, &clk_rst_desc[1 ]); +mtk_rst_init (NULL , node,"mt8173-pericfg-rst" ); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8173-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8183.c +1 -14
@@ -1150,19 +1150,6 @@ static const struct mtk_pll_data plls[] = { 0, 0, 32, 8, 0x02B4, 1, 0x02BC, 0x0014, 1, 0x02B8, 0, 0x02B4), }; -static u16 infra_rst_ofs[] = { -INFRA_RST0_SET_OFFSET , -INFRA_RST1_SET_OFFSET , -INFRA_RST2_SET_OFFSET , -INFRA_RST3_SET_OFFSET , -}; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SET_CLR , - .rst_bank_ofs = infra_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infra_rst_ofs), -}; -static int clk_mt8183_apmixed_probe (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -1250,7 +1237,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt8183-infra-rst" );return r; }
drivers/clk/mediatek/clk-mt8186-infra_ao.c +1 -22
@@ -192,31 +192,10 @@ static const struct mtk_gate infra_ao_clks[] = { GATE_INFRA_AO3(CLK_INFRA_AO_FLASHIF_66M, "infra_ao_flashif_66m", "top_axi", 29), }; -static u16 infra_ao_rst_ofs[] = { -INFRA_RST0_SET_OFFSET , -INFRA_RST1_SET_OFFSET , -INFRA_RST2_SET_OFFSET , -INFRA_RST3_SET_OFFSET , -INFRA_RST4_SET_OFFSET , -}; - -static u16 infra_ao_idx_map[] = { - [MT8186_INFRA_THERMAL_CTRL_RST ] =0 *RST_NR_PER_BANK +0 , - [MT8186_INFRA_PTP_CTRL_RST ] =1 *RST_NR_PER_BANK +0 , -}; - -static struct mtk_clk_rst_desc infra_ao_rst_desc = { - .version =MTK_RST_SET_CLR , - .rst_bank_ofs = infra_ao_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infra_ao_rst_ofs), - .rst_idx_map = infra_ao_idx_map, - .rst_idx_map_nr =ARRAY_SIZE (infra_ao_idx_map), -}; -static const struct mtk_clk_desc infra_ao_desc = { .clks = infra_ao_clks, .num_clks =ARRAY_SIZE (infra_ao_clks), - .rst_desc = &infra_ao_rst_desc, + .rst_name ="mt8186-infra-ao-rst" , };static const struct of_device_id of_match_clk_mt8186_infra_ao[] = {
drivers/clk/mediatek/clk-mt8192.c +1 -25
@@ -1115,30 +1115,6 @@ static const struct mtk_gate top_clks[] = { GATE_TOP(CLK_TOP_SSUSB_PHY_REF, "ssusb_phy_ref", "clk26m", 25), }; -static u16 infra_ao_rst_ofs[] = { -INFRA_RST0_SET_OFFSET , -INFRA_RST1_SET_OFFSET , -INFRA_RST2_SET_OFFSET , -INFRA_RST3_SET_OFFSET , -INFRA_RST4_SET_OFFSET , -}; - -static u16 infra_ao_idx_map[] = { - [MT8192_INFRA_RST0_THERM_CTRL_SWRST ] =0 *RST_NR_PER_BANK +0 , - [MT8192_INFRA_RST2_PEXTP_PHY_SWRST ] =2 *RST_NR_PER_BANK +15 , - [MT8192_INFRA_RST3_THERM_CTRL_PTP_SWRST ] =3 *RST_NR_PER_BANK +5 , - [MT8192_INFRA_RST4_PCIE_TOP_SWRST ] =4 *RST_NR_PER_BANK +1 , - [MT8192_INFRA_RST4_THERM_CTRL_MCU_SWRST ] =4 *RST_NR_PER_BANK +12 , -}; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SET_CLR , - .rst_bank_ofs = infra_ao_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infra_ao_rst_ofs), - .rst_idx_map = infra_ao_idx_map, - .rst_idx_map_nr =ARRAY_SIZE (infra_ao_idx_map), -}; -#define MT8192_PLL_FMAX (3800UL * MHZ)#define MT8192_PLL_FMIN (1500UL * MHZ)#define MT8192_INTEGER_BITS 8
@@ -1265,7 +1241,7 @@ static int clk_mt8192_infra_probe(struct platform_device *pdev)if (r) goto free_clk_data; - r =mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc); + r =mtk_rst_init (&pdev->dev, node,"mt8192-infra-rst" );if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt8195-infra_ao.c +1 -23
@@ -183,32 +183,10 @@ static const struct mtk_gate infra_ao_clks[] = { GATE_INFRA_AO4(CLK_INFRA_AO_PERI_UFS_MEM_SUB, "infra_ao_peri_ufs_mem_sub", "mem_466m", 31), }; -static u16 infra_ao_rst_ofs[] = { -INFRA_RST0_SET_OFFSET , -INFRA_RST1_SET_OFFSET , -INFRA_RST2_SET_OFFSET , -INFRA_RST3_SET_OFFSET , -INFRA_RST4_SET_OFFSET , -}; - -static u16 infra_ao_idx_map[] = { - [MT8195_INFRA_RST0_THERM_CTRL_SWRST ] =0 *RST_NR_PER_BANK +0 , - [MT8195_INFRA_RST3_THERM_CTRL_PTP_SWRST ] =3 *RST_NR_PER_BANK +5 , - [MT8195_INFRA_RST4_THERM_CTRL_MCU_SWRST ] =4 *RST_NR_PER_BANK +10 , -}; - -static struct mtk_clk_rst_desc infra_ao_rst_desc = { - .version =MTK_RST_SET_CLR , - .rst_bank_ofs = infra_ao_rst_ofs, - .rst_bank_nr =ARRAY_SIZE (infra_ao_rst_ofs), - .rst_idx_map = infra_ao_idx_map, - .rst_idx_map_nr =ARRAY_SIZE (infra_ao_idx_map), -}; -static const struct mtk_clk_desc infra_ao_desc = { .clks = infra_ao_clks, .num_clks =ARRAY_SIZE (infra_ao_clks), - .rst_desc = &infra_ao_rst_desc, + .rst_name ="mt8195-infra-ao-rst" , };static const struct of_device_id of_match_clk_mt8195_infra_ao[] = {
drivers/clk/mediatek/clk-mtk.c +5 -6
@@ -444,12 +444,8 @@ int mtk_clk_simple_probe(struct platform_device *pdev)platform_set_drvdata (pdev, clk_data); -if (mcd->rst_desc) { - r =mtk_register_reset_controller_with_dev (&pdev->dev, - mcd->rst_desc); -if (r) - goto unregister_clks; - } +if (mcd->rst_name) +mtk_rst_init (&pdev->dev, node, mcd->rst_name);return r;
@@ -470,6 +466,9 @@ int mtk_clk_simple_remove(struct platform_device *pdev)mtk_clk_unregister_gates (mcd->clks, mcd->num_clks, clk_data);mtk_free_clk_data (clk_data); +if (mcd->rst_name) +mtk_rst_remove (&pdev->dev, node, mcd->rst_name); +return 0 ; }
drivers/clk/mediatek/clk-mtk.h +6 -3
@@ -13,8 +13,6 @@#include <linux/spinlock.h> #include <linux/types.h> -#include "reset.h" -#define MAX_MUX_GATE_BIT 31#define INVALID_MUX_GATE_BIT (MAX_MUX_GATE_BIT + 1)
@@ -192,10 +190,15 @@ struct clk_hw *mtk_clk_register_ref2usb_tx(const char *name,struct mtk_clk_desc {const struct mtk_gate *clks;size_t num_clks; -const struct mtk_clk_rst_desc *rst_desc; +char *rst_name; };int mtk_clk_simple_probe (struct platform_device *pdev);int mtk_clk_simple_remove (struct platform_device *pdev); +extern int mtk_rst_init (struct device *dev,struct device_node *np, +const char *name); +extern int mtk_rst_remove (struct device *dev,struct device_node *np, +const char *name); +#endif /* __DRV_CLK_MTK_H */
drivers/clk/mediatek/reset.c deleted +0 -232
232 lines not on this page · raw message
drivers/clk/mediatek/reset.h deleted +0 -82
82 lines not on this page · raw message
drivers/reset/Kconfig +6 -0
@@ -122,6 +122,12 @@ config RESET_MCHP_SPARX5 help This driver supports switch core reset for the Microchip Sparx5 SoC. +config RESET_MEDIATEK_SYSCLK + tristate "MediaTek System Clock Reset Driver" + depends on ARM || ARM64 || COMPILE_TEST + help + This enables the system clock reset driver for MediaTek SoCs. + config RESET_MESON tristate "Meson Reset Driver" depends on ARCH_MESON || COMPILE_TEST
drivers/reset/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_RESET_K210) += reset-k210.o obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o +obj-$(CONFIG_RESET_MEDIATEK_SYSCLK) += reset-mediatek-sysclk.o obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o obj-$(CONFIG_RESET_NPCM) += reset-npcm.o
drivers/reset/reset-mediatek-sysclk.c new file +531 -0
531 lines not on this page · raw message
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Stephen Boyd
maintainerQuoting Bo-Chen Chen (2022-05-27 02:03:55)
Quoted 20 lines
drivers/clk/mediatek/clk-mt2701-eth.c +0
-8@@ -36,14 +36,6 @@ static const struct mtk_gate eth_clks[] = { GATE_ETH(CLK_ETHSYS_CRYPTO, "crypto_clk", "ethif_sel", 29), }; -static u16 rst_ofs[] = {0x34 , }; - -static const struct mtk_clk_rst_desc clk_rst_desc = { - .version =MTK_RST_SIMPLE , - .rst_bank_ofs = rst_ofs, - .rst_bank_nr =ARRAY_SIZE (rst_ofs), -}; -static const struct of_device_id of_match_clk_mt2701_eth[] = { { .compatible ="mediatek,mt2701-ethsys" , }, {}
drivers/clk/mediatek/clk-mt2701-eth.c static int clk_mt2701_eth_probe(struct platform_device *pdev) · line 61
Quoted 5 lines
drivers/clk/mediatek/clk-mt2701-eth.c +1
-1@@ -66,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_with_dev (&pdev->dev, &clk_rst_desc); +mtk_rst_init (&pdev->dev, node,"mt2701-eth-rst" );
Instead of making direct calls, please use the auxiliary bus and create full fledged devices that are probed through the driver core. That way we can see the relationship in sysfs between devices and they're "real" device drivers for the reset component of the device.