Cleanup MediaTek clk reset drivers and support SoCs
Subsystems (4)
v8 cover Cleanup MediaTek clk reset drivers and support SoCs
In this series, we cleanup MediaTek clock reset drivers in clk/mediatek folder. MediaTek clock reset driver is used to provide reset control of modules controlled in clk, like infra_ao.
Changes for v8 resend:
1. Remove tested-by tag from Nícolas for MT8195/MT8186 patches.
2. Add reviewed-by tag from AngeloGioacchino.
Changes for v8:
1. Use 'enum mtk_reset_version' to replace u8 in patch 5 and 6.
2. Use lowercase '0xc' in patch 7.
3. Drop "simple-mfd" in patch 16 because it's for original reset controller.
4. v8 is based on linux-next next-20220520 and Chen-Yu's series[1].
Changes for v7:
1. v7 is based on linux-next next-20220519 and Chen-Yu's series[1].
2. Add support for MT8186.
[1]: https://patchwork.kernel.org/project/linux-mediatek/list/?series=643003
Changes for v6:
1. Add a new patch to support inuput argument index mode.
2. Revise definition in reset.h to index.
Rex-BC Chen (19):
clk: mediatek: reset: Add reset.h
clk: mediatek: reset: Fix written reset bit offset
clk: mediatek: reset: Refine and reorder functions in reset.c
clk: mediatek: reset: Extract common drivers to update function
clk: mediatek: reset: Merge and revise reset register function
clk: mediatek: reset: Revise structure to control reset register
clk: mediatek: reset: Support nonsequence base offsets of reset
registers
clk: mediatek: reset: Support inuput argument index mode
clk: mediatek: reset: Change return type for clock reset register
function
clk: mediatek: reset: Add new register reset function with device
clk: mediatek: reset: Add reset support for simple probe
dt-bindings: arm: mediatek: Add #reset-cells property for
MT8192/MT8195
dt-bindings: reset: mediatek: Add infra_ao reset index for
MT8192/MT8195 clk: mediatek: reset: Add infra_ao reset support for MT8192/MT8195
arm64: dts: mediatek: Add infra #reset-cells property for MT8192
arm64: dts: mediatek: Add infra #reset-cells property for MT8195
dt-bindings: reset: mediatek: Add infra_ao reset index for MT8186
dt-bindings: arm: mediatek: Add #reset-cells property for MT8186
clk: mediatek: reset: Add infra_ao reset support for MT8186
.../mediatek/mediatek,mt8186-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8192-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8195-sys-clock.yaml | 3 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 15 +- 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 | 18 +- drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 ++ drivers/clk/mediatek/clk-mt8192.c | 29 +++ drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 +++ drivers/clk/mediatek/clk-mtk.c | 7 + drivers/clk/mediatek/clk-mtk.h | 9 +- drivers/clk/mediatek/reset.c | 198 +++++++++++++----- drivers/clk/mediatek/reset.h | 82 ++++++++ include/dt-bindings/reset/mt8186-resets.h | 5 + include/dt-bindings/reset/mt8192-resets.h | 8 + include/dt-bindings/reset/mt8195-resets.h | 6 + 28 files changed, 523 insertions(+), 95 deletions(-) create mode 100644 drivers/clk/mediatek/reset.h
Signature · 1 line
2.18.0
PATCH RESEND v8 1/19 clk: mediatek: reset: Add reset.h
Add a new file "reset.h" to place some definitions for clock reset.
--- drivers/clk/mediatek/clk-mtk.h | 8 ++------ drivers/clk/mediatek/reset.c | 9 +-------- drivers/clk/mediatek/reset.h | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 drivers/clk/mediatek/reset.h
drivers/clk/mediatek/clk-mtk.h +2 -6
@@ -13,6 +13,8 @@#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)
@@ -187,12 +189,6 @@ void mtk_free_clk_data(struct clk_hw_onecell_data *clk_data);struct clk_hw *mtk_clk_register_ref2usb_tx (const char *name,const char *parent_name,void __iomem *reg); -void mtk_register_reset_controller (struct device_node *np, -unsigned int num_regs,int regofs); - -void mtk_register_reset_controller_set_clr (struct device_node *np, -unsigned int num_regs,int regofs); -struct mtk_clk_desc {const struct mtk_gate *clks;size_t num_clks;
drivers/clk/mediatek/reset.c +1 -8
@@ -8,16 +8,9 @@#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> -#include <linux/reset-controller.h> #include <linux/slab.h> -#include "clk-mtk.h" - -struct mtk_reset { -struct regmap *regmap; -int regofs; -struct reset_controller_dev rcdev; -}; +#include "reset.h" static int mtk_reset_assert_set_clr (struct reset_controller_dev *rcdev,unsigned long id)
drivers/clk/mediatek/reset.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 MediaTek Inc. +*/ + +#ifndef __DRV_CLK_MTK_RESET_H +#define __DRV_CLK_MTK_RESET_H + +#include <linux/reset-controller.h> +#include <linux/types.h> + +struct mtk_reset { +struct regmap *regmap; +int regofs; +struct reset_controller_dev rcdev; +}; + +void mtk_register_reset_controller (struct device_node *np, +unsigned int num_regs,int regofs); + +void mtk_register_reset_controller_set_clr (struct device_node *np, +unsigned int num_regs,int regofs); + +#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [RESEND v8 01/19] clk: mediatek: reset: Add reset.h
Quoting Rex-BC Chen (2022-05-23 02:33:28)
Quoted 7 lines
Add a new file "
reset.h" to place some definitions for clock reset.Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 2/19 clk: mediatek: reset: Fix written reset bit offset
In reply to Rex-BC ChenOriginal assert/deassert bit is BIT(0), but it's more resonable to modify them to BIT(id % 32) which is based on id.
This patch will not influence any previous driver because the reset is only used for thermal. The id (MT8183_INFRACFG_AO_THERM_SW_RST) is 0.
--- drivers/clk/mediatek/reset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mediatek/reset.c +2 -2
@@ -18,7 +18,7 @@ static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);unsigned int reg = data->regofs + ((id /32 ) <<4 ); -return regmap_write (data->regmap, reg,1 ); +return regmap_write (data->regmap, reg,BIT (id %32 )); } static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
@@ -27,7 +27,7 @@ static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);unsigned int reg = data->regofs + ((id /32 ) <<4 ) +0x4 ; -return regmap_write (data->regmap, reg,1 ); +return regmap_write (data->regmap, reg,BIT (id %32 )); } static int mtk_reset_assert(struct reset_controller_dev *rcdev,
Signature · 1 line
2.18.0
Re: [RESEND v8 02/19] clk: mediatek: reset: Fix written reset bit offset
Quoting Rex-BC Chen (2022-05-23 02:33:29)
Quoted 6 lines
Original assert/deassert bit is BIT(0), but it's more resonable to modify them to BIT(id % 32) which is based on id.
This patch will not influence any previous driver because the reset is only used for thermal. The id (
MT8183_INFRACFG_AO_THERM_SW_RST) is 0.
Quoted 7 lines
Fixes 64ebb57a3df6 ("clk: reset: Modify reset-controller driver")Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by Chen-Yu Tsai <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 3/19 clk: mediatek: reset: Refine and reorder functions in reset.c
In reply to Rex-BC ChenTo make drivers more readable, we modify the indentation of the drivers and reorder the location of functions.
--- drivers/clk/mediatek/reset.c | 68 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 32 deletions(-)
drivers/clk/mediatek/reset.c +36 -32
@@ -12,56 +12,59 @@#include "reset.h" -static int mtk_reset_assert_set_clr (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_assert (struct reset_controller_dev *rcdev, +unsigned long id) { struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); -unsigned int reg = data->regofs + ((id /32 ) <<4 ); -return regmap_write (data->regmap, reg,BIT (id %32 )); +return regmap_update_bits (data->regmap, + data->regofs + ((id /32 ) <<2 ), +BIT (id %32 ), ~0 ); } -static int mtk_reset_deassert_set_clr (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_deassert (struct reset_controller_dev *rcdev, +unsigned long id) { struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); -unsigned int reg = data->regofs + ((id /32 ) <<4 ) +0x4 ; -return regmap_write (data->regmap, reg,BIT (id %32 )); +return regmap_update_bits (data->regmap, + data->regofs + ((id /32 ) <<2 ), +BIT (id %32 ),0 ); } -static int mtk_reset_assert (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset (struct reset_controller_dev *rcdev,unsigned long id) { - struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); +int ret; + + ret =mtk_reset_assert (rcdev, id); +if (ret) +return ret; -return regmap_update_bits (data->regmap, data->regofs + ((id /32 ) <<2 ), -BIT (id %32 ), ~0 ); +return mtk_reset_deassert (rcdev, id); } -static int mtk_reset_deassert (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_assert_set_clr (struct reset_controller_dev *rcdev, +unsigned long id) { struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); -return regmap_update_bits (data->regmap, data->regofs + ((id /32 ) <<2 ), -BIT (id %32 ),0 ); +return regmap_write (data->regmap, + data->regofs + ((id /32 ) <<4 ), +BIT (id %32 )); } -static int mtk_reset (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_deassert_set_clr (struct reset_controller_dev *rcdev, +unsigned long id) { -int ret; - - ret =mtk_reset_assert (rcdev, id); -if (ret) -return ret; + struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); -return mtk_reset_deassert (rcdev, id); +return regmap_write (data->regmap, + data->regofs + ((id /32 ) <<4 ) +0x4 , +BIT (id %32 )); }static int mtk_reset_set_clr (struct reset_controller_dev *rcdev, -unsigned long id) +unsigned long id) {int ret;
@@ -84,8 +87,9 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { };static void mtk_register_reset_controller_common (struct device_node *np, -unsigned int num_regs,int regofs, -const struct reset_control_ops *reset_ops) +unsigned int num_regs, +int regofs, +const struct reset_control_ops *reset_ops) {struct mtk_reset *data;int ret;
@@ -117,17 +121,17 @@ static void mtk_register_reset_controller_common(struct device_node *np, }void mtk_register_reset_controller (struct device_node *np, -unsigned int num_regs,int regofs) +unsigned int num_regs,int regofs) {mtk_register_reset_controller_common (np, num_regs, regofs, - &mtk_reset_ops); + &mtk_reset_ops); }void mtk_register_reset_controller_set_clr (struct device_node *np, -unsigned int num_regs,int regofs) +unsigned int num_regs,int regofs) {mtk_register_reset_controller_common (np, num_regs, regofs, - &mtk_reset_ops_set_clr); + &mtk_reset_ops_set_clr); }MODULE_LICENSE ("GPL" );
Signature · 1 line
2.18.0
Re: [RESEND v8 03/19] clk: mediatek: reset: Refine and reorder functions in reset.c
Quoting Rex-BC Chen (2022-05-23 02:33:30)
Quoted 8 lines
To make drivers more readable, we modify the indentation of the drivers and reorder the location of functions.
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 4/19 clk: mediatek: reset: Extract common drivers to update function
In reply to Rex-BC ChenTo make drivers more clear and readable, we extract common code within assert and deassert to mtk_reset_update_set_clr() and mtk_reset_update().
--- drivers/clk/mediatek/reset.c | 38 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/clk/mediatek/reset.c +22 -16
@@ -12,24 +12,27 @@#include "reset.h" -static int mtk_reset_assert (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_update (struct reset_controller_dev *rcdev, +unsigned long id,bool deassert) { struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); +unsigned int val = deassert ?0 : ~0 ;return regmap_update_bits (data->regmap, data->regofs + ((id /32 ) <<2 ), -BIT (id %32 ), ~0 ); +BIT (id %32 ), val); +} + +static int mtk_reset_assert (struct reset_controller_dev *rcdev, +unsigned long id) +{ +return mtk_reset_update (rcdev, id, false); }static int mtk_reset_deassert (struct reset_controller_dev *rcdev,unsigned long id) { - struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); - -return regmap_update_bits (data->regmap, - data->regofs + ((id /32 ) <<2 ), -BIT (id %32 ),0 ); +return mtk_reset_update (rcdev, id, true); }static int mtk_reset (struct reset_controller_dev *rcdev,unsigned long id)
@@ -43,24 +46,27 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)return mtk_reset_deassert (rcdev, id); } -static int mtk_reset_assert_set_clr (struct reset_controller_dev *rcdev, -unsigned long id) +static int mtk_reset_update_set_clr (struct reset_controller_dev *rcdev, +unsigned long id,bool deassert) { struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); +unsigned int deassert_ofs = deassert ?0x4 :0 ;return regmap_write (data->regmap, - data->regofs + ((id /32 ) <<4 ), + data->regofs + ((id /32 ) <<4 ) + deassert_ofs,BIT (id %32 )); } +static int mtk_reset_assert_set_clr (struct reset_controller_dev *rcdev, +unsigned long id) +{ +return mtk_reset_update_set_clr (rcdev, id, false); +} +static int mtk_reset_deassert_set_clr (struct reset_controller_dev *rcdev,unsigned long id) { - struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); - -return regmap_write (data->regmap, - data->regofs + ((id /32 ) <<4 ) +0x4 , -BIT (id %32 )); +return mtk_reset_update_set_clr (rcdev, id, true); } static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,
Signature · 1 line
2.18.0
Re: [RESEND v8 04/19] clk: mediatek: reset: Extract common drivers to update function
Quoting Rex-BC Chen (2022-05-23 02:33:31)
Quoted 9 lines
To make drivers more clear and readable, we extract common code within assert and deassert to
mtk_reset_update_set_clr()andmtk_reset_update().Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 5/19 clk: mediatek: reset: Merge and revise reset register function
In reply to Rex-BC ChenThere are two versions for clock reset register control for MediaTek SoCs. The old hardware is one bit per reset control, and does not have separate registers for bit set, clear and read-back operations. This matches the scheme supported by the simple reset driver.
However, because we need to use different data structure from reset_simple_data, we can not use the operation of simple reset driver.
For this reason, we keep the original functions and name this version as "MTK_RST_SIMPLE".
In this patch:
- Add a version enumeration to separate different reset hardware.
- Merge the reset register function of simple and set_clr into one function "mtk_register_reset_controller".
- Rename input variable "num_regs" to "rst_bank_nr" to avoid confusion. This variable is used to define the quantity of reset bank.
- Document mtk_reset_version and mtk_register_reset_controller.
--- 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-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-mt8135.c | 4 +-- drivers/clk/mediatek/clk-mt8173.c | 4 +-- drivers/clk/mediatek/clk-mt8183.c | 3 +- drivers/clk/mediatek/reset.c | 41 +++++++++++++-------------- drivers/clk/mediatek/reset.h | 25 +++++++++++++--- 15 files changed, 61 insertions(+), 46 deletions(-)
drivers/clk/mediatek/clk-mt2701-eth.c +1 -1
@@ -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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt2701-g3d.c +1 -1
@@ -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_register_reset_controller (node,1 ,0xc ); +mtk_register_reset_controller (node,1 ,0xc ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt2701-hif.c +1 -1
@@ -57,7 +57,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return 0 ; }
drivers/clk/mediatek/clk-mt2701.c +2 -2
@@ -787,7 +787,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,2 ,0x30 ); +mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE );return 0 ; }
@@ -910,7 +910,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,2 ,0x0 ); +mtk_register_reset_controller (node,2 ,0x0 ,MTK_RST_SIMPLE );return 0 ; }
drivers/clk/mediatek/clk-mt2712.c +2 -2
@@ -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_register_reset_controller (node,2 ,0x30 ); +mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE );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_register_reset_controller (node,2 ,0 ); +mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt7622-eth.c +1 -1
@@ -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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt7622-hif.c +2 -2
@@ -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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt7622.c +2 -2
@@ -663,7 +663,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,1 ,0x30 ); +mtk_register_reset_controller (node,1 ,0x30 ,MTK_RST_SIMPLE );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_register_reset_controller (node,2 ,0x0 ); +mtk_register_reset_controller (node,2 ,0x0 ,MTK_RST_SIMPLE );return 0 ; }
drivers/clk/mediatek/clk-mt7629-eth.c +1 -1
@@ -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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt7629-hif.c +2 -2
@@ -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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );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_register_reset_controller (node,1 ,0x34 ); +mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE );return r; }
drivers/clk/mediatek/clk-mt8135.c +2 -2
@@ -559,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,2 ,0x30 ); +mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8135-infracfg" , mtk_infrasys_init);
@@ -587,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,2 ,0 ); +mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE ); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8135-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8173.c +2 -2
@@ -882,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,2 ,0x30 ); +mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8173-infracfg" , mtk_infrasys_init);
@@ -910,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,2 ,0 ); +mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE ); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8173-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8183.c +2 -1
@@ -1240,7 +1240,8 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller_set_clr (node,4 ,INFRA_RST0_SET_OFFSET ); +mtk_register_reset_controller (node,4 , +INFRA_RST0_SET_OFFSET ,MTK_RST_SET_CLR );return r; }
drivers/clk/mediatek/reset.c +19 -22
65 lines not on this page · raw message
drivers/clk/mediatek/reset.h +21 -4
@@ -9,16 +9,33 @@#include <linux/reset-controller.h> #include <linux/types.h> +/** +* enum mtk_reset_version - Version of MediaTek clock reset controller. +* @MTK_RST_SIMPLE: Use the same registers for bit set and clear. +* @MTK_RST_SET_CLR: Use separate registers for bit set and clear. +* @MTK_RST_MAX: Total quantity of version for MediaTek clock reset controller. +*/ +enum mtk_reset_version { +MTK_RST_SIMPLE =0 , +MTK_RST_SET_CLR , +MTK_RST_MAX , +}; +struct mtk_reset {struct regmap *regmap;int regofs;struct reset_controller_dev rcdev; }; +/** +* mtk_register_reset_controller - Register MediaTek clock reset controller +* @np: Pointer to device node. +* @rst_bank_nr: Quantity of reset bank. +* @reg_ofs: Base offset of the reset register. +* @version: Version of MediaTek clock reset controller. +*/ void mtk_register_reset_controller (struct device_node *np, -unsigned int num_regs,int regofs); - -void mtk_register_reset_controller_set_clr (struct device_node *np, -unsigned int num_regs,int regofs); +u32 rst_bank_nr,u16 reg_ofs, +enum mtk_reset_version version);#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [RESEND v8 05/19] clk: mediatek: reset: Merge and revise reset register function
Quoting Rex-BC Chen (2022-05-23 02:33:32)
Quoted 19 lines
There are two versions for clock reset register control for MediaTek SoCs. The old hardware is one bit per reset control, and does not have separate registers for bit set, clear and read-back operations. This matches the scheme supported by the simple reset driver.
However, because we need to use different data structure from
reset_simple_data, we can not use the operation of simple reset driver.
For this reason, we keep the original functions and name this version as "MTK_RST_SIMPLE".In this patch:
- Add a version enumeration to separate different reset hardware.
- Merge the reset register function of simple andset_clrinto one function "mtk_register_reset_controller".
- Rename input variable "num_regs" to "rst_bank_nr" to avoid confusion. This variable is used to define the quantity of reset bank.
- Documentmtk_reset_versionandmtk_register_reset_controller.
Quoted 5 lines
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 6/19 clk: mediatek: reset: Revise structure to control reset register
In reply to Rex-BC ChenTo declare the reset data easier, we add a strucure to do this instead of using many input variables to mtk_register_reset_controller().
- Add mtk_clk_rst_desc to define the reset description when registering the reset controller.
- Rename "mtk_reset" to "mtk_clk_rst_data". We use it to store data of reset controller.
- Document mtk_clk_rst_desc and mtk_clk_rst_data.
- Modify the documentation of mtk_register_reset_controller.
- Extract container_of in update functions to to_mtk_clk_rst_data().
--- drivers/clk/mediatek/clk-mt2701-eth.c | 8 ++++++- drivers/clk/mediatek/clk-mt2701-g3d.c | 8 ++++++- drivers/clk/mediatek/clk-mt2701-hif.c | 8 ++++++- drivers/clk/mediatek/clk-mt2701.c | 19 +++++++++++++-- drivers/clk/mediatek/clk-mt2712.c | 19 +++++++++++++-- drivers/clk/mediatek/clk-mt7622-eth.c | 8 ++++++- drivers/clk/mediatek/clk-mt7622-hif.c | 10 ++++++-- drivers/clk/mediatek/clk-mt7622.c | 19 +++++++++++++-- drivers/clk/mediatek/clk-mt7629-eth.c | 8 ++++++- drivers/clk/mediatek/clk-mt7629-hif.c | 10 ++++++-- drivers/clk/mediatek/clk-mt8135.c | 19 +++++++++++++-- drivers/clk/mediatek/clk-mt8173.c | 19 +++++++++++++-- drivers/clk/mediatek/clk-mt8183.c | 9 ++++++-- drivers/clk/mediatek/reset.c | 33 +++++++++++++++++---------- drivers/clk/mediatek/reset.h | 29 +++++++++++++++++------ 15 files changed, 186 insertions(+), 40 deletions(-)
drivers/clk/mediatek/clk-mt2701-eth.c +7 -1
@@ -36,6 +36,12 @@ static const struct mtk_gate eth_clks[] = { GATE_ETH(CLK_ETHSYS_CRYPTO, "crypto_clk", "ethif_sel", 29), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static const struct of_device_id of_match_clk_mt2701_eth[] = { { .compatible ="mediatek,mt2701-ethsys" , }, {}
@@ -58,7 +64,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt2701-g3d.c +7 -1
@@ -35,6 +35,12 @@ static const struct mtk_gate g3d_clks[] = { GATE_G3D(CLK_G3DSYS_CORE, "g3d_core", "mfg_sel", 0), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0xc , +}; +static int clk_mt2701_g3dsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -52,7 +58,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0xc ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt2701-hif.c +7 -1
@@ -33,6 +33,12 @@ static const struct mtk_gate hif_clks[] = { GATE_HIF(CLK_HIFSYS_PCIE2, "pcie2_clk", "ethpll_500m_ck", 26), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static const struct of_device_id of_match_clk_mt2701_hif[] = { { .compatible ="mediatek,mt2701-hifsys" , }, {}
@@ -57,7 +63,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return 0 ; }
drivers/clk/mediatek/clk-mt2701.c +17 -2
@@ -735,6 +735,21 @@ static const struct mtk_fixed_factor infra_fixed_divs[] = { FACTOR(CLK_INFRA_CLK_13M, "clk13m", "clk26m", 1, 2), }; +static const struct mtk_clk_rst_desc clk_rst_desc[] = { +/* infrasys */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x0 , + }, +}; +static struct clk_hw_onecell_data *infra_clk_data;static void __init mtk_infrasys_init_early (struct device_node *node)
@@ -787,7 +802,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[0 ]);return 0 ; }
@@ -910,7 +925,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,2 ,0x0 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[1 ]);return 0 ; }
drivers/clk/mediatek/clk-mt2712.c +17 -2
@@ -1258,6 +1258,21 @@ static const struct mtk_pll_data plls[] = { 0, 31, 0x0300, 4, 0, 0, 0, 0x0304, 0), }; +static const struct mtk_clk_rst_desc clk_rst_desc[] = { +/* infra */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x30 , + }, +/* peri */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x0 , + }, +}; +static int clk_mt2712_apmixed_probe (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -1361,7 +1376,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[0 ]);return r; }
@@ -1383,7 +1398,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[1 ]);return r; }
drivers/clk/mediatek/clk-mt7622-eth.c +7 -1
@@ -65,6 +65,12 @@ static const struct mtk_gate sgmii_clks[] = { "ssusb_cdr_fb", 5), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7622_ethsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -82,7 +88,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7622-hif.c +8 -2
@@ -76,6 +76,12 @@ static const struct mtk_gate pcie_clks[] = { GATE_PCIE(CLK_SATA_PM_EN, "sata_pm_en", "univpll2_d4", 30), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7622_ssusbsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -93,7 +99,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
@@ -115,7 +121,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7622.c +17 -2
@@ -610,6 +610,21 @@ static struct mtk_composite peri_muxes[] = { MUX(CLK_PERIBUS_SEL, "peribus_ck_sel", peribus_ck_parents, 0x05C, 0, 1), }; +static const struct mtk_clk_rst_desc clk_rst_desc[] = { +/* infrasys */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x0 , + }, +}; +static int mtk_topckgen_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -663,7 +678,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node,1 ,0x30 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[0 ]);return 0 ; }
@@ -714,7 +729,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)clk_prepare_enable (clk_data->hws[CLK_PERI_UART0_PD ]->clk); -mtk_register_reset_controller (node,2 ,0x0 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[1 ]);return 0 ; }
drivers/clk/mediatek/clk-mt7629-eth.c +7 -1
@@ -76,6 +76,12 @@ static const struct mtk_gate sgmii_clks[2][4] = { } }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7629_ethsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -92,7 +98,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7629-hif.c +8 -2
@@ -71,6 +71,12 @@ static const struct mtk_gate pcie_clks[] = { GATE_PCIE(CLK_PCIE_P0_PIPE_EN, "pcie_p0_pipe_en", "pcie0_pipe_en", 23), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7629_ssusbsys_init (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -88,7 +94,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
@@ -110,7 +116,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node,1 ,0x34 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt8135.c +17 -2
@@ -514,6 +514,21 @@ static const struct mtk_composite peri_clks[] __initconst = { MUX(CLK_PERI_UART3_SEL, "uart3_ck_sel", uart_ck_sel_parents, 0x40c, 3, 1), }; +static const struct mtk_clk_rst_desc clk_rst_desc[] = { +/* infrasys */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x0 , + } +}; +static void __init mtk_topckgen_init (struct device_node *node) {struct clk_hw_onecell_data *clk_data;
@@ -559,7 +574,7 @@ static void __init mtk_infrasys_init(struct device_node *node)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[0 ]); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8135-infracfg" , mtk_infrasys_init);
@@ -587,7 +602,7 @@ static void __init mtk_pericfg_init(struct device_node *node)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[1 ]); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8135-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8173.c +17 -2
@@ -819,6 +819,21 @@ static const struct mtk_gate venclt_clks[] __initconst = { GATE_VENCLT(CLK_VENCLT_CKE1, "venclt_cke1", "venclt_sel", 4), }; +static const struct mtk_clk_rst_desc clk_rst_desc[] = { +/* infrasys */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_bank_nr =2 , + .reg_ofs =0x0 , + } +}; +static struct clk_hw_onecell_data *mt8173_top_clk_data__initdata ;static struct clk_hw_onecell_data *mt8173_pll_clk_data__initdata ;
@@ -882,7 +897,7 @@ static void __init mtk_infrasys_init(struct device_node *node)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0x30 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[0 ]); }CLK_OF_DECLARE (mtk_infrasys,"mediatek,mt8173-infracfg" , mtk_infrasys_init);
@@ -910,7 +925,7 @@ static void __init mtk_pericfg_init(struct device_node *node)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node,2 ,0 ,MTK_RST_SIMPLE ); +mtk_register_reset_controller (node, &clk_rst_desc[1 ]); }CLK_OF_DECLARE (mtk_pericfg,"mediatek,mt8173-pericfg" , mtk_pericfg_init);
drivers/clk/mediatek/clk-mt8183.c +7 -2
@@ -1153,6 +1153,12 @@ static const struct mtk_pll_data plls[] = { 0, 0, 32, 8, 0x02B4, 1, 0x02BC, 0x0014, 1, 0x02B8, 0, 0x02B4), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SET_CLR , + .rst_bank_nr =4 , + .reg_ofs =INFRA_RST0_SET_OFFSET , +}; +static int clk_mt8183_apmixed_probe (struct platform_device *pdev) {struct clk_hw_onecell_data *clk_data;
@@ -1240,8 +1246,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller (node,4 , -INFRA_RST0_SET_OFFSET ,MTK_RST_SET_CLR ); +mtk_register_reset_controller (node, &clk_rst_desc);return r; }
drivers/clk/mediatek/reset.c +21 -12
@@ -12,14 +12,19 @@#include "reset.h" +static inline struct mtk_clk_rst_data *to_mtk_clk_rst_data (struct reset_controller_dev *rcdev) +{ + return container_of(rcdev, struct mtk_clk_rst_data, rcdev); +} +static int mtk_reset_update (struct reset_controller_dev *rcdev,unsigned long id,bool deassert) { - struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); +struct mtk_clk_rst_data *data =to_mtk_clk_rst_data (rcdev);unsigned int val = deassert ?0 : ~0 ;return regmap_update_bits (data->regmap, - data->regofs + ((id /32 ) <<2 ), + data->desc->reg_ofs + ((id /32 ) <<2 ),BIT (id %32 ), val); }
@@ -49,11 +54,11 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)static int mtk_reset_update_set_clr (struct reset_controller_dev *rcdev,unsigned long id,bool deassert) { - struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); +struct mtk_clk_rst_data *data =to_mtk_clk_rst_data (rcdev);unsigned int deassert_ofs = deassert ?0x4 :0 ;return regmap_write (data->regmap, - data->regofs + ((id /32 ) <<4 ) + deassert_ofs, + data->desc->reg_ofs + ((id /32 ) <<4 ) + deassert_ofs,BIT (id %32 )); }
@@ -93,15 +98,19 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { };void mtk_register_reset_controller (struct device_node *np, -u32 rst_bank_nr,u16 reg_ofs, -enum mtk_reset_version version) +const struct mtk_clk_rst_desc *desc) { -struct mtk_reset *data; -int ret;struct regmap *regmap;const struct reset_control_ops *rcops =NULL ; +struct mtk_clk_rst_data *data; +int ret; + +if (!desc) { +pr_err ("mtk clock reset desc is NULL\n" ); +return ; + } -switch (version) { +switch (desc->version) {case MTK_RST_SIMPLE : rcops = &mtk_reset_ops;break ;
@@ -109,7 +118,7 @@ void mtk_register_reset_controller(struct device_node *np, rcops = &mtk_reset_ops_set_clr;break ;default : -pr_err ("Unknown reset version %d\n" , version); +pr_err ("Unknown reset version %d\n" , desc->version);return ; }
@@ -123,10 +132,10 @@ void mtk_register_reset_controller(struct device_node *np,if (!data)return ; + data->desc = desc; data->regmap = regmap; - data->regofs = reg_ofs; data->rcdev.owner =THIS_MODULE ; - data->rcdev.nr_resets = rst_bank_nr *32 ; + data->rcdev.nr_resets = desc->rst_bank_nr *32 ; data->rcdev.ops = rcops; data->rcdev.of_node = np;
drivers/clk/mediatek/reset.h +22 -7
@@ -21,21 +21,36 @@ enum mtk_reset_version { MTK_RST_MAX, }; -struct mtk_reset { +/** +* struct mtk_clk_rst_desc - Description of MediaTek clock reset. +* @version: Reset version which is defined in enum mtk_reset_version. +* @reg_ofs: Base offset of the reset register. +* @rst_bank_nr: Quantity of reset bank. +*/ +struct mtk_clk_rst_desc { +enum mtk_reset_version version; +u16 reg_ofs; +u32 rst_bank_nr; +}; + +/** +* struct mtk_clk_rst_data - Data of MediaTek clock reset controller. +* @regmap: Pointer to base address of reset register address. +* @rcdev: Reset controller device. +* @desc: Pointer to description of the reset controller. +*/ +struct mtk_clk_rst_data {struct regmap *regmap; -int regofs;struct reset_controller_dev rcdev; +const struct mtk_clk_rst_desc *desc; };/** * mtk_register_reset_controller - Register MediaTek clock reset controller * @np: Pointer to device node. -* @rst_bank_nr: Quantity of reset bank. -* @reg_ofs: Base offset of the reset register. -* @version: Version of MediaTek clock reset controller. +* @desc: Constant pointer to description of clock reset. */ void mtk_register_reset_controller (struct device_node *np, -u32 rst_bank_nr,u16 reg_ofs, -enum mtk_reset_version version); +const struct mtk_clk_rst_desc *desc);#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [RESEND v8 06/19] clk: mediatek: reset: Revise structure to control reset register
Quoting Rex-BC Chen (2022-05-23 02:33:33)
Quoted 11 lines
To declare the reset data easier, we add a strucure to do this instead of using many input variables to
mtk_register_reset_controller().- Add
mtk_clk_rst_descto define the reset description when registering the reset controller.
- Rename "mtk_reset" to "mtk_clk_rst_data". We use it to store data of reset controller.
- Documentmtk_clk_rst_descandmtk_clk_rst_data.
- Modify the documentation ofmtk_register_reset_controller.
- Extractcontainer_ofin update functions toto_mtk_clk_rst_data().
Quoted 5 lines
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 7/19 clk: mediatek: reset: Support nonsequence base offsets of reset registers
In reply to Rex-BC ChenThe bank offsets are not serial for all reset registers.
For example, there are five infra reset banks for MT8192: 0x120, 0x130, 0x140, 0x150 and 0x730.
To support this,
- Change reg_ofs to rst_bank_ofs which is a pointer to base offsets of the reset register.
- Add a new define RST_NR_PER_BANK to define reset number for each reset bank.
--- drivers/clk/mediatek/clk-mt2701-eth.c | 6 ++++-- drivers/clk/mediatek/clk-mt2701-g3d.c | 6 ++++-- drivers/clk/mediatek/clk-mt2701-hif.c | 6 ++++-- drivers/clk/mediatek/clk-mt2701.c | 11 +++++++---- drivers/clk/mediatek/clk-mt2712.c | 11 +++++++---- drivers/clk/mediatek/clk-mt7622-eth.c | 6 ++++-- drivers/clk/mediatek/clk-mt7622-hif.c | 6 ++++-- drivers/clk/mediatek/clk-mt7622.c | 11 +++++++---- drivers/clk/mediatek/clk-mt7629-eth.c | 6 ++++-- drivers/clk/mediatek/clk-mt7629-hif.c | 6 ++++-- drivers/clk/mediatek/clk-mt8135.c | 11 +++++++---- drivers/clk/mediatek/clk-mt8173.c | 11 +++++++---- drivers/clk/mediatek/clk-mt8183.c | 14 ++++++++++++-- drivers/clk/mediatek/reset.c | 11 ++++++----- drivers/clk/mediatek/reset.h | 6 ++++-- 15 files changed, 85 insertions(+), 43 deletions(-)
drivers/clk/mediatek/clk-mt2701-eth.c +4 -2
@@ -36,10 +36,12 @@ 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_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static const struct of_device_id of_match_clk_mt2701_eth[] = {
drivers/clk/mediatek/clk-mt2701-g3d.c +4 -2
@@ -35,10 +35,12 @@ 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_nr =1 , - .reg_ofs =0xc , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static int clk_mt2701_g3dsys_init (struct platform_device *pdev)
drivers/clk/mediatek/clk-mt2701-hif.c +4 -2
@@ -33,10 +33,12 @@ 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_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static const struct of_device_id of_match_clk_mt2701_hif[] = {
drivers/clk/mediatek/clk-mt2701.c +7 -4
@@ -735,18 +735,21 @@ 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_nr =2 , - .reg_ofs =0x30 , + .rst_bank_ofs = infrasys_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), },/* pericfg */ { .version =MTK_RST_SIMPLE , - .rst_bank_nr =2 , - .reg_ofs =0x0 , + .rst_bank_ofs = pericfg_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), }, };
drivers/clk/mediatek/clk-mt2712.c +7 -4
@@ -1258,18 +1258,21 @@ 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_nr =2 , - .reg_ofs =0x30 , + .rst_bank_ofs = infrasys_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), },/* peri */ { .version =MTK_RST_SIMPLE , - .rst_bank_nr =2 , - .reg_ofs =0x0 , + .rst_bank_ofs = pericfg_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), }, };
drivers/clk/mediatek/clk-mt7622-eth.c +4 -2
@@ -65,10 +65,12 @@ 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_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static int clk_mt7622_ethsys_init (struct platform_device *pdev)
drivers/clk/mediatek/clk-mt7622-hif.c +4 -2
@@ -76,10 +76,12 @@ 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_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static int clk_mt7622_ssusbsys_init (struct platform_device *pdev)
drivers/clk/mediatek/clk-mt7622.c +7 -4
@@ -610,18 +610,21 @@ 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_nr =1 , - .reg_ofs =0x30 , + .rst_bank_ofs = infrasys_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), },/* pericfg */ { .version =MTK_RST_SIMPLE , - .rst_bank_nr =2 , - .reg_ofs =0x0 , + .rst_bank_ofs = pericfg_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), }, };
drivers/clk/mediatek/clk-mt7629-eth.c +4 -2
@@ -76,10 +76,12 @@ 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_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static int clk_mt7629_ethsys_init (struct platform_device *pdev)
drivers/clk/mediatek/clk-mt7629-hif.c +4 -2
@@ -71,10 +71,12 @@ static const struct mtk_gate pcie_clks[] = { GATE_PCIE(CLK_PCIE_P0_PIPE_EN, "pcie_p0_pipe_en", "pcie0_pipe_en", 23), }; +static u16 rst_ofs[] = {0x34 , }; +static const struct mtk_clk_rst_desc clk_rst_desc = { .version =MTK_RST_SIMPLE , - .rst_bank_nr =1 , - .reg_ofs =0x34 , + .rst_bank_ofs = rst_ofs, + .rst_bank_nr =ARRAY_SIZE (rst_ofs), };static int clk_mt7629_ssusbsys_init (struct platform_device *pdev)
drivers/clk/mediatek/clk-mt8135.c +7 -4
@@ -514,18 +514,21 @@ static const struct mtk_composite peri_clks[] __initconst = { MUX(CLK_PERI_UART3_SEL, "uart3_ck_sel", uart_ck_sel_parents, 0x40c, 3, 1), }; +static 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_nr =2 , - .reg_ofs =0x30 , + .rst_bank_ofs = infrasys_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), },/* pericfg */ { .version =MTK_RST_SIMPLE , - .rst_bank_nr =2 , - .reg_ofs =0x0 , + .rst_bank_ofs = pericfg_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), } };
drivers/clk/mediatek/clk-mt8173.c +7 -4
@@ -819,18 +819,21 @@ 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_nr =2 , - .reg_ofs =0x30 , + .rst_bank_ofs = infrasys_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infrasys_rst_ofs), },/* pericfg */ { .version =MTK_RST_SIMPLE , - .rst_bank_nr =2 , - .reg_ofs =0x0 , + .rst_bank_ofs = pericfg_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (pericfg_rst_ofs), } };
drivers/clk/mediatek/clk-mt8183.c +12 -2
@@ -20,6 +20,9 @@/* Infra global controller reset set register */ #define INFRA_RST0_SET_OFFSET 0x120 +#define INFRA_RST1_SET_OFFSET 0x130 +#define INFRA_RST2_SET_OFFSET 0x140 +#define INFRA_RST3_SET_OFFSET 0x150static DEFINE_SPINLOCK (mt8183_clk_lock);
@@ -1153,10 +1156,17 @@ 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_nr =4 , - .reg_ofs =INFRA_RST0_SET_OFFSET , + .rst_bank_ofs = infra_rst_ofs, + .rst_bank_nr =ARRAY_SIZE (infra_rst_ofs), };static int clk_mt8183_apmixed_probe (struct platform_device *pdev)
drivers/clk/mediatek/reset.c +6 -5
@@ -24,8 +24,8 @@ static int mtk_reset_update(struct reset_controller_dev *rcdev,unsigned int val = deassert ?0 : ~0 ;return regmap_update_bits (data->regmap, - data->desc->reg_ofs + ((id /32 ) <<2 ), -BIT (id %32 ), val); + data->desc->rst_bank_ofs[id /RST_NR_PER_BANK ], +BIT (id %RST_NR_PER_BANK ), val); } static int mtk_reset_assert(struct reset_controller_dev *rcdev,
@@ -58,8 +58,9 @@ static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,unsigned int deassert_ofs = deassert ?0x4 :0 ;return regmap_write (data->regmap, - data->desc->reg_ofs + ((id /32 ) <<4 ) + deassert_ofs, -BIT (id %32 )); + data->desc->rst_bank_ofs[id /RST_NR_PER_BANK ] + + deassert_ofs, +BIT (id %RST_NR_PER_BANK )); } static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
@@ -135,7 +136,7 @@ void mtk_register_reset_controller(struct device_node *np, data->desc = desc; data->regmap = regmap; data->rcdev.owner =THIS_MODULE ; - data->rcdev.nr_resets = desc->rst_bank_nr *32 ; + data->rcdev.nr_resets = desc->rst_bank_nr *RST_NR_PER_BANK ; data->rcdev.ops = rcops; data->rcdev.of_node = np;
drivers/clk/mediatek/reset.h +4 -2
@@ -9,6 +9,8 @@#include <linux/reset-controller.h> #include <linux/types.h> +#define RST_NR_PER_BANK 32 +/** * enum mtk_reset_version - Version of MediaTek clock reset controller. * @MTK_RST_SIMPLE: Use the same registers for bit set and clear.
@@ -24,12 +26,12 @@ enum mtk_reset_version {/** * struct mtk_clk_rst_desc - Description of MediaTek clock reset. * @version: Reset version which is defined in enum mtk_reset_version. -* @reg_ofs: Base offset of the reset register. +* @rst_bank_ofs: Pointer to an array containing base offsets of the reset register. * @rst_bank_nr: Quantity of reset bank. */ struct mtk_clk_rst_desc {enum mtk_reset_version version; -u16 reg_ofs; +u16 *rst_bank_ofs;u32 rst_bank_nr; };
Signature · 1 line
2.18.0
Re: [RESEND v8 07/19] clk: mediatek: reset: Support nonsequence base offsets of reset registers
Quoting Rex-BC Chen (2022-05-23 02:33:34)
Quoted 10 lines
The bank offsets are not serial for all reset registers.
For example, there are five infra reset banks for MT8192:0x120,0x130,0x140,0x150and0x730.To support this,
- Changereg_ofstorst_bank_ofswhich is a pointer to base offsets of the reset register.
- Add a new defineRST_NR_PER_BANKto define reset number for each reset bank.
Quoted 5 lines
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 8/19 clk: mediatek: reset: Support inuput argument index mode
In reply to Rex-BC ChenThere is a large number of mediatek infra reset bits, but we do not use all of them. In addition, the proper input argement of reset controller soulde be index.
Therefore, to be compatible with previous drivers and usage, we add description variables to store the ids which can mapping to index.
To use this mode, we need to put the id in rst_idx_map to map from index to ids. For example, if we want to input index 1 (this index is used to set bank 1 bit 14) for svs, we need to declare the reset controller like this:
In drivers:
static u16 rst_ofs[] = {
0x120, 0x130, 0x140, 0x150, 0x730,
};static u16 rst_idx_map[] = {
0 * 32 + 0,
1 * 32 + 14,
....
};static const struct mtk_clk_rst_desc clk_rst_desc = {
.version = MTK_RST_SET_CLR,
.rst_bank_ofs = rst_ofs,
.rst_bank_nr = ARRAY_SIZE(rst_ofs),
.rst_idx_map = rst_idx_map,
.rst_idx_map_nr = ARRAY_SIZE(rst_idx_map),
};In dts:
svs: {
...
resets = <&infra 1>;
...
};--- drivers/clk/mediatek/reset.c | 21 ++++++++++++++++++++- drivers/clk/mediatek/reset.h | 5 +++++ 2 files changed, 25 insertions(+), 1 deletion(-)
drivers/clk/mediatek/reset.c +20 -1
@@ -98,6 +98,18 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { .reset = mtk_reset_set_clr, }; +static int reset_xlate (struct reset_controller_dev *rcdev, +const struct of_phandle_args *reset_spec) +{ +struct mtk_clk_rst_data *data =to_mtk_clk_rst_data (rcdev); + +if (reset_spec->args[0 ] >= rcdev->nr_resets || + reset_spec->args[0 ] >= data->desc->rst_idx_map_nr) +return -EINVAL ; + +return data->desc->rst_idx_map[reset_spec->args[0 ]]; +} +void mtk_register_reset_controller (struct device_node *np,const struct mtk_clk_rst_desc *desc) {
@@ -136,10 +148,17 @@ void mtk_register_reset_controller(struct device_node *np, data->desc = desc; data->regmap = regmap; data->rcdev.owner =THIS_MODULE ; - data->rcdev.nr_resets = desc->rst_bank_nr *RST_NR_PER_BANK ; data->rcdev.ops = rcops; data->rcdev.of_node = np; +if (data->desc->rst_idx_map_nr >0 ) { + data->rcdev.of_reset_n_cells =1 ; + data->rcdev.nr_resets = desc->rst_idx_map_nr; + data->rcdev.of_xlate = reset_xlate; + }else { + data->rcdev.nr_resets = desc->rst_bank_nr *RST_NR_PER_BANK ; + } + ret =reset_controller_register (&data->rcdev);if (ret) {pr_err ("could not register reset controller: %d\n" , ret);
drivers/clk/mediatek/reset.h +5 -0
@@ -28,11 +28,16 @@ enum mtk_reset_version {* @version: Reset version which is defined in enum mtk_reset_version. * @rst_bank_ofs: Pointer to an array containing base offsets of the reset register. * @rst_bank_nr: Quantity of reset bank. +* @rst_idx_map:Pointer to an array containing ids if input argument is index. +* This array is not necessary if our input argument does not mean index. +* @rst_idx_map_nr: Quantity of reset index map. */ struct mtk_clk_rst_desc {enum mtk_reset_version version;u16 *rst_bank_ofs;u32 rst_bank_nr; +u16 *rst_idx_map; +u32 rst_idx_map_nr; };/**
Signature · 1 line
2.18.0
Re: [RESEND v8 08/19] clk: mediatek: reset: Support inuput argument index mode
Quoting Rex-BC Chen (2022-05-23 02:33:35)
Quoted 37 lines
There is a large number of mediatek infra reset bits, but we do not use all of them. In addition, the proper input argement of reset controller soulde be index.
Therefore, to be compatible with previous drivers and usage, we add description variables to store the ids which can mapping to index.To use this mode, we need to put the id in
rst_idx_mapto map from index to ids. For example, if we want to input index 1 (this index is used to set bank 1 bit 14) for svs, we need to declare the reset controller like this:In drivers:
static u16 rst_ofs[] = { 0x120, 0x130, 0x140, 0x150, 0x730, };static u16 rst_idx_map[] = { 0 * 32 + 0, 1 * 32 + 14, .... };static const struct mtk_clk_rst_desc clk_rst_desc = { .version = MTK_RST_SET_CLR, .rst_bank_ofs = rst_ofs, .rst_bank_nr = ARRAY_SIZE(rst_ofs), .rst_idx_map = rst_idx_map, .rst_idx_map_nr = ARRAY_SIZE(rst_idx_map), };In dts:
svs: { ... resets = <&infra 1>; ... };
Quoted 5 lines
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 9/19 clk: mediatek: reset: Change return type for clock reset register function
In reply to Rex-BC ChenTo deal with error handling, we change the function return type from void to int for mtk_clk_register_rst_ctrl().
--- drivers/clk/mediatek/reset.c | 15 +++++++++------ drivers/clk/mediatek/reset.h | 6 ++++-- 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/clk/mediatek/reset.c +9 -6
@@ -110,8 +110,8 @@ static int reset_xlate(struct reset_controller_dev *rcdev,return data->desc->rst_idx_map[reset_spec->args[0 ]]; } -void mtk_register_reset_controller (struct device_node *np, -const struct mtk_clk_rst_desc *desc) +int mtk_register_reset_controller (struct device_node *np, +const struct mtk_clk_rst_desc *desc) {struct regmap *regmap;const struct reset_control_ops *rcops =NULL ;
@@ -120,7 +120,7 @@ void mtk_register_reset_controller(struct device_node *np,if (!desc) {pr_err ("mtk clock reset desc is NULL\n" ); -return ; +return -EINVAL ; }switch (desc->version) {
@@ -132,18 +132,18 @@ void mtk_register_reset_controller(struct device_node *np,break ;default :pr_err ("Unknown reset version %d\n" , desc->version); -return ; +return -EINVAL ; } regmap =device_node_to_regmap (np);if (IS_ERR (regmap)) {pr_err ("Cannot find regmap for %pOF: %pe\n" , np, regmap); -return ; +return -EINVAL ; } data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data) -return ; +return -ENOMEM ; data->desc = desc; data->regmap = regmap;
@@ -163,7 +163,10 @@ void mtk_register_reset_controller(struct device_node *np,if (ret) {pr_err ("could not register reset controller: %d\n" , ret);kfree (data); +return ret; } + +return 0 ; }MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/reset.h +4 -2
@@ -56,8 +56,10 @@ struct mtk_clk_rst_data {* mtk_register_reset_controller - Register MediaTek clock reset controller * @np: Pointer to device node. * @desc: Constant pointer to description of clock reset. +* +* Return: 0 on success and errorno otherwise. */ -void mtk_register_reset_controller (struct device_node *np, -const struct mtk_clk_rst_desc *desc); +int mtk_register_reset_controller (struct device_node *np, +const struct mtk_clk_rst_desc *desc);#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [RESEND v8 09/19] clk: mediatek: reset: Change return type for clock reset register function
Quoting Rex-BC Chen (2022-05-23 02:33:36)
Quoted 8 lines
To deal with error handling, we change the function return type from void to int for
mtk_clk_register_rst_ctrl().Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 10/19 clk: mediatek: reset: Add new register reset function with device
In reply to Rex-BC ChenUsing device to register reset controller is a better implementation in current drivers. Howerver, some clock drviers of MediaTek only provide device_node.
Therefore, we still remain the register reset function with device_node and add a new function with device to register reset controller.
--- 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-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/reset.c | 60 +++++++++++++++++++++++++++ drivers/clk/mediatek/reset.h | 10 +++++ 13 files changed, 86 insertions(+), 16 deletions(-)
drivers/clk/mediatek/clk-mt2701-eth.c +1 -1
@@ -66,7 +66,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt2701-g3d.c +1 -1
@@ -60,7 +60,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt2701-hif.c +1 -1
@@ -65,7 +65,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return 0 ; }
drivers/clk/mediatek/clk-mt2701.c +2 -2
@@ -805,7 +805,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node, &clk_rst_desc[0 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]);return 0 ; }
@@ -928,7 +928,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node, &clk_rst_desc[1 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[1 ]);return 0 ; }
drivers/clk/mediatek/clk-mt2712.c +2 -2
@@ -1379,7 +1379,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node, &clk_rst_desc[0 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]);return r; }
@@ -1401,7 +1401,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); -mtk_register_reset_controller (node, &clk_rst_desc[1 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[1 ]);return r; }
drivers/clk/mediatek/clk-mt7622-eth.c +1 -1
@@ -90,7 +90,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7622-hif.c +2 -2
@@ -101,7 +101,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
@@ -123,7 +123,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7622.c +2 -2
@@ -681,7 +681,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)if (r)return r; -mtk_register_reset_controller (node, &clk_rst_desc[0 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]);return 0 ; }
@@ -732,7 +732,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)clk_prepare_enable (clk_data->hws[CLK_PERI_UART0_PD ]->clk); -mtk_register_reset_controller (node, &clk_rst_desc[1 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[1 ]);return 0 ; }
drivers/clk/mediatek/clk-mt7629-eth.c +1 -1
@@ -100,7 +100,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7629-hif.c +2 -2
@@ -96,7 +96,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
@@ -118,7 +118,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)"could not register clock provider: %s: %d\n" , pdev->name, r); -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt8183.c +1 -1
@@ -1256,7 +1256,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)return r; } -mtk_register_reset_controller (node, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/reset.c +60 -0
64 lines not on this page · raw message
drivers/clk/mediatek/reset.h +10 -0
@@ -62,4 +62,14 @@ struct mtk_clk_rst_data {int mtk_register_reset_controller (struct device_node *np,const struct mtk_clk_rst_desc *desc); +/** +* mtk_register_reset_controller - Register mediatek clock reset controller with device +* @np: Pointer to device. +* @desc: Constant pointer to description of clock reset. +* +* Return: 0 on success and errorno otherwise. +*/ +int mtk_register_reset_controller_with_dev (struct device *dev, +const struct mtk_clk_rst_desc *desc); +#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [RESEND v8 10/19] clk: mediatek: reset: Add new register reset function with device
Quoting Rex-BC Chen (2022-05-23 02:33:37)
Quoted 4 lines
Using device to register reset controller is a better implementation in current drivers. Howerver, some clock drviers of MediaTek only provide
device_node.
Quoted 8 lines
Therefore, we still remain the register reset function with
device_nodeand add a new function with device to register reset controller.Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 11/19 clk: mediatek: reset: Add reset support for simple probe
In reply to Rex-BC Chen- Add a pointer of "mtk_clk_rst_desc" to "mtk_clk_desc".
- Add register reset with device function in mtk_clk_simple_probe().
--- drivers/clk/mediatek/clk-mtk.c | 7 +++++++ drivers/clk/mediatek/clk-mtk.h | 1 + 2 files changed, 8 insertions(+)
drivers/clk/mediatek/clk-mtk.c +7 -0
@@ -444,6 +444,13 @@ 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; + } +return r; unregister_clks:
drivers/clk/mediatek/clk-mtk.h +1 -0
@@ -192,6 +192,7 @@ 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; };int mtk_clk_simple_probe (struct platform_device *pdev);
Signature · 1 line
2.18.0
Re: [RESEND v8 11/19] clk: mediatek: reset: Add reset support for simple probe
Quoting Rex-BC Chen (2022-05-23 02:33:38)
Quoted 8 lines
- Add a pointer of "
mtk_clk_rst_desc" to "mtk_clk_desc".
- Add register reset with device function inmtk_clk_simple_probe().Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 12/19 dt-bindings: arm: mediatek: Add #reset-cells property for MT8192/MT8195
In reply to Rex-BC ChenWe will use the infra_ao reset which is defined in mt8192-sys-clock and mt8195-sys-clock.
The value of reset-cells is 1.
--- .../bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml | 3 +++ .../bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml | 3 +++ 2 files changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +3 -0
@@ -29,6 +29,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + const: 1 + required: - compatible - reg
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml +3 -0
@@ -37,6 +37,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + const: 1 + required: - compatible - reg
Signature · 1 line
2.18.0
Re: [RESEND v8 12/19] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192/MT8195
Quoting Rex-BC Chen (2022-05-23 02:33:39)
Quoted 10 lines
We will use the
infra_aoreset which is defined in mt8192-sys-clock and mt8195-sys-clock.
The value of reset-cells is 1.Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>---
Applied to clk-next
PATCH RESEND v8 13/19 dt-bindings: reset: mediatek: Add infra_ao reset index for MT8192/MT8195
In reply to Rex-BC ChenTo support reset of infra_ao, add the index of infra_ao reset of thermal/svs/pcei for MT8192 and thermal/svs for MT8195.
--- include/dt-bindings/reset/mt8192-resets.h | 8 ++++++++ include/dt-bindings/reset/mt8195-resets.h | 6 ++++++ 2 files changed, 14 insertions(+)
include/dt-bindings/reset/mt8192-resets.h +8 -0
@@ -7,6 +7,7 @@#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8192#define _DT_BINDINGS_RESET_CONTROLLER_MT8192 +/* TOPRGU resets */ #define MT8192_TOPRGU_MM_SW_RST 1#define MT8192_TOPRGU_MFG_SW_RST 2#define MT8192_TOPRGU_VENC_SW_RST 3
@@ -30,4 +31,11 @@/* MMSYS resets */ #define MT8192_MMSYS_SW0_RST_B_DISP_DSI0 15 +/* INFRA resets */ +#define MT8192_INFRA_RST0_THERM_CTRL_SWRST 0 +#define MT8192_INFRA_RST2_PEXTP_PHY_SWRST 1 +#define MT8192_INFRA_RST3_THERM_CTRL_PTP_SWRST 2 +#define MT8192_INFRA_RST4_PCIE_TOP_SWRST 3 +#define MT8192_INFRA_RST4_THERM_CTRL_MCU_SWRST 4 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8192 */
include/dt-bindings/reset/mt8195-resets.h +6 -0
@@ -7,6 +7,7 @@#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8195#define _DT_BINDINGS_RESET_CONTROLLER_MT8195 +/* TOPRGU resets */ #define MT8195_TOPRGU_CONN_MCU_SW_RST 0#define MT8195_TOPRGU_INFRA_GRST_SW_RST 1#define MT8195_TOPRGU_APU_SW_RST 2
@@ -26,4 +27,9 @@#define MT8195_TOPRGU_SW_RST_NUM 16 +/* INFRA resets */ +#define MT8195_INFRA_RST0_THERM_CTRL_SWRST 0 +#define MT8195_INFRA_RST3_THERM_CTRL_PTP_SWRST 1 +#define MT8195_INFRA_RST4_THERM_CTRL_MCU_SWRST 2 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8195 */
Signature · 1 line
2.18.0
Re: [RESEND v8 13/19] dt-bindings: reset: mediatek: Add infra_ao reset index for MT8192/MT8195
Quoting Rex-BC Chen (2022-05-23 02:33:40)
Quoted 10 lines
To support reset of
infra_ao, add the index ofinfra_aoreset of thermal/svs/pcei for MT8192 and thermal/svs for MT8195.Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>[Nícolas: Test for MT8192]---
Applied to clk-next
PATCH RESEND v8 14/19 clk: mediatek: reset: Add infra_ao reset support for MT8192/MT8195
In reply to Rex-BC ChenThe infra_ao reset is needed for MT8192 and MT8195.
- Add mtk_clk_rst_desc for MT8192 and MT8195
- Add register reset controller function for MT8192 infra_ao.
- Move definition of infra reset from cl-mt8183.c to reset.h because it's the same definition with MT8192 and MT8195.
- Add new definition of infra reset_4 for MT8192 and MT8195.
- Add infra_ao_idx_map for MT8192 and MT8195.
--- drivers/clk/mediatek/clk-mt8183.c | 6 ----- drivers/clk/mediatek/clk-mt8192.c | 29 ++++++++++++++++++++++ drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 ++++++++++++++++++ drivers/clk/mediatek/reset.h | 7 ++++++ 4 files changed, 60 insertions(+), 6 deletions(-)
drivers/clk/mediatek/clk-mt8183.c +0 -6
@@ -18,12 +18,6 @@#include <dt-bindings/clock/mt8183-clk.h> -/* Infra global controller reset set register */ -#define INFRA_RST0_SET_OFFSET 0x120 -#define INFRA_RST1_SET_OFFSET 0x130 -#define INFRA_RST2_SET_OFFSET 0x140 -#define INFRA_RST3_SET_OFFSET 0x150 -static DEFINE_SPINLOCK (mt8183_clk_lock);static const struct mtk_fixed_clk top_fixed_clks[] = {
drivers/clk/mediatek/clk-mt8192.c +29 -0
@@ -18,6 +18,7 @@#include "clk-pll.h" #include <dt-bindings/clock/mt8192-clk.h> +#include <dt-bindings/reset/mt8192-resets.h> static DEFINE_SPINLOCK (mt8192_clk_lock);
@@ -1114,6 +1115,30 @@ 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
@@ -1240,6 +1265,10 @@ 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); +if (r) + goto free_clk_data; + r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data);if (r) goto free_clk_data;
drivers/clk/mediatek/clk-mt8195-infra_ao.c +24 -0
@@ -7,6 +7,7 @@#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>
@@ -182,9 +183,32 @@ 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, };static const struct of_device_id of_match_clk_mt8195_infra_ao[] = {
drivers/clk/mediatek/reset.h +7 -0
@@ -11,6 +11,13 @@#define RST_NR_PER_BANK 32 +/* Infra global controller reset set register */ +#define INFRA_RST0_SET_OFFSET 0x120 +#define INFRA_RST1_SET_OFFSET 0x130 +#define INFRA_RST2_SET_OFFSET 0x140 +#define INFRA_RST3_SET_OFFSET 0x150 +#define INFRA_RST4_SET_OFFSET 0x730 +/** * enum mtk_reset_version - Version of MediaTek clock reset controller. * @MTK_RST_SIMPLE: Use the same registers for bit set and clear.
Signature · 1 line
2.18.0
Re: [RESEND v8 14/19] clk: mediatek: reset: Add infra_ao reset support for MT8192/MT8195
Quoting Rex-BC Chen (2022-05-23 02:33:41)
Quoted 8 lines
The
infra_aoreset is needed for MT8192 and MT8195.
- Addmtk_clk_rst_descfor MT8192 and MT8195
- Add register reset controller function for MT8192infra_ao.
- Move definition of infra reset fromcl-mt8183.ctoreset.hbecause it's the same definition with MT8192 and MT8195.
- Add new definition of infrareset_4for MT8192 and MT8195.
- Addinfra_ao_idx_mapfor MT8192 and MT8195.
Quoted 6 lines
Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>[Nícolas: Test for MT8192]---
Applied to clk-next
PATCH RESEND v8 15/19 arm64: dts: mediatek: Add infra #reset-cells property for MT8192
In reply to Rex-BC ChenTo support reset of infra, we add property of #reset-cells.
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +1 -0
@@ -271,6 +271,7 @@ compatible = "mediatek,mt8192-infracfg", "syscon"; reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>; + #reset-cells = <1>; }; pericfg: syscon@10003000 {
Signature · 1 line
2.18.0
PATCH RESEND v8 16/19 arm64: dts: mediatek: Add infra #reset-cells property for MT8195
In reply to Rex-BC ChenWe will use mediatek clock reset as infracfg_ao reset instead of ti-syscon. To support this, remove property of ti reset and add property of #reset-cells for mediatek clock reset.
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +2 -13
@@ -10,7 +10,6 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/phy/phy.h> #include <dt-bindings/pinctrl/mt8195-pinfunc.h> -#include <dt-bindings/reset/ti-syscon.h> / { compatible = "mediatek,mt8195";
@@ -292,20 +291,10 @@ }; infracfg_ao: syscon@10001000 { - compatible = "mediatek,mt8195-infracfg_ao", "syscon", "simple-mfd"; + compatible = "mediatek,mt8195-infracfg_ao", "syscon"; reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>; - - infracfg_rst: reset-controller { - compatible = "ti,syscon-reset"; - #reset-cells = <1>; - ti,reset-bits = < - 0x140 18 0x144 18 0 0 (ASSERT_SET | DEASSERT_SET | STATUS_NONE) /* pcie */ - 0x120 0 0x124 0 0 0 (ASSERT_SET | DEASSERT_SET | STATUS_NONE) /* thermal */ - 0x730 10 0x734 10 0 0 (ASSERT_SET | DEASSERT_SET | STATUS_NONE) /* thermal */ - 0x150 5 0x154 5 0 0 (ASSERT_SET | DEASSERT_SET | STATUS_NONE) /* svs gpu */ - >; - }; + #reset-cells = <1>; }; pericfg: syscon@10003000 {
Signature · 1 line
2.18.0
PATCH RESEND v8 17/19 dt-bindings: reset: mediatek: Add infra_ao reset index for MT8186
In reply to Rex-BC ChenTo support reset of infra_ao, add the index of infra_ao reset of thermal/svs for MT8186.
--- include/dt-bindings/reset/mt8186-resets.h | 5 +++++ 1 file changed, 5 insertions(+)
include/dt-bindings/reset/mt8186-resets.h +5 -0
@@ -7,6 +7,7 @@#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8186#define _DT_BINDINGS_RESET_CONTROLLER_MT8186 +/* TOPRGU resets */ #define MT8186_TOPRGU_INFRA_SW_RST 0#define MT8186_TOPRGU_MM_SW_RST 1#define MT8186_TOPRGU_MFG_SW_RST 2
@@ -33,4 +34,8 @@/* MMSYS resets */ #define MT8186_MMSYS_SW0_RST_B_DISP_DSI0 19 +/* INFRA resets */ +#define MT8186_INFRA_THERMAL_CTRL_RST 0 +#define MT8186_INFRA_PTP_CTRL_RST 1 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8186 */
Signature · 1 line
2.18.0
Re: [RESEND v8 17/19] dt-bindings: reset: mediatek: Add infra_ao reset index for MT8186
Quoting Rex-BC Chen (2022-05-23 02:33:44)
Quoted 8 lines
To support reset of
infra_ao, add the index ofinfra_aoreset of thermal/svs for MT8186.Signed-off-by Rex-BC Chen <[email protected]>Acked-by Rob Herring <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>---
Applied to clk-next
PATCH RESEND v8 18/19 dt-bindings: arm: mediatek: Add #reset-cells property for MT8186
In reply to Rex-BC ChenWe will use the infra_ao reset which is defined in mt8186-sys-clock. The value of reset-cells is 1.
--- .../bindings/arm/mediatek/mediatek,mt8186-sys-clock.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-sys-clock.yaml +3 -0
@@ -39,6 +39,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + const: 1 + required: - compatible - reg
Signature · 1 line
2.18.0
Re: [RESEND v8 18/19] dt-bindings: arm: mediatek: Add #reset-cells property for MT8186
Quoting Rex-BC Chen (2022-05-23 02:33:45)
Quoted 8 lines
We will use the
infra_aoreset which is defined in mt8186-sys-clock. The value of reset-cells is 1.Signed-off-by Rex-BC Chen <[email protected]>Acked-by Rob Herring <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>---
Applied to clk-next
PATCH RESEND v8 19/19 clk: mediatek: reset: Add infra_ao reset support for MT8186
In reply to Rex-BC ChenThe infra_ao reset is needed for MT8186.
- Add mtk_clk_rst_desc for MT8186.
- Add register reset controller function for MT8186 infra_ao.
- Add infra_ao_idx_map for MT8186.
--- drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/clk/mediatek/clk-mt8186-infra_ao.c +23 -0
@@ -6,6 +6,7 @@#include <linux/clk-provider.h> #include <linux/platform_device.h> #include <dt-bindings/clock/mt8186-clk.h> +#include <dt-bindings/reset/mt8186-resets.h> #include "clk-gate.h" #include "clk-mtk.h"
@@ -191,9 +192,31 @@ 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, };static const struct of_device_id of_match_clk_mt8186_infra_ao[] = {
Signature · 1 line
2.18.0
Re: [RESEND v8 19/19] clk: mediatek: reset: Add infra_ao reset support for MT8186
Quoting Rex-BC Chen (2022-05-23 02:33:46)
Quoted 9 lines
The
infra_aoreset is needed for MT8186.
- Addmtk_clk_rst_descfor MT8186.
- Add register reset controller function for MT8186infra_ao.
- Addinfra_ao_idx_mapfor MT8186.Signed-off-by Rex-BC Chen <[email protected]>Reviewed-by Nícolas F. R. A. Prado <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>---
Applied to clk-next
AngeloGioacchino Del Regno
maintainerIl 23/05/22 11:33, Rex-BC Chen ha scritto:
Quoted 3 lines
In this series, we cleanup MediaTek clock reset drivers in clk/mediatek folder. MediaTek clock reset driver is used to provide reset control of modules controlled in clk, like
infra_ao.
Thanks for this very fast resend for the T-b tag fixes (and don't worry, it happens).
Btw, in my opinion, this series is good to go.
Cheers,
Angelo
Quoted 77 lines
Changes for v8 resend:
1. Remove tested-by tag from Nícolas for MT8195/MT8186 patches.
2. Add reviewed-by tag from AngeloGioacchino.Changes for v8:
1. Use 'enummtk_reset_version' to replace u8 in patch 5 and 6.
2. Use lowercase '0xc' in patch 7.
3. Drop "simple-mfd" in patch 16 because it's for original reset controller.
4. v8 is based on linux-next next-20220520 and Chen-Yu's series[1].Changes for v7:
1. v7 is based on linux-next next-20220519 and Chen-Yu's series[1].
2. Add support for MT8186.[1]: https://patchwork.kernel.org/project/linux-mediatek/list/?series=643003
Changes for v6:
1. Add a new patch to support inuput argument index mode.
2. Revise definition inreset.hto index.Rex-BC Chen (19):
clk: mediatek: reset: Addreset.h
clk: mediatek: reset: Fix written reset bit offset
clk: mediatek: reset: Refine and reorder functions inreset.c
clk: mediatek: reset: Extract common drivers to update function
clk: mediatek: reset: Merge and revise reset register function
clk: mediatek: reset: Revise structure to control reset register
clk: mediatek: reset: Support nonsequence base offsets of reset
registers
clk: mediatek: reset: Support inuput argument index mode
clk: mediatek: reset: Change return type for clock reset register
function
clk: mediatek: reset: Add new register reset function with device
clk: mediatek: reset: Add reset support for simple probe
dt-bindings: arm: mediatek: Add #reset-cells property forMT8192/MT8195 dt-bindings: reset: mediatek: Add infra_ao reset index for MT8192/MT8195clk: mediatek: reset: Add
infra_aoreset support for MT8192/MT8195
arm64: dts: mediatek: Add infra #reset-cells property for MT8192
arm64: dts: mediatek: Add infra #reset-cells property for MT8195
dt-bindings: reset: mediatek: Addinfra_aoreset index for MT8186
dt-bindings: arm: mediatek: Add #reset-cells property for MT8186
clk: mediatek: reset: Addinfra_aoreset support for MT8186.../mediatek/mediatek,mt8186-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8192-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8195-sys-clock.yaml | 3 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 15 +- 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 | 18 +- drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 ++ drivers/clk/mediatek/clk-mt8192.c | 29 +++ drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 +++ drivers/clk/mediatek/clk-mtk.c | 7 + drivers/clk/mediatek/clk-mtk.h | 9 +- drivers/clk/mediatek/reset.c | 198 +++++++++++++----- drivers/clk/mediatek/reset.h | 82 ++++++++ include/dt-bindings/reset/mt8186-resets.h | 5 + include/dt-bindings/reset/mt8192-resets.h | 8 + include/dt-bindings/reset/mt8195-resets.h | 6 + 28 files changed, 523 insertions(+), 95 deletions(-)create mode 100644
drivers/clk/mediatek/reset.h
Quoted 75 lines · Rex-BC Chen
In this series, we cleanup MediaTek clock reset drivers in clk/mediatek
folder. MediaTek clock reset driver is used to provide reset control of modules controlled in clk, likeinfra_ao.Changes for v8 resend:
1. Remove tested-by tag from Nícolas for MT8195/MT8186 patches.
2. Add reviewed-by tag from AngeloGioacchino.Changes for v8:
1. Use 'enummtk_reset_version' to replace u8 in patch 5 and 6.
2. Use lowercase '0xc' in patch 7.
3. Drop "simple-mfd" in patch 16 because it's for original reset controller.
4. v8 is based on linux-next next-20220520 and Chen-Yu's series[1].Changes for v7:
1. v7 is based on linux-next next-20220519 and Chen-Yu's series[1].
2. Add support for MT8186.[1]:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=643003Changes for v6:
1. Add a new patch to support inuput argument index mode.
2. Revise definition inreset.hto index.Rex-BC Chen (19):
clk: mediatek: reset: Addreset.h
clk: mediatek: reset: Fix written reset bit offset
clk: mediatek: reset: Refine and reorder functions inreset.c
clk: mediatek: reset: Extract common drivers to update function
clk: mediatek: reset: Merge and revise reset register function
clk: mediatek: reset: Revise structure to control reset register
clk: mediatek: reset: Support nonsequence base offsets of reset
registers
clk: mediatek: reset: Support inuput argument index mode
clk: mediatek: reset: Change return type for clock reset register
function
clk: mediatek: reset: Add new register reset function with device
clk: mediatek: reset: Add reset support for simple probe
dt-bindings: arm: mediatek: Add #reset-cells property forMT8192/MT8195 dt-bindings: reset: mediatek: Add infra_ao reset index for MT8192/MT8195clk: mediatek: reset: Add
infra_aoreset support for MT8192/MT8195
arm64: dts: mediatek: Add infra #reset-cells property for MT8192
arm64: dts: mediatek: Add infra #reset-cells property for MT8195
dt-bindings: reset: mediatek: Addinfra_aoreset index for MT8186
dt-bindings: arm: mediatek: Add #reset-cells property for MT8186
clk: mediatek: reset: Addinfra_aoreset support for MT8186.../mediatek/mediatek,mt8186-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8192-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8195-sys-clock.yaml | 3 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 15 +- 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 | 18 +- drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 ++ drivers/clk/mediatek/clk-mt8192.c | 29 +++ drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 +++ drivers/clk/mediatek/clk-mtk.c | 7 + drivers/clk/mediatek/clk-mtk.h | 9 +-
Quoted 9 lines
drivers/clk/mediatek/reset.c | 198 +++++++++++++--- -- drivers/clk/mediatek/reset.h | 82 ++++++++ include/dt-bindings/reset/mt8186-resets.h | 5 + include/dt-bindings/reset/mt8192-resets.h | 8 + include/dt-bindings/reset/mt8195-resets.h | 6 + 28 files changed, 523 insertions(+), 95 deletions(-) create mode 100644 drivers/clk/mediatek/reset.h
Hello Stephen,
Gentle ping for this series.
I also pushed another series to move these drivers to drivers/reset folder[1], but I think we still can let this series merged.
If you have any comments for [1], please let me know.
Thanks.
[1]:
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
BRs,
Bo-Chen
Stephen Boyd
maintainerQuoting Rex-BC Chen (2022-06-12 22:26:52)
Quoted 2 lines
I also pushed another series to move these drivers to
drivers/resetfolder[1], but I think we still can let this series merged.
Sure. I merged everything except the DTS patches.
Quoted 2 lines
If you have any comments for [1], please let me know.
I'll take a look. Thanks.