mbox series

[v4,0/5] watchdog: mt8192: add wdt support

Message ID 20200803071501.30634-1-crystal.guo@mediatek.com
Headers show
Series watchdog: mt8192: add wdt support | expand

Message

Crystal Guo Aug. 3, 2020, 7:14 a.m. UTC
v4 changes:
revise commit messages.

v3 changes:
https://patchwork.kernel.org/patch/11692731/
https://patchwork.kernel.org/patch/11692767/
https://patchwork.kernel.org/patch/11692729/
https://patchwork.kernel.org/patch/11692771/
https://patchwork.kernel.org/patch/11692733/

Crystal Guo (5):
  dt-binding: mediatek: watchdog: fix the description of compatible
  arm64: dts: mt8183: update watchdog device node
  dt-binding: mediatek: mt8192: update mtk-wdt document
  dt-binding: mt8192: add toprgu reset-controller head file
  watchdog: mt8192: add wdt support

 .../devicetree/bindings/watchdog/mtk-wdt.txt  |  5 ++--
 arch/arm64/boot/dts/mediatek/mt8183.dtsi      |  3 +-
 drivers/watchdog/mtk_wdt.c                    |  6 ++++
 .../reset-controller/mt8192-resets.h          | 30 +++++++++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 include/dt-bindings/reset-controller/mt8192-resets.h

Comments

Nicolas Boichat Sept. 11, 2020, 3:26 a.m. UTC | #1
Matthias, Guenter,

These patches have all been reviewed (apart from fairly trivial 2/5),
which maintainer should be picking those up?

Thanks!

On Mon, Aug 3, 2020 at 3:15 PM Crystal Guo <crystal.guo@mediatek.com> wrote:
>
> v4 changes:
> revise commit messages.
>
> v3 changes:
> https://patchwork.kernel.org/patch/11692731/
> https://patchwork.kernel.org/patch/11692767/
> https://patchwork.kernel.org/patch/11692729/
> https://patchwork.kernel.org/patch/11692771/
> https://patchwork.kernel.org/patch/11692733/
>
> Crystal Guo (5):
>   dt-binding: mediatek: watchdog: fix the description of compatible
>   arm64: dts: mt8183: update watchdog device node
>   dt-binding: mediatek: mt8192: update mtk-wdt document
>   dt-binding: mt8192: add toprgu reset-controller head file
>   watchdog: mt8192: add wdt support
>
>  .../devicetree/bindings/watchdog/mtk-wdt.txt  |  5 ++--
>  arch/arm64/boot/dts/mediatek/mt8183.dtsi      |  3 +-
>  drivers/watchdog/mtk_wdt.c                    |  6 ++++
>  .../reset-controller/mt8192-resets.h          | 30 +++++++++++++++++++
>  4 files changed, 40 insertions(+), 4 deletions(-)
>  create mode 100644 include/dt-bindings/reset-controller/mt8192-resets.h
>
>
Guenter Roeck Sept. 14, 2020, 3:12 p.m. UTC | #2
On 8/3/20 12:15 AM, Crystal Guo wrote:
> Add support for watchdog device found in MT8192 SoC
> 
> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/mtk_wdt.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> index d6a6393f609d..aef0c2db6a11 100644
> --- a/drivers/watchdog/mtk_wdt.c
> +++ b/drivers/watchdog/mtk_wdt.c
> @@ -11,6 +11,7 @@
>  
>  #include <dt-bindings/reset-controller/mt2712-resets.h>
>  #include <dt-bindings/reset-controller/mt8183-resets.h>
> +#include <dt-bindings/reset-controller/mt8192-resets.h>
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/init.h>
> @@ -76,6 +77,10 @@ static const struct mtk_wdt_data mt8183_data = {
>  	.toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
>  };
>  
> +static const struct mtk_wdt_data mt8192_data = {
> +	.toprgu_sw_rst_num = MT8192_TOPRGU_SW_RST_NUM,
> +};
> +
>  static int toprgu_reset_update(struct reset_controller_dev *rcdev,
>  			       unsigned long id, bool assert)
>  {
> @@ -322,6 +327,7 @@ static const struct of_device_id mtk_wdt_dt_ids[] = {
>  	{ .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
>  	{ .compatible = "mediatek,mt6589-wdt" },
>  	{ .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data },
> +	{ .compatible = "mediatek,mt8192-wdt", .data = &mt8192_data },
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
>
Guenter Roeck Sept. 14, 2020, 3:13 p.m. UTC | #3
On 8/3/20 12:14 AM, Crystal Guo wrote:
> The watchdog driver for MT2712 and MT8183 relies on DT data, so

> the fallback compatible MT6589 won't work.

> 

> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>

> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>


Reviewed-by: Guenter Roeck <linux@roeck-us.net>


> ---

>  Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

> index 4dd36bd3f1ad..45eedc2c3141 100644

> --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

> +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

> @@ -4,13 +4,13 @@ Required properties:

>  

>  - compatible should contain:

>  	"mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701

> -	"mediatek,mt2712-wdt", "mediatek,mt6589-wdt": for MT2712

> +	"mediatek,mt2712-wdt": for MT2712

>  	"mediatek,mt6589-wdt": for MT6589

>  	"mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797

>  	"mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622

>  	"mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623

>  	"mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629

> -	"mediatek,mt8183-wdt", "mediatek,mt6589-wdt": for MT8183

> +	"mediatek,mt8183-wdt": for MT8183

>  	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516

>  

>  - reg : Specifies base physical address and size of the registers.

>
Guenter Roeck Sept. 14, 2020, 3:14 p.m. UTC | #4
On 8/3/20 12:14 AM, Crystal Guo wrote:
> The watchdog driver for MT8183 relies on DT data, so the fallback
> compatible MT6589 won't work, need to update watchdog device node
> to sync with watchdog dt-binding document.
> 
> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  arch/arm64/boot/dts/mediatek/mt8183.dtsi | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> index 1e03c849dc5d..f8d835746ab8 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> @@ -310,8 +310,7 @@
>  		};
>  
>  		watchdog: watchdog@10007000 {
> -			compatible = "mediatek,mt8183-wdt",
> -				     "mediatek,mt6589-wdt";
> +			compatible = "mediatek,mt8183-wdt";
>  			reg = <0 0x10007000 0 0x100>;
>  			#reset-cells = <1>;
>  		};
>
Guenter Roeck Sept. 14, 2020, 3:26 p.m. UTC | #5
On 9/10/20 8:26 PM, Nicolas Boichat wrote:
> Matthias, Guenter,

> 

> These patches have all been reviewed (apart from fairly trivial 2/5),

> which maintainer should be picking those up?

> 


I don't see an Acked-by or Reviewed-by from a DT maintainer.
We'll have to wait for feedback from Rob.

Thanks,
Guenter

> Thanks!

> 

> On Mon, Aug 3, 2020 at 3:15 PM Crystal Guo <crystal.guo@mediatek.com> wrote:

>>

>> v4 changes:

>> revise commit messages.

>>

>> v3 changes:

>> https://patchwork.kernel.org/patch/11692731/

>> https://patchwork.kernel.org/patch/11692767/

>> https://patchwork.kernel.org/patch/11692729/

>> https://patchwork.kernel.org/patch/11692771/

>> https://patchwork.kernel.org/patch/11692733/

>>

>> Crystal Guo (5):

>>   dt-binding: mediatek: watchdog: fix the description of compatible

>>   arm64: dts: mt8183: update watchdog device node

>>   dt-binding: mediatek: mt8192: update mtk-wdt document

>>   dt-binding: mt8192: add toprgu reset-controller head file

>>   watchdog: mt8192: add wdt support

>>

>>  .../devicetree/bindings/watchdog/mtk-wdt.txt  |  5 ++--

>>  arch/arm64/boot/dts/mediatek/mt8183.dtsi      |  3 +-

>>  drivers/watchdog/mtk_wdt.c                    |  6 ++++

>>  .../reset-controller/mt8192-resets.h          | 30 +++++++++++++++++++

>>  4 files changed, 40 insertions(+), 4 deletions(-)

>>  create mode 100644 include/dt-bindings/reset-controller/mt8192-resets.h

>>

>>
Matthias Brugger Sept. 21, 2020, 4:58 p.m. UTC | #6
On 03/08/2020 09:14, Crystal Guo wrote:
> The watchdog driver for MT8183 relies on DT data, so the fallback

> compatible MT6589 won't work, need to update watchdog device node

> to sync with watchdog dt-binding document.

> 

> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>


Applied to v5.9-next/dts64

Thanks!

> ---

>   arch/arm64/boot/dts/mediatek/mt8183.dtsi | 3 +--

>   1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi

> index 1e03c849dc5d..f8d835746ab8 100644

> --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi

> +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi

> @@ -310,8 +310,7 @@

>   		};

>   

>   		watchdog: watchdog@10007000 {

> -			compatible = "mediatek,mt8183-wdt",

> -				     "mediatek,mt6589-wdt";

> +			compatible = "mediatek,mt8183-wdt";

>   			reg = <0 0x10007000 0 0x100>;

>   			#reset-cells = <1>;

>   		};

>