introduce TI reset controller for MT8192 SoC
Subsystems (3)
v5 cover introduce TI reset controller for MT8192 SoC
v5:
1. revert ti-syscon-reset.txt, and add a new mediatek reset binding.
2. split the patch [v4, 3/4] with the change to force write and the change to integrate assert and deassert together.
3. separate the dts patch from this patch sets
v4:
fix typos on v3 commit message.
v3:
1. revert v2 changes.
2. add 'reset-duration-us' property to declare a minimum delay, which needs to be waited between assert and deassert.
3. add 'mediatek,infra-reset' to compatible.
v2 changes:
https://patchwork.kernel.org/patch/11697371/
1. add 'assert-deassert-together' property to introduce a new reset handler, which allows device to do serialized assert and deassert operations in a single step by 'reset' method.
2. add 'update-force' property to introduce force-update method, which forces the write operation in case the read already happens to return the correct value.
3. add 'generic-reset' to compatible
v1 changes:
https://patchwork.kernel.org/patch/11690523/
https://patchwork.kernel.org/patch/11690527/
Crystal Guo (3):
dt-binding: reset-controller: mediatek: add YAML schemas
reset-controller: ti: introduce a new reset handler
reset-controller: ti: force the write operation when assert or
deassert
.../bindings/reset/mediatek-syscon-reset.yaml | 51 +++++++++++++++++++ drivers/reset/reset-ti-syscon.c | 44 ++++++++++++++-- 2 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/reset/mediatek-syscon-reset.yaml
PATCH v5 1/3 dt-binding: reset-controller: mediatek: add YAML schemas
Add a YAML documentation for Mediatek, which uses ti reset-controller driver directly. The TI reset controller provides a common reset management, and is suitable for Mediatek SoCs.
--- .../bindings/reset/mediatek-syscon-reset.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/mediatek-syscon-reset.yaml
Documentation/devicetree/bindings/reset/mediatek-syscon-reset.yaml new file +51 -0
@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/reset/mediatek-syscon-reset.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek Reset Controller + +maintainers: + - Crystal Guo <[email protected]> + +description: + The bindings describe the reset-controller for Mediatek SoCs, + which is based on TI reset controller. For more detail, please + visit Documentation/devicetree/bindings/reset/ti-syscon-reset.txt. + +properties: + compatible: + const: mediatek,syscon-reset + + '#reset-cells': + const: 1 + + mediatek,reset-bits: + description: > + Contains the reset control register information, please refer to + Documentation/devicetree/bindings/reset/ti-syscon-reset.txt. + +required: + - compatible + - '#reset-cells' + - mediatek,reset-bits + +additionalProperties: false + +examples: + - | + #include <dt-bindings/reset/ti-syscon.h> + infracfg: infracfg@10001000 { + compatible = "mediatek,mt8192-infracfg", "syscon", "simple-mfd"; + reg = <0 0x10001000 0 0x1000>; + #clock-cells = <1>; + + infracfg_rst: reset-controller { + compatible = "mediatek,syscon-reset"; + #reset-cells = <1>; + mediatek,reset-bits = < + 0x140 15 0x144 15 0 0 (ASSERT_SET | DEASSERT_SET | STATUS_NONE) + >; + }; + };
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [v5,1/3] dt-binding: reset-controller: mediatek: add YAML schemas
Quoted 10 lines · Crystal Guo
Add a YAML documentation for Mediatek, which uses ti reset-controller driver directly. The TI reset controller provides a common reset management, and is suitable for Mediatek SoCs.
Signed-off-by Crystal Guo <[email protected]>--- .../bindings/reset/mediatek-syscon-reset.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/mediatek-syscon-reset.yaml
My bot found errors running 'make dt_binding_check' on your patch:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/reset/mediatek-syscon-reset.example.dt.yaml: example-0: infracfg@10001000:reg:0: [0, 268439552, 0, 4096] is too long
From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
See https://patchwork.ozlabs.org/patch/1373428
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:
pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.
Re: [v5,1/3] dt-binding: reset-controller: mediatek: add YAML schemas
Quoted 19 lines · Rob Herring
Quoted 10 lines · Crystal Guo
Add a YAML documentation for Mediatek, which uses ti reset-controller driver directly. The TI reset controller provides a common reset management, and is suitable for Mediatek SoCs.
Signed-off-by Crystal Guo <[email protected]>--- .../bindings/reset/mediatek-syscon-reset.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/mediatek-syscon-reset.yamlMy bot found errors running 'make
dt_binding_check' on your patch:/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/reset/mediatek-syscon-reset.example.dt.yaml: example-0: infracfg@10001000:reg:0: [0, 268439552, 0, 4096] is too long
From schema:/usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
Quoted 9 lines
See https://patchwork.ozlabs.org/patch/1373428
If you already ran 'make
dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade
Please check and re-submit.
Thanks for your remind, re-submit at:
https://patchwork.kernel.org/patch/11807721/
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v5 2/3 reset-controller: ti: introduce a new reset handler
In reply to Crystal GuoIntroduce ti_syscon_reset() to integrate assert and deassert together. If some modules need do serialized assert and deassert operations to reset itself, reset_control_reset can be called for convenience.
Such as reset-qcom-aoss.c, it integrates assert and deassert together by 'reset' method. MTK Socs also need this method to perform reset.
--- drivers/reset/reset-ti-syscon.c | 40 ++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/reset/reset-ti-syscon.c +39 -1
@@ -15,15 +15,22 @@* GNU General Public License for more details. */ +#include <linux/delay.h> #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset-controller.h> #include <dt-bindings/reset/ti-syscon.h> +struct mediatek_reset_data { +unsigned char *reset_bits; +unsigned int reset_duration_us; +}; +/** * struct ti_syscon_reset_control - reset control structure * @assert_offset: reset assert control register offset from syscon base
@@ -56,6 +63,7 @@ struct ti_syscon_reset_data {struct regmap *regmap;struct ti_syscon_reset_control *controls;unsigned int nr_controls; +const struct mediatek_reset_data *reset_data; };#define to_ti_syscon_reset_data (rcdev) \
@@ -158,9 +166,29 @@ static int ti_syscon_reset_status(struct reset_controller_dev *rcdev, !(control->flags &STATUS_SET ); } +static int ti_syscon_reset (struct reset_controller_dev *rcdev, +unsigned long id) +{ +struct ti_syscon_reset_data *data =to_ti_syscon_reset_data (rcdev); +int ret; + +if (data->reset_data) { + ret =ti_syscon_reset_assert (rcdev, id); +if (ret) +return ret; +usleep_range (data->reset_data->reset_duration_us, + data->reset_data->reset_duration_us *2 ); + +return ti_syscon_reset_deassert (rcdev, id); + }else { +return -ENOTSUPP ; + } +} +static const struct reset_control_ops ti_syscon_reset_ops = { .assert = ti_syscon_reset_assert, .deassert = ti_syscon_reset_deassert, + .reset = ti_syscon_reset, .status = ti_syscon_reset_status, };
@@ -182,7 +210,11 @@ static int ti_syscon_reset_probe(struct platform_device *pdev)if (IS_ERR (regmap))return PTR_ERR (regmap); - list =of_get_property (np,"ti,reset-bits" , &size); + data->reset_data =of_device_get_match_data (&pdev->dev); +if (data->reset_data) + list =of_get_property (np, data->reset_data->reset_bits, &size); +else + list =of_get_property (np,"ti,reset-bits" , &size);if (!list || (size /sizeof (*list)) %7 !=0 ) {dev_err (dev,"invalid DT reset description\n" );return -EINVAL ;
@@ -217,8 +249,14 @@ static int ti_syscon_reset_probe(struct platform_device *pdev)return devm_reset_controller_register (dev, &data->rcdev); } +static const struct mediatek_reset_data mtk_reset_data = { + .reset_bits ="mediatek,reset-bits" , + .reset_duration_us =10 , +}; +static const struct of_device_id ti_syscon_reset_of_match[] = { { .compatible ="ti,syscon-reset" , }, + { .compatible ="mediatek,syscon-reset" , .data = &mtk_reset_data}, {/* sentinel */ }, };MODULE_DEVICE_TABLE (of, ti_syscon_reset_of_match);
Signature · 1 line
2.18.0
PATCH v5 3/3 reset-controller: ti: force the write operation when assert or deassert
In reply to Crystal GuoForce the write operation in case the read already happens to return the correct value.
--- drivers/reset/reset-ti-syscon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/reset/reset-ti-syscon.c +2 -2
@@ -97,7 +97,7 @@ static int ti_syscon_reset_assert(struct reset_controller_dev *rcdev, mask =BIT (control->assert_bit); value = (control->flags &ASSERT_SET ) ? mask :0x0 ; -return regmap_update_bits (data->regmap, control->assert_offset, mask, value); +return regmap_write_bits (data->regmap, control->assert_offset, mask, value); }/**
@@ -128,7 +128,7 @@ static int ti_syscon_reset_deassert(struct reset_controller_dev *rcdev, mask =BIT (control->deassert_bit); value = (control->flags &DEASSERT_SET ) ? mask :0x0 ; -return regmap_update_bits (data->regmap, control->deassert_offset, mask, value); +return regmap_write_bits (data->regmap, control->deassert_offset, mask, value); }/**
Signature · 1 line
2.18.0