[RESEND v3 0/3] Add watchdog support for MT8188 Soc

[RESEND v3 0/3] Add watchdog support for MT8188 Soc

[Runyang Chen]

From: Runyang Chen <runyang.chen@mediatek.com>

Based on tag: next-20220919, linux-next/master

Refer to the discussion in the link:
https://patchwork.kernel.org/project/linux-mediatek/patch/20220721014845.19044-2-allen-kh.cheng@mediatek.com/
The other wdt compatible strings are unchanged.So, won't apply the
series above

v3:
Rebase on 6.0-rc5 and add reviewed-by and acked-by tag.

v2:
Revert wdt compatible for MT8188.

v1:
1. Add mt8188-resets.h to define definition of reset bits.
2. Add wdt compatible for MT8188.*

Runyang Chen (3):
  dt-bindings: watchdog: Add compatible for MediaTek MT8188
  dt-bindings: reset: mt8188: add toprgu reset-controller header file
  watchdog: mediatek: mt8188: add wdt support

 .../devicetree/bindings/watchdog/mtk-wdt.txt  |  1 +
 drivers/watchdog/mtk_wdt.c                    |  6 ++++
 include/dt-bindings/reset/mt8188-resets.h     | 36 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 include/dt-bindings/reset/mt8188-resets.h


base-commit: 4c9ca5b1597e3222177ba2a94658f78fa5ef4f58
-- 
2.18.0

[RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Runyang Chen]

From: Runyang Chen <runyang.chen@mediatek.com>

Add dt-binding documentation of watchdog for MediaTek MT8188 Soc

Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index 762c62e428ef..b900c85d4560 100644
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -17,6 +17,7 @@ Required properties:
 	"mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986
 	"mediatek,mt8183-wdt": for MT8183
 	"mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186
+	"mediatek,mt8188-wdt", "mediatek,mt6589-wdt": for MT8188
 	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516
 	"mediatek,mt8192-wdt": for MT8192
 	"mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195
-- 
2.18.0

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Guenter Roeck]

On Wed, Oct 26, 2022 at 02:33:25PM +0800, Runyang Chen wrote:
> From: Runyang Chen <runyang.chen@mediatek.com>
> 
> Add dt-binding documentation of watchdog for MediaTek MT8188 Soc
> 
> Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

This conflicts with the ongoing yaml conversion of this file
which is still not accepted.

https://patchwork.kernel.org/project/linux-watchdog/patch/20221005113517.70628-4-angelogioacchino.delregno@collabora.com/

Nevertheless, I'll apply this series to my watchdog-next branch
and assume that it will be included in the next version of the
yaml conversion patch.

For my and Wim's reference:

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

Thanks,
Guenter

> ---
>  Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
> index 762c62e428ef..b900c85d4560 100644
> --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
> @@ -17,6 +17,7 @@ Required properties:
>  	"mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986
>  	"mediatek,mt8183-wdt": for MT8183
>  	"mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186
> +	"mediatek,mt8188-wdt", "mediatek,mt6589-wdt": for MT8188
>  	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516
>  	"mediatek,mt8192-wdt": for MT8192
>  	"mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[AngeloGioacchino Del Regno]

Il 26/10/22 17:26, Guenter Roeck ha scritto:
> On Wed, Oct 26, 2022 at 02:33:25PM +0800, Runyang Chen wrote:
>> From: Runyang Chen <runyang.chen@mediatek.com>
>>
>> Add dt-binding documentation of watchdog for MediaTek MT8188 Soc
>>
>> Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
>> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> 
> This conflicts with the ongoing yaml conversion of this file
> which is still not accepted.
> 
> https://patchwork.kernel.org/project/linux-watchdog/patch/20221005113517.70628-4-angelogioacchino.delregno@collabora.com/
> 
> Nevertheless, I'll apply this series to my watchdog-next branch
> and assume that it will be included in the next version of the
> yaml conversion patch.
> 
> For my and Wim's reference:
> 
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> 
> Thanks,
> Guenter
> 
Adding Allen to the Cc's to make him aware of that, as he took over the
mtk-wdt yaml conversion.

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Allen-KH Cheng (程冠勳)]

On Thu, 2022-10-27 at 09:54 +0200, AngeloGioacchino Del Regno wrote:
> Il 26/10/22 17:26, Guenter Roeck ha scritto:
> > On Wed, Oct 26, 2022 at 02:33:25PM +0800, Runyang Chen wrote:
> > > From: Runyang Chen <runyang.chen@mediatek.com>
> > > 
> > > Add dt-binding documentation of watchdog for MediaTek MT8188 Soc
> > > 
> > > Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
> > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > Reviewed-by: AngeloGioacchino Del Regno <
> > > angelogioacchino.delregno@collabora.com>
> > 
> > This conflicts with the ongoing yaml conversion of this file
> > which is still not accepted.
> > 
> > 
https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-watchdog/patch/20221005113517.70628-4-angelogioacchino.delregno@collabora.com/__;!!CTRNKA9wMg0ARbw!zT39OehD4gnyDKPYwMbLdeyGI_oNOfvWa4HIrcooL3Ax8O7-N-BjXBZAolsCOuLb39fJ7Q$
> >  
> > 
> > Nevertheless, I'll apply this series to my watchdog-next branch
> > and assume that it will be included in the next version of the
> > yaml conversion patch.
> > 
> > For my and Wim's reference:
> > 
> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > 
> > Thanks,
> > Guenter
> > 
> 
> Adding Allen to the Cc's to make him aware of that, as he took over
> the
> mtk-wdt yaml conversion.

Hi Guenter,

I can send the following version of yaml conversion[1] for conflicts 
after you apply this series. Thanks.

[1]

https://patchwork.kernel.org/project/linux-mediatek/patch/20221007093437.12228-6-allen-kh.cheng@mediatek.com/

BRs,
Allen

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Guenter Roeck]

On 10/27/22 01:56, Allen-KH Cheng (程冠勳) wrote:
> On Thu, 2022-10-27 at 09:54 +0200, AngeloGioacchino Del Regno wrote:
>> Il 26/10/22 17:26, Guenter Roeck ha scritto:
>> > On Wed, Oct 26, 2022 at 02:33:25PM +0800, Runyang Chen wrote:
>> > > From: Runyang Chen <runyang.chen@mediatek.com>
>> > > 
>> > > Add dt-binding documentation of watchdog for MediaTek MT8188 Soc
>> > > 
>> > > Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
>> > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> > > Reviewed-by: AngeloGioacchino Del Regno <
>> > > angelogioacchino.delregno@collabora.com>
>> > 
>> > This conflicts with the ongoing yaml conversion of this file
>> > which is still not accepted.
>> > 
>> > 
> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-watchdog/patch/20221005113517.70628-4-angelogioacchino.delregno@collabora.com/__;!!CTRNKA9wMg0ARbw!zT39OehD4gnyDKPYwMbLdeyGI_oNOfvWa4HIrcooL3Ax8O7-N-BjXBZAolsCOuLb39fJ7Q$
>> >  
>> > 
>> > Nevertheless, I'll apply this series to my watchdog-next branch
>> > and assume that it will be included in the next version of the
>> > yaml conversion patch.
>> > 
>> > For my and Wim's reference:
>> > 
>> > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>> > 
>> > Thanks,
>> > Guenter
>> > 
>> 
>> Adding Allen to the Cc's to make him aware of that, as he took over
>> the
>> mtk-wdt yaml conversion.
> 
> Hi Guenter,
> 
> I can send the following version of yaml conversion[1] for conflicts
> after you apply this series. Thanks.
> 
> [1]
> 
> https://patchwork.kernel.org/project/linux-mediatek/patch/20221007093437.12228-6-allen-kh.cheng@mediatek.com/
>

You did not copy the watchdog mailing list with this patch, causing it to get lost
from my queue (even though I had a look at it). If there were other watchdog related
patches in this version of the series, they got lost as well.

Guenter

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Allen-KH Cheng (程冠勳)]

On Thu, 2022-10-27 at 06:42 -0700, Guenter Roeck wrote:
> On 10/27/22 01:56, Allen-KH Cheng (程冠勳) wrote:
> > On Thu, 2022-10-27 at 09:54 +0200, AngeloGioacchino Del Regno
> > wrote:
> > > Il 26/10/22 17:26, Guenter Roeck ha scritto:
> > > > On Wed, Oct 26, 2022 at 02:33:25PM +0800, Runyang Chen wrote:
> > > > > From: Runyang Chen <runyang.chen@mediatek.com>
> > > > > 
> > > > > Add dt-binding documentation of watchdog for MediaTek MT8188
> > > > > Soc
> > > > > 
> > > > > Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
> > > > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org
> > > > > >
> > > > > Reviewed-by: AngeloGioacchino Del Regno <
> > > > > angelogioacchino.delregno@collabora.com>
> > > > 
> > > > This conflicts with the ongoing yaml conversion of this file
> > > > which is still not accepted.
> > > > 
> > > > 
> > 
> > 
https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-watchdog/patch/20221005113517.70628-4-angelogioacchino.delregno@collabora.com/__;!!CTRNKA9wMg0ARbw!zT39OehD4gnyDKPYwMbLdeyGI_oNOfvWa4HIrcooL3Ax8O7-N-BjXBZAolsCOuLb39fJ7Q$
> > > >  
> > > > 
> > > > Nevertheless, I'll apply this series to my watchdog-next branch
> > > > and assume that it will be included in the next version of the
> > > > yaml conversion patch.
> > > > 
> > > > For my and Wim's reference:
> > > > 
> > > > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > > > 
> > > > Thanks,
> > > > Guenter
> > > > 
> > > 
> > > Adding Allen to the Cc's to make him aware of that, as he took
> > > over
> > > the
> > > mtk-wdt yaml conversion.
> > 
> > Hi Guenter,
> > 
> > I can send the following version of yaml conversion[1] for
> > conflicts
> > after you apply this series. Thanks.
> > 
> > [1]
> > 
> > 
https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-mediatek/patch/20221007093437.12228-6-allen-kh.cheng@mediatek.com/__;!!CTRNKA9wMg0ARbw!x4FHF5pdLxzPJgGcQt0ynL6wlmvETMGvJUCO9n1hlI8-beeKNYEnONwnl5-WI4kvCV-45w$
> >  
> > 
> 
> You did not copy the watchdog mailing list with this patch, causing
> it to get lost
> from my queue (even though I had a look at it). If there were other
> watchdog related
> patches in this version of the series, they got lost as well.
> 
> Guenter
> 

I apologize for missing this and will pay attention next time (v3).

BRs,
Allen

Re: [RESEND v3 1/3] dt-bindings: watchdog: Add compatible for MediaTek MT8188

[Krzysztof Kozlowski]

On 27/10/2022 09:54, Allen-KH Cheng (程冠勳) wrote:
>> You did not copy the watchdog mailing list with this patch, causing
>> it to get lost
>> from my queue (even though I had a look at it). If there were other
>> watchdog related
>> patches in this version of the series, they got lost as well.
>>
>> Guenter
>>
> 
> I apologize for missing this and will pay attention next time (v3).
> 

Just use get_maintainers.pl and automate your task... Automation removes
(most) mistakes.

Best regards,
Krzysztof

[RESEND v3 2/3] dt-bindings: reset: mt8188: add toprgu reset-controller header file

[Runyang Chen]

From: Runyang Chen <runyang.chen@mediatek.com>

Add toprgu reset-controller header file for MT8188

Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 include/dt-bindings/reset/mt8188-resets.h | 36 +++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 include/dt-bindings/reset/mt8188-resets.h

diff --git a/include/dt-bindings/reset/mt8188-resets.h b/include/dt-bindings/reset/mt8188-resets.h
new file mode 100644
index 000000000000..377cdfda82a9
--- /dev/null
+++ b/include/dt-bindings/reset/mt8188-resets.h
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)*/
+/*
+ * Copyright (c) 2022 MediaTek Inc.
+ * Author: Runyang Chen <runyang.chen@mediatek.com>
+ */
+
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8188
+#define _DT_BINDINGS_RESET_CONTROLLER_MT8188
+
+#define MT8188_TOPRGU_CONN_MCU_SW_RST          0
+#define MT8188_TOPRGU_INFRA_GRST_SW_RST        1
+#define MT8188_TOPRGU_IPU0_SW_RST              2
+#define MT8188_TOPRGU_IPU1_SW_RST              3
+#define MT8188_TOPRGU_IPU2_SW_RST              4
+#define MT8188_TOPRGU_AUD_ASRC_SW_RST          5
+#define MT8188_TOPRGU_INFRA_SW_RST             6
+#define MT8188_TOPRGU_MMSYS_SW_RST             7
+#define MT8188_TOPRGU_MFG_SW_RST               8
+#define MT8188_TOPRGU_VENC_SW_RST              9
+#define MT8188_TOPRGU_VDEC_SW_RST              10
+#define MT8188_TOPRGU_CAM_VCORE_SW_RST         11
+#define MT8188_TOPRGU_SCP_SW_RST               12
+#define MT8188_TOPRGU_APMIXEDSYS_SW_RST        13
+#define MT8188_TOPRGU_AUDIO_SW_RST             14
+#define MT8188_TOPRGU_CAMSYS_SW_RST            15
+#define MT8188_TOPRGU_MJC_SW_RST               16
+#define MT8188_TOPRGU_PERI_SW_RST              17
+#define MT8188_TOPRGU_PERI_AO_SW_RST           18
+#define MT8188_TOPRGU_PCIE_SW_RST              19
+#define MT8188_TOPRGU_ADSPSYS_SW_RST           21
+#define MT8188_TOPRGU_DPTX_SW_RST              22
+#define MT8188_TOPRGU_SPMI_MST_SW_RST          23
+
+#define MT8188_TOPRGU_SW_RST_NUM               24
+
+#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8188 */
-- 
2.18.0

Re: [RESEND v3 2/3] dt-bindings: reset: mt8188: add toprgu reset-controller header file

[Guenter Roeck]

On Wed, Oct 26, 2022 at 02:33:26PM +0800, Runyang Chen wrote:
> From: Runyang Chen <runyang.chen@mediatek.com>
> 
> Add toprgu reset-controller header file for MT8188
> 
> Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

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

> ---
>  include/dt-bindings/reset/mt8188-resets.h | 36 +++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 include/dt-bindings/reset/mt8188-resets.h
> 
> diff --git a/include/dt-bindings/reset/mt8188-resets.h b/include/dt-bindings/reset/mt8188-resets.h
> new file mode 100644
> index 000000000000..377cdfda82a9
> --- /dev/null
> +++ b/include/dt-bindings/reset/mt8188-resets.h
> @@ -0,0 +1,36 @@
> +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)*/
> +/*
> + * Copyright (c) 2022 MediaTek Inc.
> + * Author: Runyang Chen <runyang.chen@mediatek.com>
> + */
> +
> +#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8188
> +#define _DT_BINDINGS_RESET_CONTROLLER_MT8188
> +
> +#define MT8188_TOPRGU_CONN_MCU_SW_RST          0
> +#define MT8188_TOPRGU_INFRA_GRST_SW_RST        1
> +#define MT8188_TOPRGU_IPU0_SW_RST              2
> +#define MT8188_TOPRGU_IPU1_SW_RST              3
> +#define MT8188_TOPRGU_IPU2_SW_RST              4
> +#define MT8188_TOPRGU_AUD_ASRC_SW_RST          5
> +#define MT8188_TOPRGU_INFRA_SW_RST             6
> +#define MT8188_TOPRGU_MMSYS_SW_RST             7
> +#define MT8188_TOPRGU_MFG_SW_RST               8
> +#define MT8188_TOPRGU_VENC_SW_RST              9
> +#define MT8188_TOPRGU_VDEC_SW_RST              10
> +#define MT8188_TOPRGU_CAM_VCORE_SW_RST         11
> +#define MT8188_TOPRGU_SCP_SW_RST               12
> +#define MT8188_TOPRGU_APMIXEDSYS_SW_RST        13
> +#define MT8188_TOPRGU_AUDIO_SW_RST             14
> +#define MT8188_TOPRGU_CAMSYS_SW_RST            15
> +#define MT8188_TOPRGU_MJC_SW_RST               16
> +#define MT8188_TOPRGU_PERI_SW_RST              17
> +#define MT8188_TOPRGU_PERI_AO_SW_RST           18
> +#define MT8188_TOPRGU_PCIE_SW_RST              19
> +#define MT8188_TOPRGU_ADSPSYS_SW_RST           21
> +#define MT8188_TOPRGU_DPTX_SW_RST              22
> +#define MT8188_TOPRGU_SPMI_MST_SW_RST          23
> +
> +#define MT8188_TOPRGU_SW_RST_NUM               24
> +
> +#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8188 */

[RESEND v3 3/3] watchdog: mediatek: mt8188: add wdt support

[Runyang Chen]

From: Runyang Chen <runyang.chen@mediatek.com>

Support MT8188 watchdog device.

Signed-off-by: Runyang Chen <runyang.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 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 e97787536792..b53763ad90cf 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -13,6 +13,7 @@
 #include <dt-bindings/reset/mt7986-resets.h>
 #include <dt-bindings/reset/mt8183-resets.h>
 #include <dt-bindings/reset/mt8186-resets.h>
+#include <dt-bindings/reset/mt8188-resets.h>
 #include <dt-bindings/reset/mt8192-resets.h>
 #include <dt-bindings/reset/mt8195-resets.h>
 #include <linux/delay.h>
@@ -90,6 +91,10 @@ static const struct mtk_wdt_data mt8186_data = {
 	.toprgu_sw_rst_num = MT8186_TOPRGU_SW_RST_NUM,
 };
 
+static const struct mtk_wdt_data mt8188_data = {
+	.toprgu_sw_rst_num = MT8188_TOPRGU_SW_RST_NUM,
+};
+
 static const struct mtk_wdt_data mt8192_data = {
 	.toprgu_sw_rst_num = MT8192_TOPRGU_SW_RST_NUM,
 };
@@ -429,6 +434,7 @@ static const struct of_device_id mtk_wdt_dt_ids[] = {
 	{ .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data },
 	{ .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data },
 	{ .compatible = "mediatek,mt8186-wdt", .data = &mt8186_data },
+	{ .compatible = "mediatek,mt8188-wdt", .data = &mt8188_data },
 	{ .compatible = "mediatek,mt8192-wdt", .data = &mt8192_data },
 	{ .compatible = "mediatek,mt8195-wdt", .data = &mt8195_data },
 	{ /* sentinel */ }
-- 
2.18.0