Cleanup MediaTek clk reset drivers and support MT8192/MT8195
Subsystems (4)
v3 cover Cleanup MediaTek clk reset drivers and support MT8192/MT8195
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 V3:
1. Modify drivers for reviewers' comments.
2. Add dt-binding patch for MT8192/MT8195 infra.
3. Add reset property of infra node for MT8192.
4. Use original function for simple operation.
Changes for V2:
1. Modify drivers for reviewers' comments.
2. Use simple reset to replace v1.
3. Recover v2 to set_clr.
4. Separate error handling to another patch.
5. Add support for input offset and bit from DT.
6. Add support for MT8192 and MT8195.
Rex-BC Chen (17):
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: Add return for clock reset register function
clk: mediatek: reset: Add new register reset function with device
clk: mediatek: reset: Add support for input offset and bit from DT
clk: mediatek: reset: Add reset support for simple probe
dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
dt-binding: mt8192: Add infra_ao reset bit
dt-bindings: arm: mediatek: Add #reset-cells property for MT8195-sys-clock
dt-binding: mt8195: Add infra_ao reset bit
clk: mediatek: reset: Add infra_ao reset support for MT8192
clk: mediatek: reset: Add infra_ao reset support for MT8195
arm64: dts: mediatek: Add infra #reset-cells property for MT8192
.../mediatek/mediatek,mt8192-sys-clock.yaml | 3 + .../mediatek/mediatek,mt8195-sys-clock.yaml | 3 + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 1 + 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 | 8 +- drivers/clk/mediatek/clk-mt8192.c | 11 + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 8 + drivers/clk/mediatek/clk-mtk.c | 7 + drivers/clk/mediatek/clk-mtk.h | 9 +- drivers/clk/mediatek/reset.c | 202 +++++++++++++----- drivers/clk/mediatek/reset.h | 36 ++++ include/dt-bindings/reset/mt8192-resets.h | 10 + include/dt-bindings/reset/mt8195-resets.h | 7 + 24 files changed, 381 insertions(+), 79 deletions(-) create mode 100644 drivers/clk/mediatek/reset.h
Signature · 1 line
2.18.0
PATCH v3 1/17 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)
@@ -190,12 +192,6 @@ void mtk_free_clk_data(struct clk_onecell_data *clk_data);struct clk *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: [PATCH V3 01/17] clk: mediatek: reset: Add reset.h
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 3 lines
Add a new file "
reset.h" to place some definitions for clock reset.Signed-off-by Rex-BC Chen <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 2/17 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
PATCH v3 3/17 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: [PATCH V3 03/17] clk: mediatek: reset: Refine and reorder functions in reset.c
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 4 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]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 4/17 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: [PATCH V3 04/17] clk: mediatek: reset: Extract common drivers to update function
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 5 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]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 5/17 clk: mediatek: reset: Merge and revise reset register function
In reply to Rex-BC ChenThere are two versions for clock reset register control of 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 our data structure "struct mtk_reset", we can not use the operation of simple reset driver. We keep the original functions and name this version as "MTK_RST_SIMPLE".
In this patch:
- Add a version enum to separate different MediaTek 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_set_nr" to avoid confusion. This variable is used to define the number of reset set.
- Rename "regofs" to "reg_ofs".
- Adjust delaration type for 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 | 40 ++++++++++++--------------- drivers/clk/mediatek/reset.h | 11 +++++--- 15 files changed, 46 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
@@ -785,7 +785,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 ; }
@@ -908,7 +908,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->clks[CLK_PERI_UART0_PD ]); -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
@@ -1239,7 +1239,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 +18 -22
@@ -92,14 +92,25 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { .reset = mtk_reset_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) +void mtk_register_reset_controller (struct device_node *np, +u32 rst_set_nr,u16 reg_ofs,u8 version) {struct mtk_reset *data;int ret;struct regmap *regmap; +const struct reset_control_ops *rcops =NULL ; + +switch (version) { +case MTK_RST_SIMPLE : + rcops = &mtk_reset_ops; +break ; +case MTK_RST_SET_CLR : + rcops = &mtk_reset_ops_set_clr; +break ; +default : +pr_err ("Unknown reset version %d\n" , version); +return ; + } regmap =device_node_to_regmap (np);if (IS_ERR (regmap)) {
@@ -112,32 +123,17 @@ static void mtk_register_reset_controller_common(struct device_node *np,return ; data->regmap = regmap; - data->regofs = regofs; + data->regofs = reg_ofs; data->rcdev.owner =THIS_MODULE ; - data->rcdev.nr_resets = num_regs *32 ; - data->rcdev.ops = reset_ops; + data->rcdev.nr_resets = rst_set_nr *32 ; + data->rcdev.ops = rcops; data->rcdev.of_node = np; ret =reset_controller_register (&data->rcdev);if (ret) {pr_err ("could not register reset controller: %d\n" , ret);kfree (data); -return ; } } -void mtk_register_reset_controller (struct device_node *np, -unsigned int num_regs,int regofs) -{ -mtk_register_reset_controller_common (np, num_regs, regofs, - &mtk_reset_ops); -} - -void mtk_register_reset_controller_set_clr (struct device_node *np, -unsigned int num_regs,int regofs) -{ -mtk_register_reset_controller_common (np, num_regs, regofs, - &mtk_reset_ops_set_clr); -} -MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/reset.h +7 -4
@@ -9,6 +9,12 @@#include <linux/reset-controller.h> #include <linux/types.h> +enum mtk_reset_version { +MTK_RST_SIMPLE =0 , +MTK_RST_SET_CLR , +MTK_RST_MAX , +}; +struct mtk_reset {struct regmap *regmap;int regofs;
@@ -16,9 +22,6 @@ struct mtk_reset { };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_set_nr,u16 reg_ofs,u8 version);#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [PATCH V3 05/17] clk: mediatek: reset: Merge and revise reset register function
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 18 lines
There are two versions for clock reset register control of 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 our data structure "struct
mtk_reset", we can not use the operation of simple reset driver. We keep the original functions and name this version as "MTK_RST_SIMPLE".In this patch:
- Add a version enum to separate different MediaTek reset hardware.
- Merge the reset register function of simple andset_clrinto one function "mtk_register_reset_controller".
- Rename input variable "num_regs" to "rst_set_nr" to avoid confusion. This variable is used to define the number of reset set.
- Rename "regofs" to "reg_ofs".
- Adjust delaration type formtk_register_reset_controller().
Quoted 1 line
Signed-off-by Rex-BC Chen <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 6/17 clk: mediatek: reset: Revise structure to control reset register
In reply to Rex-BC ChenTo declare the reset data easier instead of using many input variables to mtk_register_reset_controller().
- Add mtk_clk_rst_desc to input the reset register data.
- Rename "mtk_reset" to "mtk_clk_rst_data". We use it to store reset register data and store reset controller device. It's more easy to manager the data for each 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 | 32 ++++++++++++++++++--------- drivers/clk/mediatek/reset.h | 12 +++++++--- 15 files changed, 173 insertions(+), 35 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_set_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_set_nr =1 , + .reg_ofs =0xc , +}; +static int clk_mt2701_g3dsys_init (struct platform_device *pdev) {struct clk_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_set_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_set_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_set_nr =2 , + .reg_ofs =0x0 , + }, +}; +static struct clk_onecell_data *infra_clk_data;static void __init mtk_infrasys_init_early (struct device_node *node)
@@ -785,7 +800,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 ; }
@@ -908,7 +923,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_set_nr =2 , + .reg_ofs =0x30 , + }, +/* peri */ + { + .version =MTK_RST_SIMPLE , + .rst_set_nr =2 , + .reg_ofs =0x0 , + }, +}; +static int clk_mt2712_apmixed_probe (struct platform_device *pdev) {struct clk_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_set_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7622_ethsys_init (struct platform_device *pdev) {struct clk_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_set_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7622_ssusbsys_init (struct platform_device *pdev) {struct clk_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_set_nr =1 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_set_nr =2 , + .reg_ofs =0x0 , + }, +}; +static int mtk_topckgen_init (struct platform_device *pdev) {struct clk_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->clks[CLK_PERI_UART0_PD ]); -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_set_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7629_ethsys_init (struct platform_device *pdev) {struct clk_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_set_nr =1 , + .reg_ofs =0x34 , +}; +static int clk_mt7629_ssusbsys_init (struct platform_device *pdev) {struct clk_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_set_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_set_nr =2 , + .reg_ofs =0x0 , + } +}; +static void __init mtk_topckgen_init (struct device_node *node) {struct clk_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_set_nr =2 , + .reg_ofs =0x30 , + }, +/* pericfg */ + { + .version =MTK_RST_SIMPLE , + .rst_set_nr =2 , + .reg_ofs =0x0 , + } +}; +static struct clk_onecell_data *mt8173_top_clk_data__initdata ;static struct clk_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_set_nr =4 , + .reg_ofs =INFRA_RST0_SET_OFFSET , +}; +static int clk_mt8183_apmixed_probe (struct platform_device *pdev) {struct clk_onecell_data *clk_data;
@@ -1239,8 +1245,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 -11
@@ -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,14 +98,19 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { };void mtk_register_reset_controller (struct device_node *np, -u32 rst_set_nr,u16 reg_ofs,u8 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 ;
@@ -108,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 ; }
@@ -122,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_set_nr *32 ; + data->rcdev.nr_resets = desc->rst_set_nr *32 ; data->rcdev.ops = rcops; data->rcdev.of_node = np;
drivers/clk/mediatek/reset.h +9 -3
@@ -15,13 +15,19 @@ enum mtk_reset_version { MTK_RST_MAX, }; -struct mtk_reset { +struct mtk_clk_rst_desc { +u8 version; +u32 rst_set_nr; +u16 reg_ofs; +}; + +struct mtk_clk_rst_data {struct regmap *regmap; -int regofs;struct reset_controller_dev rcdev; +const struct mtk_clk_rst_desc *desc; };void mtk_register_reset_controller (struct device_node *np, -u32 rst_set_nr,u16 reg_ofs,u8 version); +const struct mtk_clk_rst_desc *desc);#endif /* __DRV_CLK_MTK_RESET_H */
Signature · 1 line
2.18.0
Re: [PATCH V3 06/17] clk: mediatek: reset: Revise structure to control reset register
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 10 lines
To declare the reset data easier instead of using many input variables to
mtk_register_reset_controller().- Add
mtk_clk_rst_descto input the reset register data.
- Rename "mtk_reset" to "mtk_clk_rst_data". We use it to store reset register data and store reset controller device. It's more easy to manager the data for each reset controller.
- Extractcontainer_ofin update functions toto_mtk_clk_rst_data().Signed-off-by Rex-BC Chen <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 7/17 clk: mediatek: reset: Add return for clock reset register function
In reply to Rex-BC ChenTo make error handling, we add return for mtk_clk_register_rst_ctrl().
--- drivers/clk/mediatek/reset.c | 15 +++++++++------ drivers/clk/mediatek/reset.h | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-)
drivers/clk/mediatek/reset.c +9 -6
@@ -97,8 +97,8 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { .reset = mtk_reset_set_clr, }; -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 ;
@@ -107,7 +107,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) {
@@ -119,18 +119,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;
@@ -143,7 +143,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 +2 -2
@@ -27,7 +27,7 @@ struct mtk_clk_rst_data { const struct mtk_clk_rst_desc *desc; }; -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: [PATCH V3 07/17] clk: mediatek: reset: Add return for clock reset register function
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 3 lines
To make error handling, we add return for
mtk_clk_register_rst_ctrl().Signed-off-by Rex-BC Chen <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 8/17 clk: mediatek: reset: Add new register reset function with device
In reply to Rex-BC ChenIt's a proper implementation using device to register reset controller. Howerver, some clock drviers of MediaTeks only provide device_node. Therefore, we still remain register reset function with device_node and add a 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 | 53 +++++++++++++++++++++++++++ drivers/clk/mediatek/reset.h | 2 + 13 files changed, 71 insertions(+), 16 deletions(-)
drivers/clk/mediatek/clk-mt2701-eth.c +1 -1
@@ -64,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, &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
@@ -58,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, &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
@@ -63,7 +63,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
@@ -800,7 +800,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 ; }
@@ -923,7 +923,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
@@ -1376,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, &clk_rst_desc[0 ]); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[0 ]);return r; }
@@ -1398,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, &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
@@ -88,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, &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
@@ -99,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, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
@@ -121,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, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt7622.c +2 -2
@@ -678,7 +678,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 ; }
@@ -729,7 +729,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)clk_prepare_enable (clk_data->clks[CLK_PERI_UART0_PD ]); -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
@@ -98,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, &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
@@ -94,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, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
@@ -116,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, &clk_rst_desc); +mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc);return r; }
drivers/clk/mediatek/clk-mt8183.c +1 -1
@@ -1245,7 +1245,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 +53 -0
57 lines not on this page · raw message
drivers/clk/mediatek/reset.h +2 -0
@@ -29,5 +29,7 @@ struct mtk_clk_rst_data {int mtk_register_reset_controller (struct device_node *np,const struct mtk_clk_rst_desc *desc); +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: [PATCH V3 08/17] clk: mediatek: reset: Add new register reset function with device
Il 22/04/22 08:01, Rex-BC Chen ha scritto:
Quoted 6 lines
It's a proper implementation using device to register reset controller. Howerver, some clock drviers of MediaTeks only provide
device_node. Therefore, we still remain register reset function withdevice_nodeand add a function with device to register reset controller.Signed-off-by Rex-BC Chen <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 9/17 clk: mediatek: reset: Add support for input offset and bit from DT
In reply to Rex-BC ChenTo use the clock reset function easier, we implement the of_xlate. The calculation of return value is different from each reset version.
There is no impact for original use. If the argument number is not larger than 1, it will return original id.
With this implementation if we want to set offset 0x120 and bit 16, we can just write "resets = <&infra_rst 0x120 16>;" in the module node.
--- drivers/clk/mediatek/reset.c | 31 +++++++++++++++++++++++++++++++ drivers/clk/mediatek/reset.h | 1 + 2 files changed, 32 insertions(+)
drivers/clk/mediatek/reset.c +31 -0
@@ -97,6 +97,33 @@ 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); +unsigned int offset, bit, shift; + +if (reset_spec->args_count <=1 ) +return reset_spec->args[0 ]; + +switch (data->desc->version) { +case MTK_RST_SIMPLE : + shift =2 ; +break ; +case MTK_RST_SET_CLR : + shift =4 ; +break ; +default : +pr_err ("Unknown reset version %d\n" , data->desc->version); +return -EINVAL ; + } + + offset = reset_spec->args[0 ]; + bit = reset_spec->args[1 ]; + +return (offset >> shift) *32 + bit; +} +int mtk_register_reset_controller (struct device_node *np,const struct mtk_clk_rst_desc *desc) {
@@ -138,6 +165,8 @@ int mtk_register_reset_controller(struct device_node *np, data->rcdev.nr_resets = desc->rst_set_nr *32 ; data->rcdev.ops = rcops; data->rcdev.of_node = np; + data->rcdev.of_reset_n_cells =max (desc->reset_n_cells,1 ); + data->rcdev.of_xlate = reset_xlate; ret =reset_controller_register (&data->rcdev);if (ret) {
@@ -192,6 +221,8 @@ int mtk_register_reset_controller_with_dev(struct device *dev, data->rcdev.ops = rcops; data->rcdev.of_node = np; data->rcdev.dev = dev; + data->rcdev.of_reset_n_cells =max (desc->reset_n_cells,1 ); + data->rcdev.of_xlate = reset_xlate; ret =devm_reset_controller_register (dev, &data->rcdev);if (ret) {
drivers/clk/mediatek/reset.h +1 -0
@@ -19,6 +19,7 @@ struct mtk_clk_rst_desc {u8 version;u32 rst_set_nr;u16 reg_ofs; +int reset_n_cells; };struct mtk_clk_rst_data {
Signature · 1 line
2.18.0
PATCH v3 10/17 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 the function of registering reset with device 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
@@ -453,6 +453,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
@@ -195,6 +195,7 @@ struct clk *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
PATCH v3 11/17 dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
In reply to Rex-BC ChenWe will use the infra_ao reset which is defined in mt8192-sys-clock. The maximum value of reset-cells is 2. Therefore, we add this patch to define it.
--- .../bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +3 -0
@@ -29,6 +29,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + maximum: 2 + required: - compatible - reg
Signature · 1 line
2.18.0
Re: [PATCH V3 11/17] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
Quoted 3 lines · Rex-BC Chen
We will use the
infra_aoreset which is defined in mt8192-sys-clock. The maximum value of reset-cells is 2. Therefore, we add this patch to define it.
Remove entire last sentence, does not make sense in the commit.
Quoted 11 lines
Signed-off-by Rex-BC Chen <[email protected]>--- .../bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml | 3 +++ 1 file changed, 3 insertions(+)Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +0
-0
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 33
Quoted 5 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +2
-0@@ -29,6 +29,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + maximum: 2
Why this is a maximum? Usually this is const, so how do you use it (with what values)?
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 37
Quoted 4 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +1
-0+ required: - compatible - reg
Best regards,
Krzysztof
Re: [PATCH V3 11/17] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
Quoted 9 lines · Krzysztof Kozlowski
Quoted 5 lines · Rex-BC Chen
We will use the
infra_aoreset which is defined in mt8192-sys- clock.
The maximum value of reset-cells is 2. Therefore, we add this patch to
define it.Remove entire last sentence, does not make sense in the commit.
Hello Krzysztof,
Thanks for your review.
I will drop "Therefore, we add this patch to define it." and add more detailed messages in next version.
Quoted 23 lines
Quoted 23 lines
Signed-off-by Rex-BC Chen <[email protected]>--- .../bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml | 3 +++ 1 file changed, 3 insertions(+)diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-
sys-clock.yamlb/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml
index5705bcf1fe47..28ebcecc8258100644
---
a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml
+++
b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yamlDocumentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +0
-0@@ -29,6 +29,9 @@ properties: '#clock-cells': const: 1
Quoted 7 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 33
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +2
-0+ '#reset-cells': + maximum: 2Why this is a maximum? Usually this is const, so how do you use it (with
what values)?
We need to let the driver compatible with previous setting in drivers/clk/mediatek/reset.c
There are two use cases in our reset driver:
(Refer to [1])
1. #reset-cells = <1>
When we input the argument, the older driver
use is to calculate
bank and bit by different method. From the implementation of reset_xlate(), we can see if the argument number is 1, it will return directly.
2. #reset-cells = <2>
The input arguments is offset and bit. When we input two arguments, we can use reset_xlate() to calculate the corresponding id to assert and deassert.
[1]:
https://lore.kernel.org/all/[email protected]/
If it's acceptable, I will add this in commit message.
BRs,
Rex
Quoted 8 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 37
Quoted 4 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +1
-0+ required: - compatible - regBest regards,
Krzysztof
Re: [PATCH V3 11/17] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
Quoted 9 lines · Rex-BC Chen
Quoted 7 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 33
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +2
-0+ '#reset-cells': + maximum: 2Why this is a maximum? Usually this is const, so how do you use it (with
what values)?We need to let the driver compatible with previous setting in
drivers/clk/mediatek/reset.c
Then it should be enum [1, 2], because '0' is not valid.
Quoted 9 lines
There are two use cases in our reset driver:
(Refer to [1])1. #reset-cells = <1>
When we input the argument, the older driver
use is to calculate
bank and bit by different method. From the implementation ofreset_xlate(), we can see if the argument number is 1, it will return directly.
I understand this is an old binding with older compatibles, so this should be restricted per each variant (allOf:if:then)... but wait, old binding did not allow any reset-cells! You add an entirely new binding property and already want to support some older (deprecated?) way.
Quoted 10 lines
2. #reset-cells = <2>
The input arguments is offset and bit. When we input two arguments, we can usereset_xlate()to calculate the corresponding id to assert and deassert.[1]:
https://lore.kernel.org/all/[email protected]/If it's acceptable, I will add this in commit message.
Best regards,
Krzysztof
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH V3 11/17] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192-sys-clock
Quoted 25 lines · Krzysztof Kozlowski
Quoted 11 lines · Rex-BC Chen
Quoted 8 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml properties: · line 33
Quoted 2 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml +2
-0+ '#reset-cells': + maximum: 2Why this is a maximum? Usually this is const, so how do you use it
(with
what values)?We need to let the driver compatible with previous setting in
drivers/clk/mediatek/reset.cThen it should be enum [1, 2], because '0' is not valid.
Quoted 9 lines
There are two use cases in our reset driver:
(Refer to [1])1. #reset-cells = <1>
When we input the argument, the older driver
use is to calculate
bank and bit by different method. From the implementation ofreset_xlate(), we can see if the argument number is 1, it will return directly.
Quoted 17 lines
I understand this is an old binding with older compatibles, so this should be restricted per each variant (allOf:if:then)... but wait, old
binding did not allow any reset-cells! You add an entirely new binding
property and already want to support some older (deprecated?) way.Quoted 10 lines
2. #reset-cells = <2>
The input arguments is offset and bit. When we input two
arguments,
we can usereset_xlate()to calculate the corresponding id to
assert
and deassert.[1]:
Quoted 7 lines
Quoted 3 lines
If it's acceptable, I will add this in commit message.
Best regards,
Krzysztof
Hello Krzysztof,
I will let #reset-cells = <1> in next version and abandon the modification of reset_xlate().
Thanks!
BRs,
Rex
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 12/17 dt-binding: mt8192: Add infra_ao reset bit
In reply to Rex-BC ChenTo support reset of infra_ao, add the bit definition for thermal/PCIe/SVS.
--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/dt-bindings/reset/mt8192-resets.h +10 -0
@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23 +/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0 +/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15 +/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12 +#define MT8192_INFRA_RST4_PCIE_TOP 1 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8192 */
Signature · 1 line
2.18.0
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 14 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h line 38
Quoted 10 lines
include/dt-bindings/reset/mt8192-resets.h +9
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0 +/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15 +/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12 +#define MT8192_INFRA_RST4_PCIE_TOP 1
These should be the IDs of reset, not some register values/offsets. Therefore it is expected to have them incremented by 1.
include/dt-bindings/reset/mt8192-resets.h line 40
Quoted 2 lines
include/dt-bindings/reset/mt8192-resets.h +1
-0+#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8192 */
Best regards,
Krzysztof
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
Quoted 16 lines
include/dt-bindings/reset/mt8192-resets.h line 38
Quoted 11 lines
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15
include/dt-bindings/reset/mt8192-resets.h +5
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12 +#define MT8192_INFRA_RST4_PCIE_TOP 1These should be the IDs of reset, not some register values/offsets. Therefore it is expected to have them incremented by 1.
Hello Krzysztof,
This is define bit.
There is serveral reset set for infra_ao while it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive more easier.
For example, in dts, we can define
infra_ao: syscon {
compatible = "mediatek,mt8192-infracfg", "syscon";
reg = <0 0x10001000 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <2>;
};thermal {
...
resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>;
...
};If it's acceptabel, I can update all bit difinition from 0 to 15 for all reset set.
BRs,
Rex
Quoted 6 lines
Quoted 2 lines
+
#endif /*_DT_BINDINGS_RESET_CONTROLLER_MT8192*/Best regards,
Krzysztof
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 53 lines · Rex-BC Chen
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23Quoted 16 lines
include/dt-bindings/reset/mt8192-resets.h line 38
Quoted 11 lines
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15
include/dt-bindings/reset/mt8192-resets.h +5
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12 +#define MT8192_INFRA_RST4_PCIE_TOP 1These should be the IDs of reset, not some register values/offsets. Therefore it is expected to have them incremented by 1.
Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };
Quoted 8 lines
thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };If it's acceptabel, I can update all bit difinition from 0 to 15 for all reset set.
Bits are not acceptable, because you embed specific device programming model (register bits) into the binding.
These should be IDs, so decimal numbers incremented from 0, so:
#define MT8192_INFRA_RST0_LVTS_AP_RST 0
#define MT8192_INFRA_RST4_LVTS_MCU 1
#define MT8192_INFRA_RST4_PCIE_TOP 2
And what is 0x730 in your example? It does not look like ID of a reset...
Entire changeset look wrong from DT point of view.
Best regards,
Krzysztof
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 79 lines · Krzysztof Kozlowski
Quoted 65 lines · Rex-BC Chen
Quoted 29 lines · Krzysztof Kozlowski
Quoted 28 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5
+/* INFRA RST4 */Quoted 10 lines
Quoted 4 lines
+#define
MT8192_INFRA_RST4_LVTS_MCU
12
+#defineMT8192_INFRA_RST4_PCIE_TOP
1These should be the IDs of reset, not some register values/offsets.
Therefore it is expected to have them incremented by 1.Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive
more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };Quoted 3 lines
If it's acceptabel, I can update all bit difinition from 0 to 15 for
all reset set.Bits are not acceptable, because you embed specific device programming
model (register bits) into the binding.These should be IDs, so decimal numbers incremented from 0, so:
#defineMT8192_INFRA_RST0_LVTS_AP_RST0
#defineMT8192_INFRA_RST4_LVTS_MCU1
#defineMT8192_INFRA_RST4_PCIE_TOP2
Quoted 7 lines
And what is
0x730in your example? It does not look like ID of a reset...Entire changeset look wrong from DT point of view.
Best regards,
Krzysztof
Hello Krzysztof,
Got it. I will modify them to reset index.
And the dts in my next version would somthing like this:
----
#define MT8192_INFRA_THERMAL_CTRL_RST 0
#define MT8192_INFRA_PEXTP_PHY_RST 79
#define MT8192_INFRA_PTP_RST 101
#define MT8192_INFRA_RST4_PCIE_TOP 129
#define MT8192_INFRA_THERMAL_CTRL_MCU_RST 140
----
infra_ao: syscon {
compatible = "mediatek,mt8192-infracfg", "syscon";
reg = <0 0x10001000 0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
};thermal {
...
resets = <&infra_ao MT8192_INFRA_THERMAL_CTRL_MCU_RST>;
...
};BRs,
Rex
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 93 lines · Rex-BC Chen
Quoted 79 lines · Krzysztof Kozlowski
Quoted 65 lines · Rex-BC Chen
Quoted 29 lines · Krzysztof Kozlowski
Quoted 28 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5
+/* INFRA RST4 */Quoted 10 lines
Quoted 4 lines
+#define
MT8192_INFRA_RST4_LVTS_MCU
12
+#defineMT8192_INFRA_RST4_PCIE_TOP
1These should be the IDs of reset, not some register values/offsets.
Therefore it is expected to have them incremented by 1.Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive
more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };Quoted 3 lines
If it's acceptabel, I can update all bit difinition from 0 to 15 for
all reset set.Bits are not acceptable, because you embed specific device programming
model (register bits) into the binding.These should be IDs, so decimal numbers incremented from 0, so:
#defineMT8192_INFRA_RST0_LVTS_AP_RST0
#defineMT8192_INFRA_RST4_LVTS_MCU1
#defineMT8192_INFRA_RST4_PCIE_TOP2Quoted 7 lines
And what is
0x730in your example? It does not look like ID of a reset...Entire changeset look wrong from DT point of view.
Best regards,
KrzysztofHello Krzysztof,
Got it. I will modify them to reset index.
And the dts in my next version would somthing like this:
Quoted 6 lines
----
#defineMT8192_INFRA_THERMAL_CTRL_RST0
#defineMT8192_INFRA_PEXTP_PHY_RST79
#defineMT8192_INFRA_PTP_RST101
#defineMT8192_INFRA_RST4_PCIE_TOP129
#defineMT8192_INFRA_THERMAL_CTRL_MCU_RST140
These are still not IDs, incremented by one.
So again from beginning:
0
1
2
...
Do not encode hardware register bits into the binding.
Best regards,
Krzysztof
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 115 lines · Krzysztof Kozlowski
Quoted 99 lines · Rex-BC Chen
Quoted 85 lines · Krzysztof Kozlowski
Quoted 67 lines · Rex-BC Chen
Quoted 26 lines · Krzysztof Kozlowski
Quoted 25 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST Quoted 15 lines
Quoted 9 lines
15
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12
+#defineMT8192_INFRA_RST4_PCIE_TOP
1These should be the IDs of reset, not some register values/offsets.
Therefore it is expected to have them incremented by 1.Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive
more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };Quoted 4 lines
If it's acceptabel, I can update all bit difinition from 0 to 15
for
all reset set.Bits are not acceptable, because you embed specific device programming
model (register bits) into the binding.These should be IDs, so decimal numbers incremented from 0, so:
#defineMT8192_INFRA_RST0_LVTS_AP_RST
0
#defineMT8192_INFRA_RST4_LVTS_MCU
1
#defineMT8192_INFRA_RST4_PCIE_TOP
2Quoted 7 lines
And what is
0x730in your example? It does not look like ID of a reset...Entire changeset look wrong from DT point of view.
Best regards,
KrzysztofHello Krzysztof,
Got it. I will modify them to reset index.
And the dts in my next version would somthing like this:Quoted 6 lines
----
#defineMT8192_INFRA_THERMAL_CTRL_RST0
#defineMT8192_INFRA_PEXTP_PHY_RST79
#defineMT8192_INFRA_PTP_RST101
#defineMT8192_INFRA_RST4_PCIE_TOP129
#defineMT8192_INFRA_THERMAL_CTRL_MCU_RST140These are still not IDs, incremented by one.
So again from beginning:
0
1
2
...
Quoted 4 lines
Do not encode hardware register bits into the binding.
Best regards,
Krzysztof
Hello Krzysztof,
It's not bit definiton, and it's index for our reset.
We have 32*5 reset bits for infra.
But we only use these 5 index currently, I do not list all of them.
The implementation is in [1].
-----
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->rst_bank_ofs[id / RST_NR_PER_BANK] + deassert_ofs, BIT(id % RST_NR_PER_BANK));
}
-----
[1]:
https://lore.kernel.org/all/[email protected]/
BRs,
Rex
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 118 lines · Rex-BC Chen
Quoted 117 lines · Krzysztof Kozlowski
Quoted 99 lines · Rex-BC Chen
Quoted 85 lines · Krzysztof Kozlowski
Quoted 67 lines · Rex-BC Chen
Quoted 26 lines · Krzysztof Kozlowski
Quoted 25 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST Quoted 15 lines
Quoted 9 lines
15
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU 12
+#defineMT8192_INFRA_RST4_PCIE_TOP
1These should be the IDs of reset, not some register values/offsets.
Therefore it is expected to have them incremented by 1.Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial. For MT8192, it's 0x120/0x130/0x140/0x150/0x730.
We are implement #reset-cells = <2>, and we can use this reset drive
more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };Quoted 4 lines
If it's acceptabel, I can update all bit difinition from 0 to 15
for
all reset set.Bits are not acceptable, because you embed specific device programming
model (register bits) into the binding.These should be IDs, so decimal numbers incremented from 0, so:
#defineMT8192_INFRA_RST0_LVTS_AP_RST
0
#defineMT8192_INFRA_RST4_LVTS_MCU
1
#defineMT8192_INFRA_RST4_PCIE_TOP
2Quoted 7 lines
And what is
0x730in your example? It does not look like ID of a reset...Entire changeset look wrong from DT point of view.
Best regards,
KrzysztofHello Krzysztof,
Got it. I will modify them to reset index.
And the dts in my next version would somthing like this:Quoted 6 lines
----
#defineMT8192_INFRA_THERMAL_CTRL_RST0
#defineMT8192_INFRA_PEXTP_PHY_RST79
#defineMT8192_INFRA_PTP_RST101
#defineMT8192_INFRA_RST4_PCIE_TOP129
#defineMT8192_INFRA_THERMAL_CTRL_MCU_RST140These are still not IDs, incremented by one.
So again from beginning:
0
1
2
...Do not encode hardware register bits into the binding.
Quoted 8 lines
Quoted 2 lines
Best regards,
KrzysztofHello Krzysztof,
It's not bit definiton, and it's index for our reset.
We have 32*5 reset bits for infra.
But we only use these 5 index currently, I do not list all of them.
You do not have to list all of them. You can list three, e.g.:
#define MT8192_INFRA_THERMAL_CTRL_RST 0
#define MT8192_INFRA_PEXTP_PHY_RST 1
#define MT8192_INFRA_PTP_RST 2
and you will add all further later. This is how all dt-binding headers are created.
Quoted 11 lines
The implementation is in [1].
-----
static int mtk_reset_update_set_clr(structreset_controller_dev*rcdev,(quoted diff) +0
-0unsigned int deassert_ofs = deassert ? 0x4 : 0; return regmap_write(data->regmap,data->desc->rst_bank_ofs[id / RST_NR_PER_BANK] + deassert_ofs, BIT(id % RST_NR_PER_BANK));
Quoted 1 line
}
Exactly, you hard-code the hardware programming model - register values/bits/whatever - in the ID, which is not correct. Additionally, bindings are (mostly) independent of Linux implementation.
Best regards,
Krzysztof
Re: [PATCH V3 12/17] dt-binding: mt8192: Add infra_ao reset bit
Quoted 164 lines · Krzysztof Kozlowski
Quoted 130 lines · Rex-BC Chen
Quoted 129 lines · Krzysztof Kozlowski
Quoted 111 lines · Rex-BC Chen
Quoted 96 lines · Krzysztof Kozlowski
Quoted 76 lines · Rex-BC Chen
Quoted 37 lines · Krzysztof Kozlowski
Quoted 36 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for
thermal/PCIe/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8192-resets.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/reset/mt8192-resets.h +0
-0@@ -27,4 +27,14 @@#define MT8192_TOPRGU_SW_RST_NUM 23
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST0 */ +#define MT8192_INFRA_RST0_LVTS_AP_RST 0
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST2 */ +#define MT8192_INFRA_RST2_PCIE_PHY_RST 15
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST3 */ +#define MT8192_INFRA_RST3_PTP_RST 5
include/dt-bindings/reset/mt8192-resets.h +2
-0+/* INFRA RST4 */ +#define MT8192_INFRA_RST4_LVTS_MCU Quoted 10 lines
Quoted 4 lines
12
+#defineMT8192_INFRA_RST4_PCIE_TOP1
These should be the IDs of reset, not some register values/offsets.
Therefore it is expected to have them incremented by 1.Hello Krzysztof,
This is define bit.
There is serveral reset set for
infra_aowhile it's not serial.
For MT8192, it's 0x120/0x130/0x140/0x150/0x730. We are implement #reset-cells = <2>, and we can use this reset
drive
more easier.For example, in dts, we can define
infra_ao: syscon { compatible = "mediatek,mt8192-infracfg", "syscon";(quoted diff) +0
-0reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>;#reset-cells = <2>; };thermal { ... resets = <&infra_ao 0x730 MT8192_INFRA_RST4_LVTS_MCU>; ... };Quoted 5 lines
If it's acceptabel, I can update all bit difinition from 0 to
15
for
all reset set.Bits are not acceptable, because you embed specific device programming
model (register bits) into the binding.These should be IDs, so decimal numbers incremented from 0, so:
#defineMT8192_INFRA_RST0_LVTS_AP_RST
0
#defineMT8192_INFRA_RST4_LVTS_MCU
1
#defineMT8192_INFRA_RST4_PCIE_TOP
2Quoted 8 lines
And what is
0x730in your example? It does not look like ID of a
reset...Entire changeset look wrong from DT point of view.
Best regards,
KrzysztofHello Krzysztof,
Got it. I will modify them to reset index.
And the dts in my next version would somthing like this:Quoted 6 lines
----
#defineMT8192_INFRA_THERMAL_CTRL_RST0
#defineMT8192_INFRA_PEXTP_PHY_RST79
#defineMT8192_INFRA_PTP_RST101
#defineMT8192_INFRA_RST4_PCIE_TOP129
#defineMT8192_INFRA_THERMAL_CTRL_MCU_RST140These are still not IDs, incremented by one.
So again from beginning:
0
1
2
...Do not encode hardware register bits into the binding.
Quoted 8 lines
Quoted 2 lines
Best regards,
KrzysztofHello Krzysztof,
It's not bit definiton, and it's index for our reset.
We have 32*5 reset bits for infra.
But we only use these 5 index currently, I do not list all of them.You do not have to list all of them. You can list three, e.g.:
#define
MT8192_INFRA_THERMAL_CTRL_RST0
#defineMT8192_INFRA_PEXTP_PHY_RST1
#defineMT8192_INFRA_PTP_RST2and you will add all further later. This is how all dt-binding headers
are created.Quoted 12 lines
The implementation is in [1].
-----
static int mtk_reset_update_set_clr(structreset_controller_dev*rcdev,(quoted diff) +0
-0unsigned int deassert_ofs = deassert ? 0x4 : 0; return regmap_write(data->regmap,data->desc->rst_bank_ofs[id / RST_NR_PER_BANK] + deassert_ofs, BIT(id % RST_NR_PER_BANK));Quoted 1 line
}
Quoted 7 lines
Exactly, you hard-code the hardware programming model - register values/bits/whatever - in the ID, which is not correct. Additionally, bindings are (mostly) independent of Linux implementation.
Best regards,
Krzysztof
Hello Krzysztof,
The rest bits could be used in the future.
I am not sure who will use them.
I will list all 5*32 index in next version.
BRs,
Rex
PATCH v3 13/17 dt-bindings: arm: mediatek: Add #reset-cells property for MT8195-sys-clock
In reply to Rex-BC ChenWe will use the infra_ao reset which is defined in mt8195-sys-clock. The maximum value of reset-cells is 2. Therefore, we add this patch to define it.
--- .../bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml +3 -0
@@ -37,6 +37,9 @@ properties: '#clock-cells': const: 1 + '#reset-cells': + maximum: 2 + required: - compatible - reg
Signature · 1 line
2.18.0
Re: [PATCH V3 13/17] dt-bindings: arm: mediatek: Add #reset-cells property for MT8195-sys-clock
Quoted 3 lines · Rex-BC Chen
We will use the
infra_aoreset which is defined in mt8195-sys-clock. The maximum value of reset-cells is 2. Therefore, we add this patch to define it.
Same comments as your other reset patch.
Best regards,
Krzysztof
PATCH v3 14/17 dt-binding: mt8195: Add infra_ao reset bit
In reply to Rex-BC ChenTo support reset of infra_ao, add the bit definition for thermal/SVS.
--- include/dt-bindings/reset/mt8195-resets.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/dt-bindings/reset/mt8195-resets.h +7 -0
@@ -26,4 +26,11 @@#define MT8195_TOPRGU_SW_RST_NUM 16 +/* INFRA RST0 */ +#define MT8195_INFRA_RST0_THERMAL_AP_RST 0 +/* INFRA RST3 */ +#define MT8195_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8195_INFRA_RST4_THERMAL_MCU_RST 10 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8195 */
Signature · 1 line
2.18.0
Re: [PATCH V3 14/17] dt-binding: mt8195: Add infra_ao reset bit
Quoted 12 lines · Rex-BC Chen
To support reset of
infra_ao, add the bit definition for thermal/SVS.Signed-off-by Rex-BC Chen <[email protected]>--- include/dt-bindings/reset/mt8195-resets.h | 7 +++++++ 1 file changed, 7 insertions(+)include/dt-bindings/reset/mt8195-resets.h +0
-0
include/dt-bindings/reset/mt8195-resets.h line 34
Quoted 9 lines
include/dt-bindings/reset/mt8195-resets.h +6
-0@@ -26,4 +26,11 @@#define MT8195_TOPRGU_SW_RST_NUM 16 +/* INFRA RST0 */ +#define MT8195_INFRA_RST0_THERMAL_AP_RST 0 +/* INFRA RST3 */ +#define MT8195_INFRA_RST3_PTP_RST 5 +/* INFRA RST4 */ +#define MT8195_INFRA_RST4_THERMAL_MCU_RST 10
Same comments as for other reset.
Best regards,
Krzysztof
PATCH v3 15/17 clk: mediatek: reset: Add infra_ao reset support for MT8192
In reply to Rex-BC ChenThe infra_ao reset is needed for MT8192. Therefore, we add this patch to support it.
--- drivers/clk/mediatek/clk-mt8192.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/clk/mediatek/clk-mt8192.c +11 -0
@@ -1114,6 +1114,13 @@ static const struct mtk_gate top_clks[] = { GATE_TOP(CLK_TOP_SSUSB_PHY_REF, "ssusb_phy_ref", "clk26m", 25), }; +static const struct mtk_clk_rst_desc clk_rst_desc = { + .version =MTK_RST_SET_CLR , + .rst_set_nr =4 , + .reg_ofs =0x0 , + .reset_n_cells =2 , +}; +#define MT8192_PLL_FMAX (3800UL * MHZ)#define MT8192_PLL_FMIN (1500UL * MHZ)#define MT8192_INTEGER_BITS 8
@@ -1239,6 +1246,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_provider (node, of_clk_src_onecell_get, clk_data);if (r) goto free_clk_data;
Signature · 1 line
2.18.0
PATCH v3 16/17 clk: mediatek: reset: Add infra_ao reset support for MT8195
In reply to Rex-BC ChenThe infra_ao reset is needed for MT8195. Therefore, we add this patch to support it.
--- drivers/clk/mediatek/clk-mt8195-infra_ao.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/mediatek/clk-mt8195-infra_ao.c +8 -0
@@ -182,9 +182,17 @@ 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 struct mtk_clk_rst_desc infra_ao_rst_desc = { + .version =MTK_RST_SET_CLR , + .rst_set_nr =4 , + .reg_ofs =0x0 , + .reset_n_cells =2 , +}; +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[] = {
Signature · 1 line
2.18.0
PATCH v3 17/17 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
@@ -269,6 +269,7 @@ compatible = "mediatek,mt8192-infracfg", "syscon"; reg = <0 0x10001000 0 0x1000>; #clock-cells = <1>; + #reset-cells = <2>; }; pericfg: syscon@10003000 {
Signature · 1 line
2.18.0