1. Patchew
  2. linux
  3. [PATCH v1 0/2] Add StarFive JH8100 watchdog
  4. View patch

[PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string

Ji Sheng Teoh posted 2 patches 2 years ago
There is a newer version of this series
[PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Ji Sheng Teoh 2 years ago 
Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog.
JH8100 watchdog reuses JH7110 register mapping.

Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
---
 drivers/watchdog/starfive-wdt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index 5f501b41faf9..31785bb373d5 100644
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -581,6 +581,7 @@ static const struct dev_pm_ops starfive_wdt_pm_ops = {
 static const struct of_device_id starfive_wdt_match[] = {
 	{ .compatible = "starfive,jh7100-wdt", .data = &starfive_wdt_jh7100_variant },
 	{ .compatible = "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant },
+	{ .compatible = "starfive,jh8100-wdt", .data = &starfive_wdt_jh7110_variant },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, starfive_wdt_match);
-- 
2.25.1
Re: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Krzysztof Kozlowski 2 years ago 
On 09/12/2023 15:27, Ji Sheng Teoh wrote:
> Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog.
> JH8100 watchdog reuses JH7110 register mapping.
> 
> Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
> Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> ---
>  drivers/watchdog/starfive-wdt.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
> index 5f501b41faf9..31785bb373d5 100644
> --- a/drivers/watchdog/starfive-wdt.c
> +++ b/drivers/watchdog/starfive-wdt.c
> @@ -581,6 +581,7 @@ static const struct dev_pm_ops starfive_wdt_pm_ops = {
>  static const struct of_device_id starfive_wdt_match[] = {
>  	{ .compatible = "starfive,jh7100-wdt", .data = &starfive_wdt_jh7100_variant },
>  	{ .compatible = "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant },
> +	{ .compatible = "starfive,jh8100-wdt", .data = &starfive_wdt_jh7110_variant },

Device is compatible, so why not expressing it in the bindings and
dropping this change?

Best regards,
Krzysztof
Re: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Ji Sheng Teoh 2 years ago 
On Mon, 11 Dec 2023 11:06:42 +0100
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:

> On 09/12/2023 15:27, Ji Sheng Teoh wrote:
> > Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog.
> > JH8100 watchdog reuses JH7110 register mapping.
> > 
> > Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
> > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> > ---
> >  drivers/watchdog/starfive-wdt.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/watchdog/starfive-wdt.c
> > b/drivers/watchdog/starfive-wdt.c index 5f501b41faf9..31785bb373d5
> > 100644 --- a/drivers/watchdog/starfive-wdt.c
> > +++ b/drivers/watchdog/starfive-wdt.c
> > @@ -581,6 +581,7 @@ static const struct dev_pm_ops
> > starfive_wdt_pm_ops = { static const struct of_device_id
> > starfive_wdt_match[] = { { .compatible = "starfive,jh7100-wdt",
> > .data = &starfive_wdt_jh7100_variant }, { .compatible =
> > "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant },
> > +	{ .compatible = "starfive,jh8100-wdt", .data =
> > &starfive_wdt_jh7110_variant },  
> 
> Device is compatible, so why not expressing it in the bindings and
> dropping this change?
> 
> Best regards,
> Krzysztof
> 

Ok, will drop this change.

Thanks,
Ji Sheng
Re: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Xingyu Wu 2 years ago 
On 2023/12/12 0:47, Ji Sheng Teoh wrote:
> On Mon, 11 Dec 2023 11:06:42 +0100
> Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> 
>> On 09/12/2023 15:27, Ji Sheng Teoh wrote:
>> > Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog.
>> > JH8100 watchdog reuses JH7110 register mapping.
>> > 
>> > Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
>> > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
>> > ---
>> >  drivers/watchdog/starfive-wdt.c | 1 +
>> >  1 file changed, 1 insertion(+)
>> > 
>> > diff --git a/drivers/watchdog/starfive-wdt.c
>> > b/drivers/watchdog/starfive-wdt.c index 5f501b41faf9..31785bb373d5
>> > 100644 --- a/drivers/watchdog/starfive-wdt.c
>> > +++ b/drivers/watchdog/starfive-wdt.c
>> > @@ -581,6 +581,7 @@ static const struct dev_pm_ops
>> > starfive_wdt_pm_ops = { static const struct of_device_id
>> > starfive_wdt_match[] = { { .compatible = "starfive,jh7100-wdt",
>> > .data = &starfive_wdt_jh7100_variant }, { .compatible =
>> > "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant },
>> > +	{ .compatible = "starfive,jh8100-wdt", .data =
>> > &starfive_wdt_jh7110_variant },  
>> 
>> Device is compatible, so why not expressing it in the bindings and
>> dropping this change?
>> 
>> Best regards,
>> Krzysztof
>> 
> 
> Ok, will drop this change.
> 
> Thanks,
> Ji Sheng

Hi Ji Sheng,

You can add the compatible "starfive,jh8100-wdt" in the bindings and add this:

	compatible = "starfive,jh8100-wdt", "starfive,jh7110-wdt";

in the dts. I think it would be better and does not change the driver.

Best regards,
Xingyu Wu
Re: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Ji Sheng Teoh 2 years ago 
On Tue, 12 Dec 2023 11:01:21 +0800
Xingyu Wu <xingyu.wu@starfivetech.com> wrote:

> On 2023/12/12 0:47, Ji Sheng Teoh wrote:
> > On Mon, 11 Dec 2023 11:06:42 +0100
> > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> >   
> >> On 09/12/2023 15:27, Ji Sheng Teoh wrote:  
> >> > Add "starfive,jh8100-wdt" compatible for StarFive's JH8100
> >> > watchdog. JH8100 watchdog reuses JH7110 register mapping.
> >> > 
> >> > Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
> >> > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> >> > ---
> >> >  drivers/watchdog/starfive-wdt.c | 1 +
> >> >  1 file changed, 1 insertion(+)
> >> > 
> >> > diff --git a/drivers/watchdog/starfive-wdt.c
> >> > b/drivers/watchdog/starfive-wdt.c index
> >> > 5f501b41faf9..31785bb373d5 100644 ---
> >> > a/drivers/watchdog/starfive-wdt.c +++
> >> > b/drivers/watchdog/starfive-wdt.c @@ -581,6 +581,7 @@ static
> >> > const struct dev_pm_ops starfive_wdt_pm_ops = { static const
> >> > struct of_device_id starfive_wdt_match[] = { { .compatible =
> >> > "starfive,jh7100-wdt", .data = &starfive_wdt_jh7100_variant }, {
> >> > .compatible = "starfive,jh7110-wdt", .data =
> >> > &starfive_wdt_jh7110_variant },
> >> > +	{ .compatible = "starfive,jh8100-wdt", .data =
> >> > &starfive_wdt_jh7110_variant },    
> >> 
> >> Device is compatible, so why not expressing it in the bindings and
> >> dropping this change?
> >> 
> >> Best regards,
> >> Krzysztof
> >>   
> > 
> > Ok, will drop this change.
> > 
> > Thanks,
> > Ji Sheng  
> 
> Hi Ji Sheng,
> 
> You can add the compatible "starfive,jh8100-wdt" in the bindings and
> add this:
> 
> 	compatible = "starfive,jh8100-wdt", "starfive,jh7110-wdt";
> 
> in the dts. I think it would be better and does not change the driver.
> 
> Best regards,
> Xingyu Wu

Thanks for the suggestion, will go with this approach.
I have respin a v2 for this, as it only requires small changes.
v2: https://lore.kernel.org/all/20231212031731.2498584-2-jisheng.teoh@starfivetech.com/
Re: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string
Posted by Guenter Roeck 2 years ago 
On 12/9/23 06:27, Ji Sheng Teoh wrote:
> Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog.
> JH8100 watchdog reuses JH7110 register mapping.
> 
> Signed-off-by: Ley Foon Tan <leyfoon.tan@starfivetech.com>
> Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>

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

> ---
>   drivers/watchdog/starfive-wdt.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
> index 5f501b41faf9..31785bb373d5 100644
> --- a/drivers/watchdog/starfive-wdt.c
> +++ b/drivers/watchdog/starfive-wdt.c
> @@ -581,6 +581,7 @@ static const struct dev_pm_ops starfive_wdt_pm_ops = {
>   static const struct of_device_id starfive_wdt_match[] = {
>   	{ .compatible = "starfive,jh7100-wdt", .data = &starfive_wdt_jh7100_variant },
>   	{ .compatible = "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant },
> +	{ .compatible = "starfive,jh8100-wdt", .data = &starfive_wdt_jh7110_variant },
>   	{ /* sentinel */ }
>   };
>   MODULE_DEVICE_TABLE(of, starfive_wdt_match);

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.