Skip to contentSkip to conversation

Move mediatek system clock reset to reset folder

PATCH In review Bo-Chen Chen 4 participants 9 messages Oct 21, 2022 – Nov 3, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 cover Move mediatek system clock reset to reset folder

This series move mediatek system clock reset to drivers/reset/mediatek.

Changes for v6:
1. Separate patches.
a. Move data and drivers to reset/mediatek.
b. Implement auxiliary bus driver in clk/mediatek/clk-mtk.c. c. Implement auxiliary bus interface in reset/mediatek.
2. This version is based on 6.1-rc1.

Changes for v5:
1. Replace reset-mtxxxx.h with reset-mtxxxx.c and after using this, we don't need to add many "#if #endif" in reset-mediatek-sysclk.c.
2. Use mediatek clock common KConfig to control whether to build in reset-mtxxxx.c.
3. Rebased on linux-next-1007.

Changes for v4:
1. Rebased oo linux-next-1004.
2. Move reset data which are scattered around the mediatek drivers to reset-mtxxxx.h.
3. Add reset data of mt6795.

Version for this series:
v5 : https://lore.kernel.org/all/[email protected]/
v4 : https://lore.kernel.org/all/[email protected]/
v3 : https://lore.kernel.org/all/[email protected]/
v2 : https://lore.kernel.org/all/[email protected]/
v1 : https://lore.kernel.org/all/[email protected]/
RFC: https://lore.kernel.org/all/[email protected]/

Bo-Chen Chen (3):
reset: mediatek: Move MediaTek system clock reset to reset/mediatek
clk: mediatek: Add auxiliary bus support for sysclk reset
reset: mediatek: Add auxiliary bus support for sysclk

 drivers/clk/mediatek/Kconfig                  |   2 +
 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-mt6795-infracfg.c    |  22 +-
 drivers/clk/mediatek/clk-mt6795-pericfg.c     |  20 +-
 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             |  23 +-
 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             |  27 +-
 drivers/clk/mediatek/clk-mt8195-infra_ao.c    |  28 +-
 drivers/clk/mediatek/clk-mtk.c                |  62 ++-
 drivers/clk/mediatek/clk-mtk.h                |   8 +-
 drivers/clk/mediatek/reset.c                  | 233 -----------
 drivers/reset/Kconfig                         |   1 +
 drivers/reset/Makefile                        |   1 +
 drivers/reset/mediatek/Kconfig                |   6 +
 drivers/reset/mediatek/Makefile               |  13 +
 .../reset/mediatek/reset-mediatek-sysclk.c    | 389 ++++++++++++++++++
 drivers/reset/mediatek/reset-mt2701.c         | 102 +++++
 drivers/reset/mediatek/reset-mt2712.c         |  42 ++
 drivers/reset/mediatek/reset-mt6795.c         |  61 +++
 drivers/reset/mediatek/reset-mt7622.c         |  91 ++++
 drivers/reset/mediatek/reset-mt7629.c         |  62 +++
 drivers/reset/mediatek/reset-mt8135.c         |  43 ++
 drivers/reset/mediatek/reset-mt8173.c         |  43 ++
 drivers/reset/mediatek/reset-mt8183.c         |  31 ++
 drivers/reset/mediatek/reset-mt8186.c         |  39 ++
 drivers/reset/mediatek/reset-mt8192.c         |  43 ++
 drivers/reset/mediatek/reset-mt8195.c         |  44 ++
 .../linux/reset/reset-mediatek-sysclk.h       |  61 +--
 40 files changed, 1142 insertions(+), 557 deletions(-)
 delete mode 100644 drivers/clk/mediatek/reset.c
 create mode 100644 drivers/reset/mediatek/Kconfig
 create mode 100644 drivers/reset/mediatek/Makefile
 create mode 100644 drivers/reset/mediatek/reset-mediatek-sysclk.c
 create mode 100644 drivers/reset/mediatek/reset-mt2701.c
 create mode 100644 drivers/reset/mediatek/reset-mt2712.c
 create mode 100644 drivers/reset/mediatek/reset-mt6795.c
 create mode 100644 drivers/reset/mediatek/reset-mt7622.c
 create mode 100644 drivers/reset/mediatek/reset-mt7629.c
 create mode 100644 drivers/reset/mediatek/reset-mt8135.c
 create mode 100644 drivers/reset/mediatek/reset-mt8173.c
 create mode 100644 drivers/reset/mediatek/reset-mt8183.c
 create mode 100644 drivers/reset/mediatek/reset-mt8186.c
 create mode 100644 drivers/reset/mediatek/reset-mt8192.c
 create mode 100644 drivers/reset/mediatek/reset-mt8195.c
 rename drivers/clk/mediatek/reset.h => include/linux/reset/reset-mediatek-sysclk.h (60%)
Signature · 1 line
2.18.0
#1 lore raw

PATCH v6 1/3 reset: mediatek: Move MediaTek system clock reset to reset/mediatek

To manager MediaTek system clock reset easier, we move the driver to drivers/reset/mediatek.

- Create reset/mediatek folder.
- Move clk/mediatek/reset.c to reset/mediatek/reset-mediatek-sysclk.c
- Because we don't want to build in unsed static variable, we use clk KConfig to separate them. For example, when we use MT8186, we don't want to build in the static constants for MT8195.
- Move reset data which are scattered around the mediatek drivers to reset-mtxxxx.c.
- There are two version for mtk_reset_init because some mediatek clock drivers (mt8135 and mt8173) are using device_node instead of device, so we need to add two version for the init function.

---
 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-mt6795-infracfg.c    |  22 +-
 drivers/clk/mediatek/clk-mt6795-pericfg.c     |  20 +-
 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             |  23 +-
 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             |  27 +-
 drivers/clk/mediatek/clk-mt8195-infra_ao.c    |  28 +-
 drivers/clk/mediatek/clk-mtk.c                |   5 +-
 drivers/clk/mediatek/clk-mtk.h                |   5 +-
 drivers/clk/mediatek/reset.c                  | 233 -----------
 drivers/reset/Kconfig                         |   1 +
 drivers/reset/Makefile                        |   1 +
 drivers/reset/mediatek/Kconfig                |   5 +
 drivers/reset/mediatek/Makefile               |  13 +
 .../reset/mediatek/reset-mediatek-sysclk.c    | 388 ++++++++++++++++++
 drivers/reset/mediatek/reset-mt2701.c         | 102 +++++
 drivers/reset/mediatek/reset-mt2712.c         |  42 ++
 drivers/reset/mediatek/reset-mt6795.c         |  61 +++
 drivers/reset/mediatek/reset-mt7622.c         |  91 ++++
 drivers/reset/mediatek/reset-mt7629.c         |  62 +++
 drivers/reset/mediatek/reset-mt8135.c         |  43 ++
 drivers/reset/mediatek/reset-mt8173.c         |  43 ++
 drivers/reset/mediatek/reset-mt8183.c         |  31 ++
 drivers/reset/mediatek/reset-mt8186.c         |  39 ++
 drivers/reset/mediatek/reset-mt8192.c         |  43 ++
 drivers/reset/mediatek/reset-mt8195.c         |  44 ++
 .../linux/reset/reset-mediatek-sysclk.h       |  62 +--
 40 files changed, 1080 insertions(+), 557 deletions(-)
 delete mode 100644 drivers/clk/mediatek/reset.c
 create mode 100644 drivers/reset/mediatek/Kconfig
 create mode 100644 drivers/reset/mediatek/Makefile
 create mode 100644 drivers/reset/mediatek/reset-mediatek-sysclk.c
 create mode 100644 drivers/reset/mediatek/reset-mt2701.c
 create mode 100644 drivers/reset/mediatek/reset-mt2712.c
 create mode 100644 drivers/reset/mediatek/reset-mt6795.c
 create mode 100644 drivers/reset/mediatek/reset-mt7622.c
 create mode 100644 drivers/reset/mediatek/reset-mt7629.c
 create mode 100644 drivers/reset/mediatek/reset-mt8135.c
 create mode 100644 drivers/reset/mediatek/reset-mt8173.c
 create mode 100644 drivers/reset/mediatek/reset-mt8183.c
 create mode 100644 drivers/reset/mediatek/reset-mt8186.c
 create mode 100644 drivers/reset/mediatek/reset-mt8192.c
 create mode 100644 drivers/reset/mediatek/reset-mt8195.c
 rename drivers/clk/mediatek/reset.h => include/linux/reset/reset-mediatek-sysclk.h (59%)
drivers/clk/mediatek/Kconfig +1 -0
index 843cea0c7a44..e372f145eada 100644
@@ -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
index ea3b73240303..494bc8e17c5e 100644
@@ -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
index edf1e2ed2b59..2106a147833a 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2701-eth-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt2701-g3d.c +1 -9
index 1458109d99d9..c7bf42ade6f0 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2701-g3d-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt2701-hif.c +1 -9
index 434cbbe8c037..070bd2c9f006 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2701-hif-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt2701.c +2 -20
index 9b442af37e67..f5c0af2f8743 100644
@@ -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_reset_init_with_dev(&pdev->dev, "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_reset_init_with_dev(&pdev->dev, "mt2701-pericfg-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt2712.c +2 -20
index 56980dd6c2ea..a13e9b35786c 100644
@@ -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_reset_init_with_dev(&pdev->dev, "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_reset_init_with_dev(&pdev->dev, "mt2712-peri-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt6795-infracfg.c +1 -21
index df7eed6e071e..8610ca86bfc2 100644
@@ -5,13 +5,11 @@
  */
 
 #include <dt-bindings/clock/mediatek,mt6795-clk.h>
-#include <dt-bindings/reset/mediatek,mt6795-resets.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include "clk-cpumux.h"
 #include "clk-gate.h"
 #include "clk-mtk.h"
-#include "reset.h"
 
 #define GATE_ICG(_id, _name, _parent, _shift)			\
 		GATE_MTK(_id, _name, _parent, &infra_cg_regs,	\
@@ -59,24 +57,6 @@ static const struct mtk_gate infra_gates[] = {
 	GATE_ICG(CLK_INFRA_KP, "infra_kp", "axi_sel", 16),
 };
 
-static u16 infra_ao_rst_ofs[] = { 0x30, 0x34 };
-
-static u16 infra_ao_idx_map[] = {
-	[MT6795_INFRA_RST0_SCPSYS_RST]    = 0 * RST_NR_PER_BANK + 5,
-	[MT6795_INFRA_RST0_PMIC_WRAP_RST] = 0 * RST_NR_PER_BANK + 7,
-	[MT6795_INFRA_RST1_MIPI_DSI_RST]  = 1 * RST_NR_PER_BANK + 4,
-	[MT6795_INFRA_RST1_MIPI_CSI_RST]  = 1 * RST_NR_PER_BANK + 7,
-	[MT6795_INFRA_RST1_MM_IOMMU_RST]  = 1 * RST_NR_PER_BANK + 15,
-};
-
-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),
-};
-
 static const struct of_device_id of_match_clk_mt6795_infracfg[] = {
 	{ .compatible = "mediatek,mt6795-infracfg" },
 	{ /* sentinel */ }
@@ -97,7 +77,7 @@ static int clk_mt6795_infracfg_probe(struct platform_device *pdev)
 	if (!clk_data)
 		return -ENOMEM;
 
-	ret = mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
+	ret = mtk_reset_init_with_dev(&pdev->dev, "mt6795-ifa");
 	if (ret)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mt6795-pericfg.c +1 -19
index cb28d35dad59..696b95b31157 100644
@@ -5,12 +5,10 @@
  */
 
 #include <dt-bindings/clock/mediatek,mt6795-clk.h>
-#include <dt-bindings/reset/mediatek,mt6795-resets.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include "clk-gate.h"
 #include "clk-mtk.h"
-#include "reset.h"
 
 #define GATE_PERI(_id, _name, _parent, _shift)			\
 		GATE_MTK(_id, _name, _parent, &peri_cg_regs,	\
@@ -69,22 +67,6 @@ static const struct mtk_gate peri_gates[] = {
 	GATE_PERI(CLK_PERI_SPI0, "peri_spi0", "spi_sel", 29),
 };
 
-static u16 peri_rst_ofs[] = { 0x0 };
-
-static u16 peri_idx_map[] = {
-	[MT6795_PERI_NFI_SW_RST]   = 14,
-	[MT6795_PERI_THERM_SW_RST] = 16,
-	[MT6795_PERI_MSDC1_SW_RST] = 20,
-};
-
-static const struct mtk_clk_rst_desc clk_rst_desc = {
-	.version = MTK_RST_SIMPLE,
-	.rst_bank_ofs = peri_rst_ofs,
-	.rst_bank_nr = ARRAY_SIZE(peri_rst_ofs),
-	.rst_idx_map = peri_idx_map,
-	.rst_idx_map_nr = ARRAY_SIZE(peri_idx_map),
-};
-
 static const struct of_device_id of_match_clk_mt6795_pericfg[] = {
 	{ .compatible = "mediatek,mt6795-pericfg" },
 	{ /* sentinel */ }
@@ -105,7 +87,7 @@ static int clk_mt6795_pericfg_probe(struct platform_device *pdev)
 	if (!clk_data)
 		return -ENOMEM;
 
-	ret = mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);
+	ret = mtk_reset_init_with_dev(&pdev->dev, "mt6795-peri");
 	if (ret)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mt7622-eth.c +1 -9
index 43de0477d5d9..9a74ae83c38e 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7622-eth-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7622-hif.c +2 -10
index 67e96231dd25..7586e22499ec 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7622-usb-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_reset_init_with_dev(&pdev->dev, "mt7622-pcie-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7622.c +2 -20
index 3b55f8641fae..90dcca745555 100644
@@ -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_reset_init_with_dev(&pdev->dev, "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_reset_init_with_dev(&pdev->dev, "mt7622-pericfg-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt7629-eth.c +1 -9
index 282dd6559465..2a19762b046e 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7629-ethsys-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7629-hif.c +2 -10
index 0c8b9e139789..d62d343387b3 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7629-usb-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_reset_init_with_dev(&pdev->dev, "mt7629-pcie-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt8135.c +3 -20
index b68888a034c4..89cd8c492b91 100644
@@ -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,8 @@ 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_reset_init_with_node(node, "clk_mt8135.mt8135-infrasys-rst");
+
 }
 CLK_OF_DECLARE(mtk_infrasys, "mediatek,mt8135-infracfg", mtk_infrasys_init);
 
@@ -605,7 +588,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_reset_init_with_node(node, "clk_mt8135.mt8135-pericfg-rst");
 }
 CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8135-pericfg", mtk_pericfg_init);
 
drivers/clk/mediatek/clk-mt8173.c +2 -20
index b8529ee7199d..ac01addf432f 100644
@@ -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_reset_init_with_node(node, "clk_mt8173.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_reset_init_with_node(node, "clk_mt8173.mt8173-pericfg-rst");
 }
 CLK_OF_DECLARE(mtk_pericfg, "mediatek,mt8173-pericfg", mtk_pericfg_init);
 
drivers/clk/mediatek/clk-mt8183.c +1 -14
index 1860a35a723a..3040572b8848 100644
@@ -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;
@@ -1278,7 +1265,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_reset_init_with_dev(&pdev->dev, "mt8183-infra-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt8186-infra_ao.c +1 -22
index df2a6bd1aefa..958e28472f2b 100644
@@ -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 -26
index d0f226931070..ab9e0686d2ac 100644
@@ -18,7 +18,6 @@
 #include "clk-pll.h"
 
 #include <dt-bindings/clock/mt8192-clk.h>
-#include <dt-bindings/reset/mt8192-resets.h>
 
 static DEFINE_SPINLOCK(mt8192_clk_lock);
 
@@ -959,30 +958,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
@@ -1137,7 +1112,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_reset_init_with_dev(&pdev->dev, "mt8192-infra-rst");
 	if (r)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mt8195-infra_ao.c +1 -27
index fcd410461d3b..0afc1336b2fb 100644
@@ -7,7 +7,6 @@
 #include "clk-mtk.h"
 
 #include <dt-bindings/clock/mt8195-clk.h>
-#include <dt-bindings/reset/mt8195-resets.h>
 #include <linux/clk-provider.h>
 #include <linux/platform_device.h>
 
@@ -190,35 +189,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_RST2_USBSIF_P1_SWRST] = 2 * RST_NR_PER_BANK + 18,
-	[MT8195_INFRA_RST2_PCIE_P0_SWRST] = 2 * RST_NR_PER_BANK + 26,
-	[MT8195_INFRA_RST2_PCIE_P1_SWRST] = 2 * RST_NR_PER_BANK + 27,
-	[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 +2 -3
index d31f01d0ba1c..74408849ed86 100644
@@ -470,9 +470,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 (mcd->rst_name) {
+		r = mtk_reset_init_with_dev(&pdev->dev, mcd->rst_name);
 		if (r)
 			goto unregister_clks;
 	}
drivers/clk/mediatek/clk-mtk.h +2 -3
index 63ae7941aa92..41183ac56b11 100644
@@ -10,11 +10,10 @@
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/reset/reset-mediatek-sysclk.h>
 #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)
 
@@ -195,7 +194,7 @@ void mtk_clk_unregister_ref2usb_tx(struct clk_hw *hw);
 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);
drivers/clk/mediatek/reset.c deleted +0 -233

233 lines not on this page · raw message

drivers/reset/Kconfig +1 -0
index de176c2fbad9..bfd71c81efcf 100644
@@ -320,6 +320,7 @@ config RESET_ZYNQ
 	help
 	  This enables the reset controller driver for Xilinx Zynq SoCs.
 
+source "drivers/reset/mediatek/Kconfig"
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"
 source "drivers/reset/tegra/Kconfig"
drivers/reset/Makefile +1 -0
index 3e7e5fd633a8..5cef7ccc9a7d 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y += core.o
 obj-y += hisilicon/
+obj-y += mediatek/
 obj-$(CONFIG_ARCH_STI) += sti/
 obj-$(CONFIG_ARCH_TEGRA) += tegra/
 obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
drivers/reset/mediatek/Kconfig new file +5 -0
new file mode 100644
index 000000000000..a416cb938753
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config RESET_MEDIATEK_SYSCLK
+	tristate "MediaTek System Clock Reset Driver"
+	help
+	  This enables the system clock reset driver for MediaTek SoCs.
drivers/reset/mediatek/Makefile new file +13 -0
new file mode 100644
index 000000000000..83f26c2cecdd
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_MEDIATEK_SYSCLK) += reset-mediatek-sysclk.o
+obj-$(CONFIG_COMMON_CLK_MT2701) += reset-mt2701.o
+obj-$(CONFIG_COMMON_CLK_MT2712) += reset-mt2712.o
+obj-$(CONFIG_COMMON_CLK_MT6795) += reset-mt6795.o
+obj-$(CONFIG_COMMON_CLK_MT7622) += reset-mt7622.o
+obj-$(CONFIG_COMMON_CLK_MT7629) += reset-mt7629.o
+obj-$(CONFIG_COMMON_CLK_MT8135) += reset-mt8135.o
+obj-$(CONFIG_COMMON_CLK_MT8173) += reset-mt8173.o
+obj-$(CONFIG_COMMON_CLK_MT8183) += reset-mt8183.o
+obj-$(CONFIG_COMMON_CLK_MT8186) += reset-mt8186.o
+obj-$(CONFIG_COMMON_CLK_MT8192) += reset-mt8192.o
+obj-$(CONFIG_COMMON_CLK_MT8195) += reset-mt8195.o
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +388 -0

388 lines not on this page · raw message

drivers/reset/mediatek/reset-mt2701.c new file +102 -0

102 lines not on this page · raw message

drivers/reset/mediatek/reset-mt2712.c new file +42 -0

42 lines not on this page · raw message

drivers/reset/mediatek/reset-mt6795.c new file +61 -0

61 lines not on this page · raw message

drivers/reset/mediatek/reset-mt7622.c new file +91 -0

91 lines not on this page · raw message

drivers/reset/mediatek/reset-mt7629.c new file +62 -0

62 lines not on this page · raw message

drivers/reset/mediatek/reset-mt8135.c new file +43 -0

43 lines not on this page · raw message

drivers/reset/mediatek/reset-mt8173.c new file +43 -0

43 lines not on this page · raw message

drivers/reset/mediatek/reset-mt8183.c new file +31 -0
new file mode 100644
index 000000000000..931d8c7a477e
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2022 MediaTek Inc.
+ */
+
+#include <linux/reset/reset-mediatek-sysclk.h>
+
+static u16 mt8183_infra_ao_rst_ofs[] = {
+	INFRA_RST0_SET_OFFSET,
+	INFRA_RST1_SET_OFFSET,
+	INFRA_RST2_SET_OFFSET,
+	INFRA_RST3_SET_OFFSET,
+};
+
+static struct mtk_clk_rst_desc mt8183_rst_desc = {
+	.version = MTK_RST_SET_CLR,
+	.rst_bank_ofs = mt8183_infra_ao_rst_ofs,
+	.rst_bank_nr = ARRAY_SIZE(mt8183_infra_ao_rst_ofs),
+};
+
+static struct mtk_clk_rst_data mt8183_clk_rst_data = {
+	.desc = &mt8183_rst_desc,
+};
+
+static int __init mt8183_rst_desc_init(void)
+{
+	return mtk_rst_register_clk_rst_data(MTK_RST_ID_MT8183_INFRA, &mt8183_clk_rst_data);
+}
+arch_initcall(mt8183_rst_desc_init);
+
+MODULE_LICENSE("GPL");
drivers/reset/mediatek/reset-mt8186.c new file +39 -0
new file mode 100644
index 000000000000..3bc853ecc733
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2022 MediaTek Inc.
+ */
+
+#include <dt-bindings/reset/mt8186-resets.h>
+#include <linux/reset/reset-mediatek-sysclk.h>
+
+static u16 mt8186_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 u16 mt8186_infra_ao_rst_ofs[] = {
+	INFRA_RST0_SET_OFFSET,
+	INFRA_RST1_SET_OFFSET,
+	INFRA_RST2_SET_OFFSET,
+	INFRA_RST3_SET_OFFSET,
+};
+
+static struct mtk_clk_rst_desc mt8186_rst_desc = {
+	.version = MTK_RST_SET_CLR,
+	.rst_bank_ofs = mt8186_infra_ao_rst_ofs,
+	.rst_bank_nr = ARRAY_SIZE(mt8186_infra_ao_rst_ofs),
+	.rst_idx_map = mt8186_infra_ao_idx_map,
+	.rst_idx_map_nr = ARRAY_SIZE(mt8186_infra_ao_idx_map),
+};
+
+static struct mtk_clk_rst_data mt8186_clk_rst_data = {
+	.desc = &mt8186_rst_desc,
+};
+
+static int __init mt8186_rst_desc_init(void)
+{
+	return mtk_rst_register_clk_rst_data(MTK_RST_ID_MT8186_INFRA_AO, &mt8186_clk_rst_data);
+}
+arch_initcall(mt8186_rst_desc_init);
+
+MODULE_LICENSE("GPL");
drivers/reset/mediatek/reset-mt8192.c new file +43 -0

43 lines not on this page · raw message

drivers/reset/mediatek/reset-mt8195.c new file +44 -0

44 lines not on this page · raw message

include/linux/reset/reset-mediatek-sysclk.h renamed from drivers/clk/mediatek/reset.h +39 -23

85 lines not on this page · raw message

Signature · 1 line
2.18.0
#2 lore raw

Re: [PATCH v6 1/3] reset: mediatek: Move MediaTek system clock reset to reset/mediatek

Il 21/10/22 12:48, Bo-Chen Chen ha scritto:

Quoted 87 lines

To manager MediaTek system clock reset easier, we move the driver to drivers/reset/mediatek.

- Create reset/mediatek folder.
- Move clk/mediatek/reset.c to reset/mediatek/reset-mediatek-sysclk.c
- Because we don't want to build in unsed static variable, we use clk KConfig to separate them. For example, when we use MT8186, we don't want to build in the static constants for MT8195.
- Move reset data which are scattered around the mediatek drivers to reset-mtxxxx.c.
- There are two version for mtk_reset_init because some mediatek clock drivers (mt8135 and mt8173) are using device_node instead of device, so we need to add two version for the init function.

---
  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-mt6795-infracfg.c    |  22 +-
  drivers/clk/mediatek/clk-mt6795-pericfg.c     |  20 +-
  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             |  23 +-
  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             |  27 +-
  drivers/clk/mediatek/clk-mt8195-infra_ao.c    |  28 +-
  drivers/clk/mediatek/clk-mtk.c                |   5 +-
  drivers/clk/mediatek/clk-mtk.h                |   5 +-
  drivers/clk/mediatek/reset.c                  | 233 -----------
  drivers/reset/Kconfig                         |   1 +
  drivers/reset/Makefile                        |   1 +
  drivers/reset/mediatek/Kconfig                |   5 +
  drivers/reset/mediatek/Makefile               |  13 +
  .../reset/mediatek/reset-mediatek-sysclk.c    | 388 ++++++++++++++++++
  drivers/reset/mediatek/reset-mt2701.c         | 102 +++++
  drivers/reset/mediatek/reset-mt2712.c         |  42 ++
  drivers/reset/mediatek/reset-mt6795.c         |  61 +++
  drivers/reset/mediatek/reset-mt7622.c         |  91 ++++
  drivers/reset/mediatek/reset-mt7629.c         |  62 +++
  drivers/reset/mediatek/reset-mt8135.c         |  43 ++
  drivers/reset/mediatek/reset-mt8173.c         |  43 ++
  drivers/reset/mediatek/reset-mt8183.c         |  31 ++
  drivers/reset/mediatek/reset-mt8186.c         |  39 ++
  drivers/reset/mediatek/reset-mt8192.c         |  43 ++
  drivers/reset/mediatek/reset-mt8195.c         |  44 ++
  .../linux/reset/reset-mediatek-sysclk.h       |  62 +--
  40 files changed, 1080 insertions(+), 557 deletions(-)

delete mode 100644 drivers/clk/mediatek/reset.c
create mode 100644 drivers/reset/mediatek/Kconfig
create mode 100644 drivers/reset/mediatek/Makefile
create mode 100644 drivers/reset/mediatek/reset-mediatek-sysclk.c
create mode 100644 drivers/reset/mediatek/reset-mt2701.c
create mode 100644 drivers/reset/mediatek/reset-mt2712.c
create mode 100644 drivers/reset/mediatek/reset-mt6795.c
create mode 100644 drivers/reset/mediatek/reset-mt7622.c
create mode 100644 drivers/reset/mediatek/reset-mt7629.c
create mode 100644 drivers/reset/mediatek/reset-mt8135.c
create mode 100644 drivers/reset/mediatek/reset-mt8173.c
create mode 100644 drivers/reset/mediatek/reset-mt8183.c
create mode 100644 drivers/reset/mediatek/reset-mt8186.c
create mode 100644 drivers/reset/mediatek/reset-mt8192.c
create mode 100644 drivers/reset/mediatek/reset-mt8195.c
rename drivers/clk/mediatek/reset.h => include/linux/reset/reset-mediatek-sysclk.h (59%)

drivers/clk/mediatek/Kconfig +1 -0
index 843cea0c7a44..e372f145eada 100644
@@ -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.
 

..snip..

drivers/reset/Makefile line 4

Quoted 9 lines
drivers/reset/Makefile +1 -0
index 3e7e5fd633a8..5cef7ccc9a7d 100644
@@ -1,6 +1,7 @@
  # SPDX-License-Identifier: GPL-2.0
  obj-y += core.o
  obj-y += hisilicon/
+obj-y += mediatek/

I'd be more for

obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/

as there's no reason to even compile these if MTK support isn't enabled at all.

drivers/reset/mediatek/Kconfig line 1

Quoted 10 lines
drivers/reset/Makefile +0 -0
  obj-$(CONFIG_ARCH_STI) += sti/
  obj-$(CONFIG_ARCH_TEGRA) += tegra/
  obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
drivers/reset/mediatek/Kconfig new file +1 -0
new file mode 100644
index 000000000000..a416cb938753
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only

Similarly, we should at this point also do....

if ARCH_MEDIATEK

drivers/reset/mediatek/Kconfig line 5

Quoted 4 lines
drivers/reset/mediatek/Kconfig new file +4 -0
+config RESET_MEDIATEK_SYSCLK
+	tristate "MediaTek System Clock Reset Driver"
+	help
+	  This enables the system clock reset driver for MediaTek SoCs.

endif # ARCH_MEDIATEK

Quoted 24 lines
drivers/reset/mediatek/Makefile new file +13 -0
new file mode 100644
index 000000000000..83f26c2cecdd
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_MEDIATEK_SYSCLK) += reset-mediatek-sysclk.o
+obj-$(CONFIG_COMMON_CLK_MT2701) += reset-mt2701.o
+obj-$(CONFIG_COMMON_CLK_MT2712) += reset-mt2712.o
+obj-$(CONFIG_COMMON_CLK_MT6795) += reset-mt6795.o
+obj-$(CONFIG_COMMON_CLK_MT7622) += reset-mt7622.o
+obj-$(CONFIG_COMMON_CLK_MT7629) += reset-mt7629.o
+obj-$(CONFIG_COMMON_CLK_MT8135) += reset-mt8135.o
+obj-$(CONFIG_COMMON_CLK_MT8173) += reset-mt8173.o
+obj-$(CONFIG_COMMON_CLK_MT8183) += reset-mt8183.o
+obj-$(CONFIG_COMMON_CLK_MT8186) += reset-mt8186.o
+obj-$(CONFIG_COMMON_CLK_MT8192) += reset-mt8192.o
+obj-$(CONFIG_COMMON_CLK_MT8195) += reset-mt8195.o
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +0 -0
new file mode 100644
index 000000000000..9cf115e66a4d

..snip..

Quoted 2 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +2 -0
+
+static struct mtk_rst_id mtk_sysclk_reset_ids[] = {

..snip..

drivers/reset/mediatek/reset-mediatek-sysclk.c line 251

Quoted 6 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +6 -0
+	{
+		.name = "mt2712-peri-rst",
+		.driver_data = MTK_RST_ID_MT2712_PERI,
+	},
+	{
+		.name = "mt6795-ifa",

Keep the names consistent please... "mt6795-infra-rst"

drivers/reset/mediatek/reset-mediatek-sysclk.c line 255

Quoted 4 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +4 -0
+		.driver_data = MTK_RST_ID_MT6795_INFRA,
+	},
+	{
+		.name = "mt6795-peri",

mt6795-peri-rst

Quoted 26 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +26 -0
+		.driver_data = MTK_RST_ID_MT6795_PERI,
+	},
+	{
+		.name = "mt7622-eth-rst",
+		.driver_data = MTK_RST_ID_MT7622_ETH,
+	},
+	{
+		.name = "mt7622-usb-rst",
+		.driver_data = MTK_RST_ID_MT7622_SSUSBSYS,
+	},
+	{
+		.name = "mt7622-pcie-rst",
+		.driver_data = MTK_RST_ID_MT7622_PCIESYS,
+	},
+	{
+		.name = "mt7622-infrasys-rst",
+		.driver_data = MTK_RST_ID_MT7622_INFRASYS,
+	},
+	{
+		.name = "mt7622-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT7622_PERICFG,
+	},
+	{
+		.name = "mt7629-ethsys-rst",
+		.driver_data = MTK_RST_ID_MT7629_ETHSYS,
+	},

drivers/reset/mediatek/reset-mediatek-sysclk.c line 291

Quoted 10 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +10 -0
+	{
+		.name = "mt7629-usb-rst",
+		.driver_data = MTK_RST_ID_MT7629_SSUSBSYS,
+	},
+	{
+		.name = "mt7629-pcie-rst",
+		.driver_data = MTK_RST_ID_MT7629_PCIESYS,
+	},
+	{
+		.name = "clk_mt8135.mt8135-infrasys-rst",

Why do we have this "clk_mt8135." prefix here (and also mt8173), when all of the others don't have any prefix?

That's not consistent and shall be changed, unless there's a valid reason not to.

Quoted 34 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +34 -0
+		.driver_data = MTK_RST_ID_MT8135_INFRASYS,
+	},
+	{
+		.name = "clk_mt8135.mt8135-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT8135_PERICFG,
+	},
+	{
+		.name = "clk_mt8173.mt8173-infracfg-rst",
+		.driver_data = MTK_RST_ID_MT8173_INFRACFG,
+	},
+	{
+		.name = "clk_mt8173.mt8173-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT8173_PERICFG,
+	},
+	{
+		.name = "mt8183-infra-rst",
+		.driver_data = MTK_RST_ID_MT8183_INFRA,
+	},
+	{
+		.name = "mt8186-infra-ao-rst",
+		.driver_data = MTK_RST_ID_MT8186_INFRA_AO,
+	},
+	{
+		.name = "mt8192-infra-rst",
+		.driver_data = MTK_RST_ID_MT8192_INFRA,
+	},
+	{
+		.name = "mt8195-infra-ao-rst",
+		.driver_data = MTK_RST_ID_MT8195_INFRA_AO,
+	},
+	{
+	},
+};
+

..snip..

drivers/reset/mediatek/reset-mediatek-sysclk.c line 347

Quoted 9 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +9 -0
+
+int mtk_rst_register_clk_rst_data(u32 index, struct mtk_clk_rst_data *data)
+{
+	if (index >= MTK_RST_ID_MAX)
+		return -EINVAL;
+
+	p_clk_rst_data[index] = data;
+
+	pr_info("%s, register mediatek sysclock reset(%d).\n", __func__, index);

Is this really informative?
There's sysfs telling you infos about drivers that has been (or hasn't been yet) registered... so, please change that to a pr_debug() instead.

drivers/reset/mediatek/reset-mediatek-sysclk.c line 352

Quoted 5 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +5 -0
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mtk_rst_register_clk_rst_data);
+

Apart from that, looks good.

Regards,
Angelo

#3 lore raw

Re: [PATCH v6 1/3] reset: mediatek: Move MediaTek system clock reset to reset/mediatek

Quoted 113 lines · AngeloGioacchino Del Regno

Il 21/10/22 12:48, Bo-Chen Chen ha scritto:

Quoted 97 lines

To manager MediaTek system clock reset easier, we move the driver to
drivers/reset/mediatek.

- Create reset/mediatek folder.
- Move clk/mediatek/reset.c to reset/mediatek/reset-mediatek- sysclk.c
- Because we don't want to build in unsed static variable, we use clk
KConfig to separate them. For example, when we use MT8186, we
don't
want to build in the static constants for MT8195.
- Move reset data which are scattered around the mediatek drivers to
reset-mtxxxx.c.
- There are two version for mtk_reset_init because some mediatek clock
drivers (mt8135 and mt8173) are using device_node instead of
device,
so we need to add two version for the init function.

---
  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-mt6795-infracfg.c    |  22 +-
  drivers/clk/mediatek/clk-mt6795-pericfg.c     |  20 +-
  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             |  23 +-
  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             |  27 +-
  drivers/clk/mediatek/clk-mt8195-infra_ao.c    |  28 +-
  drivers/clk/mediatek/clk-mtk.c                |   5 +-
  drivers/clk/mediatek/clk-mtk.h                |   5 +-
  drivers/clk/mediatek/reset.c                  | 233 -----------
  drivers/reset/Kconfig                         |   1 +
  drivers/reset/Makefile                        |   1 +
  drivers/reset/mediatek/Kconfig                |   5 +
  drivers/reset/mediatek/Makefile               |  13 +
  .../reset/mediatek/reset-mediatek-sysclk.c    | 388
++++++++++++++++++
  drivers/reset/mediatek/reset-mt2701.c         | 102 +++++
  drivers/reset/mediatek/reset-mt2712.c         |  42 ++
  drivers/reset/mediatek/reset-mt6795.c         |  61 +++
  drivers/reset/mediatek/reset-mt7622.c         |  91 ++++
  drivers/reset/mediatek/reset-mt7629.c         |  62 +++
  drivers/reset/mediatek/reset-mt8135.c         |  43 ++
  drivers/reset/mediatek/reset-mt8173.c         |  43 ++
  drivers/reset/mediatek/reset-mt8183.c         |  31 ++
  drivers/reset/mediatek/reset-mt8186.c         |  39 ++
  drivers/reset/mediatek/reset-mt8192.c         |  43 ++
  drivers/reset/mediatek/reset-mt8195.c         |  44 ++
  .../linux/reset/reset-mediatek-sysclk.h       |  62 +--
  40 files changed, 1080 insertions(+), 557 deletions(-)

delete mode 100644 drivers/clk/mediatek/reset.c
create mode 100644 drivers/reset/mediatek/Kconfig create mode 100644 drivers/reset/mediatek/Makefile create mode 100644 drivers/reset/mediatek/reset-mediatek-sysclk.c create mode 100644 drivers/reset/mediatek/reset-mt2701.c create mode 100644 drivers/reset/mediatek/reset-mt2712.c create mode 100644 drivers/reset/mediatek/reset-mt6795.c create mode 100644 drivers/reset/mediatek/reset-mt7622.c create mode 100644 drivers/reset/mediatek/reset-mt7629.c create mode 100644 drivers/reset/mediatek/reset-mt8135.c create mode 100644 drivers/reset/mediatek/reset-mt8173.c create mode 100644 drivers/reset/mediatek/reset-mt8183.c create mode 100644 drivers/reset/mediatek/reset-mt8186.c create mode 100644 drivers/reset/mediatek/reset-mt8192.c create mode 100644 drivers/reset/mediatek/reset-mt8195.c rename drivers/clk/mediatek/reset.h => include/linux/reset/reset-
mediatek-sysclk.h (59%)

drivers/clk/mediatek/Kconfig +1 -0
index 843cea0c7a44..e372f145eada 100644
@@ -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.
 

..snip..

drivers/reset/Makefile line 4

Quoted 9 lines
drivers/reset/Makefile +1 -0
index 3e7e5fd633a8..5cef7ccc9a7d 100644
@@ -1,6 +1,7 @@
  # SPDX-License-Identifier: GPL-2.0
  obj-y += core.o
  obj-y += hisilicon/
+obj-y += mediatek/

I'd be more for

Quoted 5 lines

obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/

as there's no reason to even compile these if MTK support isn't enabled at all.

Hello Angelo,

thanks for your review.
I obj-y += mediatek/ because if I don't write like this, it will build fail for x86.
Is there any suggestion for this?

/tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_pericfg_init':
clk-mt8135.c:(.init.text+0x12a2b7): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_infrasys_init':
clk-mt8135.c:(.init.text+0x12a3bb): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_infrasys_init':
clk-mt8173.c:(.init.text+0x12ac47): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_pericfg_init':
clk-mt8173.c:(.init.text+0x12ad25): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/kernel/mediatek/scripts/Makefile.vmlinux:34: recipe for target 'vmlinux' failed
make[3]: *** [vmlinux] Error 1
make[3]: Target '__default' not remade because of errors. /tmp/src_kernel/kernel/mediatek/Makefile:1236: recipe for target 'vmlinux' failed
make[2]: *** [vmlinux] Error 2
make[2]: Target '__all' not remade because of errors. make[2]: Leaving directory '/tmp/out_kernel/out/allyesconfig.x86_64' Makefile:231: recipe for target '__sub-make' failed
make[1]: *** [__sub-make] Error 2
make[1]: Target '__all' not remade because of errors. make[1]: Leaving directory '/tmp/src_kernel/kernel/mediatek' build/core/kbuild_test.mk:61: recipe for target 'all' failed
make: *** [all] Error 2
[11:44:04] Error: failed to build allyesconfig.x86_64

Quoted 57 lines

drivers/reset/mediatek/Kconfig line 1

Quoted 11 lines
drivers/reset/Makefile +0 -0
  obj-$(CONFIG_ARCH_STI) += sti/
  obj-$(CONFIG_ARCH_TEGRA) += tegra/
  obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
drivers/reset/mediatek/Kconfig new file +1 -0
new file mode 100644
index 000000000000..a416cb938753
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only

Similarly, we should at this point also do....

if ARCH_MEDIATEK

drivers/reset/mediatek/Kconfig line 5

Quoted 4 lines
drivers/reset/mediatek/Kconfig new file +4 -0
+config RESET_MEDIATEK_SYSCLK
+	tristate "MediaTek System Clock Reset Driver"
+	help
+	  This enables the system clock reset driver for MediaTek SoCs.

endif # ARCH_MEDIATEK

Quoted 26 lines
drivers/reset/mediatek/Makefile new file +13 -0
new file mode 100644
index 000000000000..83f26c2cecdd
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_MEDIATEK_SYSCLK) += reset-mediatek-sysclk.o
+obj-$(CONFIG_COMMON_CLK_MT2701) += reset-mt2701.o
+obj-$(CONFIG_COMMON_CLK_MT2712) += reset-mt2712.o
+obj-$(CONFIG_COMMON_CLK_MT6795) += reset-mt6795.o
+obj-$(CONFIG_COMMON_CLK_MT7622) += reset-mt7622.o
+obj-$(CONFIG_COMMON_CLK_MT7629) += reset-mt7629.o
+obj-$(CONFIG_COMMON_CLK_MT8135) += reset-mt8135.o
+obj-$(CONFIG_COMMON_CLK_MT8173) += reset-mt8173.o
+obj-$(CONFIG_COMMON_CLK_MT8183) += reset-mt8183.o
+obj-$(CONFIG_COMMON_CLK_MT8186) += reset-mt8186.o
+obj-$(CONFIG_COMMON_CLK_MT8192) += reset-mt8192.o
+obj-$(CONFIG_COMMON_CLK_MT8195) += reset-mt8195.o
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +0 -0
new file mode 100644
index 000000000000..9cf115e66a4d

..snip..

Quoted 2 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +2 -0
+
+static struct mtk_rst_id mtk_sysclk_reset_ids[] = {

..snip..

Quoted 9 lines

drivers/reset/mediatek/reset-mediatek-sysclk.c line 251

Quoted 6 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +6 -0
+	{
+		.name = "mt2712-peri-rst",
+		.driver_data = MTK_RST_ID_MT2712_PERI,
+	},
+	{
+		.name = "mt6795-ifa",

Keep the names consistent please... "mt6795-infra-rst"

The reason I rename it as this because the limitation of name in struct auxiliary_device_id. It's 32. The
KBUILD_MODNAME "clk_mt6795_infracfg" and "clk_mt6795_pericfg" is fixed, so I need to modify the device_name.

refs:
https://elixir.bootlin.com/linux/latest/source/include/linux/mod_devicetable.h#L854

Quoted 48 lines

drivers/reset/mediatek/reset-mediatek-sysclk.c line 255

Quoted 4 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +4 -0
+		.driver_data = MTK_RST_ID_MT6795_INFRA,
+	},
+	{
+		.name = "mt6795-peri",

mt6795-peri-rst

Quoted 26 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +26 -0
+		.driver_data = MTK_RST_ID_MT6795_PERI,
+	},
+	{
+		.name = "mt7622-eth-rst",
+		.driver_data = MTK_RST_ID_MT7622_ETH,
+	},
+	{
+		.name = "mt7622-usb-rst",
+		.driver_data = MTK_RST_ID_MT7622_SSUSBSYS,
+	},
+	{
+		.name = "mt7622-pcie-rst",
+		.driver_data = MTK_RST_ID_MT7622_PCIESYS,
+	},
+	{
+		.name = "mt7622-infrasys-rst",
+		.driver_data = MTK_RST_ID_MT7622_INFRASYS,
+	},
+	{
+		.name = "mt7622-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT7622_PERICFG,
+	},
+	{
+		.name = "mt7629-ethsys-rst",
+		.driver_data = MTK_RST_ID_MT7629_ETHSYS,
+	},

drivers/reset/mediatek/reset-mediatek-sysclk.c line 291

Quoted 10 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +10 -0
+	{
+		.name = "mt7629-usb-rst",
+		.driver_data = MTK_RST_ID_MT7629_SSUSBSYS,
+	},
+	{
+		.name = "mt7629-pcie-rst",
+		.driver_data = MTK_RST_ID_MT7629_PCIESYS,
+	},
+	{
+		.name = "clk_mt8135.mt8135-infrasys-rst",

Why do we have this "clk_mt8135." prefix here (and also mt8173), when all of
the others don't have any prefix?

Quoted 3 lines

That's not consistent and shall be changed, unless there's a valid reason not to.

I do this because in patch [3/3], other name will be added KBUILD_MODNAME and for 8135 and 8173, we can not use the aux bus interface because there is no have not device provided by them.

Quoted 37 lines
Quoted 34 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +34 -0
+		.driver_data = MTK_RST_ID_MT8135_INFRASYS,
+	},
+	{
+		.name = "clk_mt8135.mt8135-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT8135_PERICFG,
+	},
+	{
+		.name = "clk_mt8173.mt8173-infracfg-rst",
+		.driver_data = MTK_RST_ID_MT8173_INFRACFG,
+	},
+	{
+		.name = "clk_mt8173.mt8173-pericfg-rst",
+		.driver_data = MTK_RST_ID_MT8173_PERICFG,
+	},
+	{
+		.name = "mt8183-infra-rst",
+		.driver_data = MTK_RST_ID_MT8183_INFRA,
+	},
+	{
+		.name = "mt8186-infra-ao-rst",
+		.driver_data = MTK_RST_ID_MT8186_INFRA_AO,
+	},
+	{
+		.name = "mt8192-infra-rst",
+		.driver_data = MTK_RST_ID_MT8192_INFRA,
+	},
+	{
+		.name = "mt8195-infra-ao-rst",
+		.driver_data = MTK_RST_ID_MT8195_INFRA_AO,
+	},
+	{
+	},
+};
+

..snip..

Quoted 17 lines
Quoted 11 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +2 -0
+
+int mtk_rst_register_clk_rst_data(u32 index, struct

mtk_clk_rst_data *data)

drivers/reset/mediatek/reset-mediatek-sysclk.c new file +7 -0
+{
+	if (index >= MTK_RST_ID_MAX)
+		return -EINVAL;
+
+	p_clk_rst_data[index] = data;
+
+	pr_info("%s, register mediatek sysclock reset(%d).\n",

__func__, index);

Is this really informative?
There's sysfs telling you infos about drivers that has been (or hasn't been yet)
registered... so, please change that to a pr_debug() instead.

ok, I will do this.

BRs,
Bo-Chen

Quoted 10 lines

drivers/reset/mediatek/reset-mediatek-sysclk.c line 352

Quoted 5 lines
drivers/reset/mediatek/reset-mediatek-sysclk.c new file +5 -0
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mtk_rst_register_clk_rst_data);
+

Apart from that, looks good.

Regards,
Angelo

#4 lore raw

Re: [PATCH v6 1/3] reset: mediatek: Move MediaTek system clock reset to reset/mediatek

Quoted 2 lines · Rex-BC Chen (陳柏辰)
Quoted 1 line · AngeloGioacchino Del Regno

Il 21/10/22 12:48, Bo-Chen Chen ha scritto:

[..]

Quoted 62 lines
Quoted 25 lines
Quoted 10 lines
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.
 

..snip..

drivers/reset/Makefile line 4

Quoted 9 lines
drivers/reset/Makefile +1 -0
index 3e7e5fd633a8..5cef7ccc9a7d 100644
@@ -1,6 +1,7 @@
  # SPDX-License-Identifier: GPL-2.0
  obj-y += core.o
  obj-y += hisilicon/
+obj-y += mediatek/

I'd be more for

Quoted 5 lines

obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/

as there's no reason to even compile these if MTK support isn't enabled at all.

Hello Angelo,

thanks for your review.
I obj-y += mediatek/ because if I don't write like this, it will build fail for x86.
Is there any suggestion for this?

/tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_pericfg_init':
clk-mt8135.c:(.init.text+0x12a2b7): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_infrasys_init':
clk-mt8135.c:(.init.text+0x12a3bb): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_infrasys_init':
clk-mt8173.c:(.init.text+0x12ac47): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/prebuilt/toolchain/0day/gcc/x86_64-linux/bin/x86_64-
linux-ld: vmlinux.o: in function `mtk_pericfg_init':
clk-mt8173.c:(.init.text+0x12ad25): undefined reference to `mtk_reset_init_with_node' /tmp/src_kernel/kernel/mediatek/scripts/Makefile.vmlinux:34: recipe for target 'vmlinux' failed
make[3]: *** [vmlinux] Error 1
make[3]: Target '__default' not remade because of errors. /tmp/src_kernel/kernel/mediatek/Makefile:1236: recipe for target 'vmlinux' failed
make[2]: *** [vmlinux] Error 2
make[2]: Target '__all' not remade because of errors.

Quoted 8 lines

make[2]: Leaving directory '/tmp/out_kernel/out/allyesconfig.x86_64' Makefile:231: recipe for target '__sub-make' failed make[1]: *** [__sub-make] Error 2
make[1]: Target '__all' not remade because of errors. make[1]: Leaving directory '/tmp/src_kernel/kernel/mediatek' build/core/kbuild_test.mk:61: recipe for target 'all' failed
make: *** [all] Error 2
[11:44:04] Error: failed to build allyesconfig.x86_64

From the errors it seems like you're compiling the clock drivers (like clk-mt8135.c) but not the sysclk reset driver (reset-mediatek-sysclk.c). Given that this happened when you added CONFIG_ARCH_MEDIATEK to that Makefile, then it must mean that that config is disabled, which would make sense for a x86 build. But then the fact that the clock driver was built even in this case must mean that you have COMPILE_TEST enabled.

I guess in order to have a working COMPILE_TEST=y build, you do need to have obj-y += mediatek/, and on the Kconfig below...

Quoted 15 lines
Quoted 15 lines

drivers/reset/mediatek/Kconfig line 1

Quoted 12 lines
drivers/reset/Makefile +0 -0
  obj-$(CONFIG_ARCH_STI) += sti/
  obj-$(CONFIG_ARCH_TEGRA) += tegra/
  obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
drivers/reset/mediatek/Kconfig new file +1 -0
new file mode 100644
index 000000000000..a416cb938753
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only

Similarly, we should at this point also do....

Quoted 1 line
Quoted 1 line

if ARCH_MEDIATEK

... have instead

if ARCH_MEDIATEK || COMPILE_TEST

I think that should fix the issue.

Thanks,
Nícolas

Quoted 7 lines
Quoted 7 lines

drivers/reset/mediatek/Kconfig line 5

Quoted 5 lines
drivers/reset/mediatek/Kconfig new file +4 -0
+config RESET_MEDIATEK_SYSCLK
+	tristate "MediaTek System Clock Reset Driver"
+	help
+	  This enables the system clock reset driver for MediaTek SoCs.

endif # ARCH_MEDIATEK

#5 lore raw

PATCH v6 2/3 clk: mediatek: Add auxiliary bus support for sysclk reset

In reply to Bo-Chen Chen

To see the relationship in sysfs between devices and they're "real" device drivers for the reset component of the device:

- Add auxiliary bus support for sysclk reset.
- Change to use the mtk_reset_controller_register() to register sysclk reset for mediatek clock drivers using device.

---
 drivers/clk/mediatek/Kconfig               |  1 +
 drivers/clk/mediatek/clk-mt2701-eth.c      |  2 +-
 drivers/clk/mediatek/clk-mt2701-g3d.c      |  2 +-
 drivers/clk/mediatek/clk-mt2701-hif.c      |  2 +-
 drivers/clk/mediatek/clk-mt2701.c          |  4 +-
 drivers/clk/mediatek/clk-mt2712.c          |  4 +-
 drivers/clk/mediatek/clk-mt6795-infracfg.c |  2 +-
 drivers/clk/mediatek/clk-mt6795-pericfg.c  |  2 +-
 drivers/clk/mediatek/clk-mt7622-eth.c      |  2 +-
 drivers/clk/mediatek/clk-mt7622-hif.c      |  4 +-
 drivers/clk/mediatek/clk-mt7622.c          |  4 +-
 drivers/clk/mediatek/clk-mt7629-eth.c      |  2 +-
 drivers/clk/mediatek/clk-mt7629-hif.c      |  4 +-
 drivers/clk/mediatek/clk-mt8183.c          |  2 +-
 drivers/clk/mediatek/clk-mt8192.c          |  2 +-
 drivers/clk/mediatek/clk-mtk.c             | 59 +++++++++++++++++++++-
 drivers/clk/mediatek/clk-mtk.h             |  3 ++
 17 files changed, 81 insertions(+), 20 deletions(-)
drivers/clk/mediatek/Kconfig +1 -0
index e372f145eada..bcd073ada0e9 100644
@@ -9,6 +9,7 @@ config COMMON_CLK_MEDIATEK
 	tristate
 	select RESET_CONTROLLER
 	select RESET_MEDIATEK_SYSCLK
+	select AUXILIARY_BUS
 	help
 	  MediaTek SoCs' clock support.
 
drivers/clk/mediatek/clk-mt2701-eth.c +1 -1
index 2106a147833a..2da95232e529 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2701-eth-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2701-eth-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt2701-g3d.c +1 -1
index c7bf42ade6f0..da43c422d452 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2701-g3d-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2701-g3d-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt2701-hif.c +1 -1
index 070bd2c9f006..2ecccf8fe16e 100644
@@ -57,7 +57,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_reset_init_with_dev(&pdev->dev, "mt2701-hif-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2701-hif-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt2701.c +2 -2
index f5c0af2f8743..b90f611a5b52 100644
@@ -787,7 +787,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_reset_init_with_dev(&pdev->dev, "mt2701-infrasys-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2701-infrasys-rst");
 
 	return 0;
 }
@@ -910,7 +910,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_reset_init_with_dev(&pdev->dev, "mt2701-pericfg-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2701-pericfg-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt2712.c +2 -2
index a13e9b35786c..bada923b60cf 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt2712-infra-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2712-infra-rst");
 
 	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_reset_init_with_dev(&pdev->dev, "mt2712-peri-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt2712-peri-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt6795-infracfg.c +1 -1
index 8610ca86bfc2..725d17f95ed4 100644
@@ -77,7 +77,7 @@ static int clk_mt6795_infracfg_probe(struct platform_device *pdev)
 	if (!clk_data)
 		return -ENOMEM;
 
-	ret = mtk_reset_init_with_dev(&pdev->dev, "mt6795-ifa");
+	ret = mtk_reset_controller_register(&pdev->dev, "mt6795-ifa");
 	if (ret)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mt6795-pericfg.c +1 -1
index 696b95b31157..db02e513d9f6 100644
@@ -87,7 +87,7 @@ static int clk_mt6795_pericfg_probe(struct platform_device *pdev)
 	if (!clk_data)
 		return -ENOMEM;
 
-	ret = mtk_reset_init_with_dev(&pdev->dev, "mt6795-peri");
+	ret = mtk_reset_controller_register(&pdev->dev, "mt6795-peri");
 	if (ret)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mt7622-eth.c +1 -1
index 9a74ae83c38e..2e668ed78cd5 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7622-eth-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7622-eth-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7622-hif.c +2 -2
index 7586e22499ec..0335d84b0043 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7622-usb-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7622-usb-rst");
 
 	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_reset_init_with_dev(&pdev->dev, "mt7622-pcie-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7622-pcie-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7622.c +2 -2
index 90dcca745555..ea4c21b9a6a0 100644
@@ -663,7 +663,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 	if (r)
 		return r;
 
-	mtk_reset_init_with_dev(&pdev->dev, "mt7622-infrasys-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7622-infrasys-rst");
 
 	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_reset_init_with_dev(&pdev->dev, "mt7622-pericfg-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7622-pericfg-rst");
 
 	return 0;
 }
drivers/clk/mediatek/clk-mt7629-eth.c +1 -1
index 2a19762b046e..dadc76da899b 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7629-ethsys-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7629-ethsys-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt7629-hif.c +2 -2
index d62d343387b3..bd6fdfd97504 100644
@@ -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_reset_init_with_dev(&pdev->dev, "mt7629-usb-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7629-usb-rst");
 
 	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_reset_init_with_dev(&pdev->dev, "mt7629-pcie-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt7629-pcie-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt8183.c +1 -1
index 3040572b8848..7e2be81e58d9 100644
@@ -1265,7 +1265,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
 		return r;
 	}
 
-	mtk_reset_init_with_dev(&pdev->dev, "mt8183-infra-rst");
+	mtk_reset_controller_register(&pdev->dev, "mt8183-infra-rst");
 
 	return r;
 }
drivers/clk/mediatek/clk-mt8192.c +1 -1
index ab9e0686d2ac..11ca428030b8 100644
@@ -1112,7 +1112,7 @@ static int clk_mt8192_infra_probe(struct platform_device *pdev)
 	if (r)
 		goto free_clk_data;
 
-	r = mtk_reset_init_with_dev(&pdev->dev, "mt8192-infra-rst");
+	r = mtk_reset_controller_register(&pdev->dev, "mt8192-infra-rst");
 	if (r)
 		goto free_clk_data;
 
drivers/clk/mediatek/clk-mtk.c +58 -1

71 lines not on this page · raw message

drivers/clk/mediatek/clk-mtk.h +3 -0
index 41183ac56b11..9578643ef5a2 100644
@@ -7,6 +7,7 @@
 #ifndef __DRV_CLK_MTK_H
 #define __DRV_CLK_MTK_H
 
+#include <linux/auxiliary_bus.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -200,4 +201,6 @@ struct mtk_clk_desc {
 int mtk_clk_simple_probe(struct platform_device *pdev);
 int mtk_clk_simple_remove(struct platform_device *pdev);
 
+int mtk_reset_controller_register(struct device *dev, const char *name);
+
 #endif /* __DRV_CLK_MTK_H */
Signature · 1 line
2.18.0
maintainer
#6 lore raw

Re: [PATCH v6 2/3] clk: mediatek: Add auxiliary bus support for sysclk reset

Quoting Bo-Chen Chen (2022-10-21 03:48:03)

Quoted 5 lines
drivers/clk/mediatek/clk-mtk.c +0 -0
index 74408849ed86..61b7ee23738a 100644
@@ -444,6 +444,63 @@ void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,

[..]

Quoted 6 lines
drivers/clk/mediatek/clk-mtk.c +6 -0
+int mtk_reset_controller_register(struct device *dev, const char *name)
+{
+       struct auxiliary_device *adev;
+       int ret;
+
+       adev = mtk_reset_adev_alloc(dev, name);

drivers/clk/mediatek/clk-mtk.c void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num, · line 500

Quoted 10 lines
drivers/clk/mediatek/clk-mtk.c +10 -0
+       if (IS_ERR(adev))
+               return PTR_ERR(adev);
+
+       ret = auxiliary_device_add(adev);
+       if (ret) {
+               auxiliary_device_uninit(adev);
+               return ret;
+       }
+
+       return devm_add_action_or_reset(dev, mtk_reset_unregister_adev, adev);

Can we have devm_auxiliary_device_add() that sets the parent and registers the device?

#7 lore raw

Re: [PATCH v6 2/3] clk: mediatek: Add auxiliary bus support for sysclk reset

Quoted 23 lines · Stephen Boyd

Quoting Bo-Chen Chen (2022-10-21 03:48:03)

Quoted 7 lines
drivers/clk/mediatek/clk-mtk.c +0 -0
index 74408849ed86..61b7ee23738a 100644
@@ -444,6 +444,63 @@ void mtk_clk_unregister_dividers(const struct
 mtk_clk_divider *mcds, int num,

[..]

Quoted 13 lines

+int mtk_reset_controller_register(struct device *dev, const char *name)

drivers/clk/mediatek/clk-mtk.c +11 -0
+{
+       struct auxiliary_device *adev;
+       int ret;
+
+       adev = mtk_reset_adev_alloc(dev, name);
+       if (IS_ERR(adev))
+               return PTR_ERR(adev);
+
+       ret = auxiliary_device_add(adev);
+       if (ret) {
+               auxiliary_device_uninit(adev);
Quoted 8 lines
Quoted 5 lines
drivers/clk/mediatek/clk-mtk.c +4 -0
+               return ret;
+       }
+
+       return devm_add_action_or_reset(dev,

mtk_reset_unregister_adev, adev);

Can we have devm_auxiliary_device_add() that sets the parent and registers the device?

Hello Stephen,

I can't find the definition of devm_auxiliary_device_add(). Is there any information for this function?

BRs,
Bo-Chen

#8 lore raw

PATCH v6 3/3 reset: mediatek: Add auxiliary bus support for sysclk

In reply to Bo-Chen Chen

To use auxiliary bus interface:

- Add a probe function inside reset-mediatek-sysclk.c.
- Revise the auxiliary table name because the rule for this table is KBUILD_MODNAME.device_name
- Remove mtk_reset_init_with_dev() because we should use aux bus interface directly.

---
 drivers/reset/mediatek/Kconfig                |  1 +
 .../reset/mediatek/reset-mediatek-sysclk.c    | 67 ++++++++++---------
 include/linux/reset/reset-mediatek-sysclk.h   |  1 -
 3 files changed, 35 insertions(+), 34 deletions(-)
drivers/reset/mediatek/Kconfig +1 -0
index a416cb938753..b5b671017d34 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config RESET_MEDIATEK_SYSCLK
 	tristate "MediaTek System Clock Reset Driver"
+	depends on AUXILIARY_BUS
 	help
 	  This enables the system clock reset driver for MediaTek SoCs.
drivers/reset/mediatek/reset-mediatek-sysclk.c +34 -33

158 lines not on this page · raw message

include/linux/reset/reset-mediatek-sysclk.h +0 -1
index 26f7573e46a6..6f5f15d12edd 100644
@@ -93,6 +93,5 @@ struct mtk_clk_rst_data {
 int mtk_rst_register_clk_rst_data(u32 index, struct mtk_clk_rst_data *data);
 int mtk_reset_init_with_node(struct device_node *np, const char *name);
 void mtk_rst_remove_with_node(struct device_node *np, const char *name);
-int mtk_reset_init_with_dev(struct device *dev, const char *name);
 
 #endif /* __LINUX_RESET_MEDIATEK_SYSCLK_H__ */
Signature · 1 line
2.18.0