[v2,0/3] mtk_wdt: merge all the reset numbers in one head file

[v2,0/3] mtk_wdt: merge all the reset numbers in one head file

[Crystal Guo]

This series patches merge all the reset numbers in one head file

v2 changes:
merge all the reset numbers in one head file,
instead of pass the reset number via DTS (v1). 

v1 changes:
https://patchwork.kernel.org/patch/11688915/
https://patchwork.kernel.org/patch/11688925/
https://patchwork.kernel.org/patch/11688923/

Crystal Guo (3):
  dt-bindings: watchdog: modify description for mt2712 and mt8183
  dt-bindings: watchdog: add a new head file for toprgu reset-controllers
  watchdog: mtk_wdt: merge all the reset numbers in one head file

  Documentation/devicetree/bindings/watchdog/mtk-wdt.txt |  4 ++--
  drivers/watchdog/mtk_wdt.c                             |  3 +--
  include/dt-bindings/reset-controller/mtk-resets.h      | 13 +++++++++++++
  3 files changed, 16 insertions(+), 4 deletions(-)
  create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h

[v2,1/3] dt-bindings: watchdog: modify description for mt2712 and mt8183

[Crystal Guo]

Besides watchdog, mt2712 and mt8183 also provide sub-system software
reset features. But mt6589 not support this feature.

Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
---
 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 4dd36bd..45eedc2 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.
-- 
1.8.1.1.dirty

[v2,2/3] dt-bindings: watchdog: add a new head file for toprgu reset-controllers

[Crystal Guo]

merge all the reset numbers in one head file.

Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
---
 include/dt-bindings/reset-controller/mtk-resets.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h

diff --git a/include/dt-bindings/reset-controller/mtk-resets.h b/include/dt-bindings/reset-controller/mtk-resets.h
new file mode 100644
index 0000000..d73a4ba
--- /dev/null
+++ b/include/dt-bindings/reset-controller/mtk-resets.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2020 Mediatek Inc.
+ *
+ */
+
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MTK
+#define _DT_BINDINGS_RESET_CONTROLLER_MTK
+
+#define MT2712_TOPRGU_SW_RST_NUM	11
+#define MT8183_TOPRGU_SW_RST_NUM        19
+
+#endif
-- 
1.8.1.1.dirty

Re: [v2,2/3] dt-bindings: watchdog: add a new head file for toprgu reset-controllers

[Matthias Brugger]

Hi Crystal,

On 29/07/2020 08:30, Crystal Guo wrote:
> merge all the reset numbers in one head file.
> 
> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
> ---
>   include/dt-bindings/reset-controller/mtk-resets.h | 13 +++++++++++++
>   1 file changed, 13 insertions(+)
>   create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h
> 
> diff --git a/include/dt-bindings/reset-controller/mtk-resets.h b/include/dt-bindings/reset-controller/mtk-resets.h
> new file mode 100644
> index 0000000..d73a4ba
> --- /dev/null
> +++ b/include/dt-bindings/reset-controller/mtk-resets.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2020 Mediatek Inc.
> + *
> + */
> +
> +#ifndef _DT_BINDINGS_RESET_CONTROLLER_MTK
> +#define _DT_BINDINGS_RESET_CONTROLLER_MTK
> +
> +#define MT2712_TOPRGU_SW_RST_NUM	11
> +#define MT8183_TOPRGU_SW_RST_NUM        19

Maybe I didn't explain myself properly. We want to have all resets in one file 
and do not want to have the resets for the watchdog in a different file. That 
means I don't thin your patch is correct and the effort should be abandoned.

Regards,
Matthias

Re: [v2,2/3] dt-bindings: watchdog: add a new head file for toprgu reset-controllers

[Crystal Guo]

On Wed, 2020-07-29 at 15:42 +0800, Matthias Brugger wrote:
> Hi Crystal,
> 
> On 29/07/2020 08:30, Crystal Guo wrote:
> > merge all the reset numbers in one head file.
> > 
> > Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
> > ---
> >   include/dt-bindings/reset-controller/mtk-resets.h | 13 +++++++++++++
> >   1 file changed, 13 insertions(+)
> >   create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h
> > 
> > diff --git a/include/dt-bindings/reset-controller/mtk-resets.h b/include/dt-bindings/reset-controller/mtk-resets.h
> > new file mode 100644
> > index 0000000..d73a4ba
> > --- /dev/null
> > +++ b/include/dt-bindings/reset-controller/mtk-resets.h
> > @@ -0,0 +1,13 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +/*
> > + * Copyright (C) 2020 Mediatek Inc.
> > + *
> > + */
> > +
> > +#ifndef _DT_BINDINGS_RESET_CONTROLLER_MTK
> > +#define _DT_BINDINGS_RESET_CONTROLLER_MTK
> > +
> > +#define MT2712_TOPRGU_SW_RST_NUM	11
> > +#define MT8183_TOPRGU_SW_RST_NUM        19
> 
> Maybe I didn't explain myself properly. We want to have all resets in one file 
> and do not want to have the resets for the watchdog in a different file. That 
> means I don't thin your patch is correct and the effort should be abandoned.
> 
> Regards,
> Matthias

Do you mean to keep the current way unchanged? For example, with a new
SOC 8192, should add a new head file mt8192_resets.h for the resets
numbers.

Re: [v2,2/3] dt-bindings: watchdog: add a new head file for toprgu reset-controllers

[Matthias Brugger]

On 29/07/2020 10:11, Crystal Guo wrote:
> On Wed, 2020-07-29 at 15:42 +0800, Matthias Brugger wrote:
>> Hi Crystal,
>>
>> On 29/07/2020 08:30, Crystal Guo wrote:
>>> merge all the reset numbers in one head file.
>>>
>>> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
>>> ---
>>>    include/dt-bindings/reset-controller/mtk-resets.h | 13 +++++++++++++
>>>    1 file changed, 13 insertions(+)
>>>    create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h
>>>
>>> diff --git a/include/dt-bindings/reset-controller/mtk-resets.h b/include/dt-bindings/reset-controller/mtk-resets.h
>>> new file mode 100644
>>> index 0000000..d73a4ba
>>> --- /dev/null
>>> +++ b/include/dt-bindings/reset-controller/mtk-resets.h
>>> @@ -0,0 +1,13 @@
>>> +/* SPDX-License-Identifier: GPL-2.0 */
>>> +/*
>>> + * Copyright (C) 2020 Mediatek Inc.
>>> + *
>>> + */
>>> +
>>> +#ifndef _DT_BINDINGS_RESET_CONTROLLER_MTK
>>> +#define _DT_BINDINGS_RESET_CONTROLLER_MTK
>>> +
>>> +#define MT2712_TOPRGU_SW_RST_NUM	11
>>> +#define MT8183_TOPRGU_SW_RST_NUM        19
>>
>> Maybe I didn't explain myself properly. We want to have all resets in one file
>> and do not want to have the resets for the watchdog in a different file. That
>> means I don't thin your patch is correct and the effort should be abandoned.
>>
>> Regards,
>> Matthias
> 
> Do you mean to keep the current way unchanged? For example, with a new
> SOC 8192, should add a new head file mt8192_resets.h for the resets
> numbers.
> 

Exactly.

Regards,
Matthias

Re: [v2,2/3] dt-bindings: watchdog: add a new head file for toprgu reset-controllers

[Crystal Guo]

On Wed, 2020-07-29 at 16:15 +0800, Matthias Brugger wrote:
> 
> On 29/07/2020 10:11, Crystal Guo wrote:
> > On Wed, 2020-07-29 at 15:42 +0800, Matthias Brugger wrote:
> >> Hi Crystal,
> >>
> >> On 29/07/2020 08:30, Crystal Guo wrote:
> >>> merge all the reset numbers in one head file.
> >>>
> >>> Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
> >>> ---
> >>>    include/dt-bindings/reset-controller/mtk-resets.h | 13 +++++++++++++
> >>>    1 file changed, 13 insertions(+)
> >>>    create mode 100644 include/dt-bindings/reset-controller/mtk-resets.h
> >>>
> >>> diff --git a/include/dt-bindings/reset-controller/mtk-resets.h b/include/dt-bindings/reset-controller/mtk-resets.h
> >>> new file mode 100644
> >>> index 0000000..d73a4ba
> >>> --- /dev/null
> >>> +++ b/include/dt-bindings/reset-controller/mtk-resets.h
> >>> @@ -0,0 +1,13 @@
> >>> +/* SPDX-License-Identifier: GPL-2.0 */
> >>> +/*
> >>> + * Copyright (C) 2020 Mediatek Inc.
> >>> + *
> >>> + */
> >>> +
> >>> +#ifndef _DT_BINDINGS_RESET_CONTROLLER_MTK
> >>> +#define _DT_BINDINGS_RESET_CONTROLLER_MTK
> >>> +
> >>> +#define MT2712_TOPRGU_SW_RST_NUM	11
> >>> +#define MT8183_TOPRGU_SW_RST_NUM        19
> >>
> >> Maybe I didn't explain myself properly. We want to have all resets in one file
> >> and do not want to have the resets for the watchdog in a different file. That
> >> means I don't thin your patch is correct and the effort should be abandoned.
> >>
> >> Regards,
> >> Matthias
> > 
> > Do you mean to keep the current way unchanged? For example, with a new
> > SOC 8192, should add a new head file mt8192_resets.h for the resets
> > numbers.
> > 
> 
> Exactly.
> 
> Regards,
> Matthias

OK, but the dt-binding mtk-wdt.txt still need to update, please help me
to review, many thanks~

[v3,3/3] watchdog: mtk_wdt: merge all the reset numbers in one head file

[Crystal Guo]

mt8xxx-resets.h actually just used to define TOPRGU_SW_RST_NUM.
Instead of resubmit a new mt8xxx-reset.h for a new IC, merge all
the reset numbers in one head file.

Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
---
 drivers/watchdog/mtk_wdt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index d6a6393..5000a49 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -9,8 +9,7 @@
  * Based on sunxi_wdt.c
  */
 
-#include <dt-bindings/reset-controller/mt2712-resets.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
+#include <dt-bindings/reset-controller/mtk-resets.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/init.h>
-- 
1.8.1.1.dirty