linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
       [not found] <1383680783-12114-7-git-send-email-ivan.khoronzhuk@ti.com>
@ 2013-11-06 11:32 ` ivan.khoronzhuk
  2013-11-12 15:40   ` Santosh Shilimkar
                     ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: ivan.khoronzhuk @ 2013-11-06 11:32 UTC (permalink / raw)
  To: Santosh Shilimkar, wim, nsekhar, linux-watchdog, devicetree
  Cc: grant.likely, rob.herring, pawel.moll, mark.rutland, swarren,
	galak, ijc+devicetree, linux-kernel, linux-arm-kernel

The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
compatible and correct identity.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
 .../devicetree/bindings/watchdog/davinci-wdt.txt   |   11 +++++++++--
 drivers/watchdog/Kconfig                           |    4 ++--
 drivers/watchdog/davinci_wdt.c                     |    3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index 1668b6e..fddced9 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -1,13 +1,20 @@
-DaVinci Watchdog Timer (WDT) Controller
+Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
 
 Required properties:
-- compatible : Should be "ti,davinci-wdt"
+
+- compatible:		"ti,davinci-wdt"
+			"ti,keystone-wdt"
+
 - reg : Should contain WDT registers location and length
 
 Optional properties:
 
 - timeout-sec:		Contains the watchdog timeout in seconds
 
+Documentation:
+Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
+
 Examples:
 
 wdt: wdt@2320000 {
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 2c954b5..a4fe130 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -270,11 +270,11 @@ config IOP_WATCHDOG
 
 config DAVINCI_WATCHDOG
 	tristate "DaVinci watchdog"
-	depends on ARCH_DAVINCI
+	depends on ARCH_DAVINCI || ARCH_KEYSTONE
 	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer
-	  in the DaVinci DM644x/DM646x processors.
+	  in the DaVinci DM644x/DM646x or Keystone processors.
 	  To compile this driver as a module, choose M here: the
 	  module will be called davinci_wdt.
 
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index a371b2d..e51fd2e 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -158,7 +158,7 @@ static unsigned int davinci_wdt_status(struct watchdog_device *wdd)
 
 static const struct watchdog_info davinci_wdt_info = {
 	.options = WDIOF_KEEPALIVEPING,
-	.identity = "DaVinci Watchdog",
+	.identity = "DaVinci/Keystone Watchdog",
 };
 
 static const struct watchdog_ops davinci_wdt_ops = {
@@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
 
 static const struct of_device_id davinci_wdt_of_match[] = {
 	{ .compatible = "ti,davinci-wdt", },
+	{ .compatible = "ti,keystone-wdt", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
  2013-11-06 11:32 ` Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch ivan.khoronzhuk
@ 2013-11-12 15:40   ` Santosh Shilimkar
  2013-11-17  2:27   ` Guenter Roeck
  2013-11-23 18:02   ` Arnd Bergmann
  2 siblings, 0 replies; 6+ messages in thread
From: Santosh Shilimkar @ 2013-11-12 15:40 UTC (permalink / raw)
  To: ivan.khoronzhuk
  Cc: wim, nsekhar, linux-watchdog, devicetree, grant.likely,
	rob.herring, pawel.moll, mark.rutland, swarren, galak,
	ijc+devicetree, linux-kernel, linux-arm-kernel

On Wednesday 06 November 2013 06:32 AM, ivan.khoronzhuk wrote:
> The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
> compatible and correct identity.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> ---
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
  2013-11-06 11:32 ` Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch ivan.khoronzhuk
  2013-11-12 15:40   ` Santosh Shilimkar
@ 2013-11-17  2:27   ` Guenter Roeck
  2013-11-18 15:03     ` ivan.khoronzhuk
  2013-11-23 18:02   ` Arnd Bergmann
  2 siblings, 1 reply; 6+ messages in thread
From: Guenter Roeck @ 2013-11-17  2:27 UTC (permalink / raw)
  To: ivan.khoronzhuk, Santosh Shilimkar, wim, nsekhar, linux-watchdog,
	devicetree
  Cc: grant.likely, rob.herring, pawel.moll, mark.rutland, swarren,
	galak, ijc+devicetree, linux-kernel, linux-arm-kernel

On 11/06/2013 03:32 AM, ivan.khoronzhuk wrote:
> The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
> compatible and correct identity.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> ---
>   .../devicetree/bindings/watchdog/davinci-wdt.txt   |   11 +++++++++--
>   drivers/watchdog/Kconfig                           |    4 ++--
>   drivers/watchdog/davinci_wdt.c                     |    3 ++-
>   3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> index 1668b6e..fddced9 100644
> --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> @@ -1,13 +1,20 @@
> -DaVinci Watchdog Timer (WDT) Controller
> +Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
>
>   Required properties:
> -- compatible : Should be "ti,davinci-wdt"
> +
> +- compatible:		"ti,davinci-wdt"
> +			"ti,keystone-wdt"
> +
>   - reg : Should contain WDT registers location and length
>
Please use consistent formatting. If you change it, at least change it to be consistent.


>   Optional properties:
>
>   - timeout-sec:		Contains the watchdog timeout in seconds
>
> +Documentation:
> +Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
> +Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
> +
>   Examples:
>
>   wdt: wdt@2320000 {
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 2c954b5..a4fe130 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -270,11 +270,11 @@ config IOP_WATCHDOG
>
>   config DAVINCI_WATCHDOG
>   	tristate "DaVinci watchdog"
> -	depends on ARCH_DAVINCI
> +	depends on ARCH_DAVINCI || ARCH_KEYSTONE
>   	select WATCHDOG_CORE
>   	help
>   	  Say Y here if to include support for the watchdog timer
> -	  in the DaVinci DM644x/DM646x processors.
> +	  in the DaVinci DM644x/DM646x or Keystone processors.
>   	  To compile this driver as a module, choose M here: the
>   	  module will be called davinci_wdt.
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index a371b2d..e51fd2e 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -158,7 +158,7 @@ static unsigned int davinci_wdt_status(struct watchdog_device *wdd)
>
>   static const struct watchdog_info davinci_wdt_info = {
>   	.options = WDIOF_KEEPALIVEPING,
> -	.identity = "DaVinci Watchdog",
> +	.identity = "DaVinci/Keystone Watchdog",
>   };
>
>   static const struct watchdog_ops davinci_wdt_ops = {
> @@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
>
>   static const struct of_device_id davinci_wdt_of_match[] = {
>   	{ .compatible = "ti,davinci-wdt", },
> +	{ .compatible = "ti,keystone-wdt", },
>   	{},
>   };
>   MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
>


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
  2013-11-17  2:27   ` Guenter Roeck
@ 2013-11-18 15:03     ` ivan.khoronzhuk
  0 siblings, 0 replies; 6+ messages in thread
From: ivan.khoronzhuk @ 2013-11-18 15:03 UTC (permalink / raw)
  To: Guenter Roeck, Santosh Shilimkar, wim, nsekhar, linux-watchdog,
	devicetree
  Cc: grant.likely, rob.herring, pawel.moll, mark.rutland, swarren,
	galak, ijc+devicetree, linux-kernel, linux-arm-kernel

On 11/17/2013 04:27 AM, Guenter Roeck wrote:
> On 11/06/2013 03:32 AM, ivan.khoronzhuk wrote:
>> The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
>> compatible and correct identity.
>>
>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>> ---
>>   .../devicetree/bindings/watchdog/davinci-wdt.txt   |   11 +++++++++--
>>   drivers/watchdog/Kconfig                           |    4 ++--
>>   drivers/watchdog/davinci_wdt.c                     |    3 ++-
>>   3 files changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git
>> a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
>> b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
>> index 1668b6e..fddced9 100644
>> --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
>> +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
>> @@ -1,13 +1,20 @@
>> -DaVinci Watchdog Timer (WDT) Controller
>> +Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
>>
>>   Required properties:
>> -- compatible : Should be "ti,davinci-wdt"
>> +
>> +- compatible:        "ti,davinci-wdt"
>> +            "ti,keystone-wdt"
>> +
>>   - reg : Should contain WDT registers location and length
>>
> Please use consistent formatting. If you change it, at least change it
> to be consistent.
>

Thanks, I will

>>   Optional properties:
>>
>>   - timeout-sec:        Contains the watchdog timeout in seconds
>>
>> +Documentation:
>> +Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
>> +Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
>> +
>>   Examples:
>>
>>   wdt: wdt@2320000 {
>> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
>> index 2c954b5..a4fe130 100644
>> --- a/drivers/watchdog/Kconfig
>> +++ b/drivers/watchdog/Kconfig
>> @@ -270,11 +270,11 @@ config IOP_WATCHDOG
>>
>>   config DAVINCI_WATCHDOG
>>       tristate "DaVinci watchdog"
>> -    depends on ARCH_DAVINCI
>> +    depends on ARCH_DAVINCI || ARCH_KEYSTONE
>>       select WATCHDOG_CORE
>>       help
>>         Say Y here if to include support for the watchdog timer
>> -      in the DaVinci DM644x/DM646x processors.
>> +      in the DaVinci DM644x/DM646x or Keystone processors.
>>         To compile this driver as a module, choose M here: the
>>         module will be called davinci_wdt.
>>
>> diff --git a/drivers/watchdog/davinci_wdt.c
>> b/drivers/watchdog/davinci_wdt.c
>> index a371b2d..e51fd2e 100644
>> --- a/drivers/watchdog/davinci_wdt.c
>> +++ b/drivers/watchdog/davinci_wdt.c
>> @@ -158,7 +158,7 @@ static unsigned int davinci_wdt_status(struct
>> watchdog_device *wdd)
>>
>>   static const struct watchdog_info davinci_wdt_info = {
>>       .options = WDIOF_KEEPALIVEPING,
>> -    .identity = "DaVinci Watchdog",
>> +    .identity = "DaVinci/Keystone Watchdog",
>>   };
>>
>>   static const struct watchdog_ops davinci_wdt_ops = {
>> @@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct
>> platform_device *pdev)
>>
>>   static const struct of_device_id davinci_wdt_of_match[] = {
>>       { .compatible = "ti,davinci-wdt", },
>> +    { .compatible = "ti,keystone-wdt", },
>>       {},
>>   };
>>   MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
>>
>


-- 
Regards,
Ivan Khoronzhuk

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
  2013-11-06 11:32 ` Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch ivan.khoronzhuk
  2013-11-12 15:40   ` Santosh Shilimkar
  2013-11-17  2:27   ` Guenter Roeck
@ 2013-11-23 18:02   ` Arnd Bergmann
  2013-11-25 11:09     ` ivan.khoronzhuk
  2 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2013-11-23 18:02 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: ivan.khoronzhuk, Santosh Shilimkar, wim, nsekhar, linux-watchdog,
	devicetree, mark.rutland, pawel.moll, swarren, ijc+devicetree,
	galak, rob.herring, linux-kernel, grant.likely

On Wednesday 06 November 2013, ivan.khoronzhuk wrote:

> @@ -1,13 +1,20 @@
> -DaVinci Watchdog Timer (WDT) Controller
> +Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
>  
>  Required properties:
> -- compatible : Should be "ti,davinci-wdt"
> +
> +- compatible:          "ti,davinci-wdt"
> +                       "ti,keystone-wdt"
> +
>  - reg : Should contain WDT registers location and length
>  

...

> @@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
>  
>  static const struct of_device_id davinci_wdt_of_match[] = {
>         { .compatible = "ti,davinci-wdt", },
> +       { .compatible = "ti,keystone-wdt", },
>         {},
>  };
>  MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);

You should clarify the compatible list here: It seems that the devices are fully
compatible, so the driver should only need to check for "ti,davinci-wdt" as the
compatible string, while the dtb files should list both "ti,davinci-wdt" and
"ti,keystone-wdt" for keystone, but only the davinci string for davinci.

	Arnd

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
  2013-11-23 18:02   ` Arnd Bergmann
@ 2013-11-25 11:09     ` ivan.khoronzhuk
  0 siblings, 0 replies; 6+ messages in thread
From: ivan.khoronzhuk @ 2013-11-25 11:09 UTC (permalink / raw)
  To: Arnd Bergmann, linux-arm-kernel
  Cc: Santosh Shilimkar, wim, nsekhar, linux-watchdog, devicetree,
	mark.rutland, pawel.moll, swarren, ijc+devicetree, galak,
	rob.herring, linux-kernel, grant.likely

On 11/23/2013 08:02 PM, Arnd Bergmann wrote:
> On Wednesday 06 November 2013, ivan.khoronzhuk wrote:
> 
>> @@ -1,13 +1,20 @@
>> -DaVinci Watchdog Timer (WDT) Controller
>> +Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
>>   
>>   Required properties:
>> -- compatible : Should be "ti,davinci-wdt"
>> +
>> +- compatible:          "ti,davinci-wdt"
>> +                       "ti,keystone-wdt"
>> +
>>   - reg : Should contain WDT registers location and length
>>   
> 
> ...
> 
>> @@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
>>   
>>   static const struct of_device_id davinci_wdt_of_match[] = {
>>          { .compatible = "ti,davinci-wdt", },
>> +       { .compatible = "ti,keystone-wdt", },
>>          {},
>>   };
>>   MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
> 
> You should clarify the compatible list here: It seems that the devices are fully
> compatible, so the driver should only need to check for "ti,davinci-wdt" as the
> compatible string, while the dtb files should list both "ti,davinci-wdt" and
> "ti,keystone-wdt" for keystone, but only the davinci string for davinci.
> 
> 	Arnd
> 

Ok, I will remove "ti,keystone-wdt" compatible from driver and for the keystone WDT node
describe compatible as:

compatible = "ti,keystone-wdt", "ti,davinci-wdt";

-- 
Regards,
Ivan Khoronzhuk

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-25 11:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1383680783-12114-7-git-send-email-ivan.khoronzhuk@ti.com>
2013-11-06 11:32 ` Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch ivan.khoronzhuk
2013-11-12 15:40   ` Santosh Shilimkar
2013-11-17  2:27   ` Guenter Roeck
2013-11-18 15:03     ` ivan.khoronzhuk
2013-11-23 18:02   ` Arnd Bergmann
2013-11-25 11:09     ` ivan.khoronzhuk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).