* [PATCH v2 1/2] watchdog: xilinx: Fix driver header
2013-05-31 5:56 [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
@ 2013-05-31 5:56 ` Michal Simek
2013-06-01 15:29 ` Guenter Roeck
2013-05-31 5:56 ` [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string Michal Simek
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Michal Simek @ 2013-05-31 5:56 UTC (permalink / raw)
To: linux-kernel
Cc: Michal Simek, Michal Simek, Guenter Roeck, Wim Van Sebroeck,
linux-watchdog
[-- Attachment #1: Type: text/plain, Size: 2060 bytes --]
- Remove reference for IP version
- Fix header coding style
- Remove notes which are visible from the code
- Fix driver license according to header
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2: None
drivers/watchdog/of_xilinx_wdt.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 2761ddb..d4a35ab 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -1,23 +1,13 @@
/*
-* of_xilinx_wdt.c 1.01 A Watchdog Device Driver for Xilinx xps_timebase_wdt
-*
-* (C) Copyright 2011 (Alejandro Cabrera <aldaya@gmail.com>)
-*
-* -----------------------
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version
-* 2 of the License, or (at your option) any later version.
-*
-* -----------------------
-* 30-May-2011 Alejandro Cabrera <aldaya@gmail.com>
-* - If "xlnx,wdt-enable-once" wasn't found on device tree the
-* module will use CONFIG_WATCHDOG_NOWAYOUT
-* - If the device tree parameters ("clock-frequency" and
-* "xlnx,wdt-interval") wasn't found the driver won't
-* know the wdt reset interval
-*/
+ * Watchdog Device Driver for Xilinx axi/xps_timebase_wdt
+ *
+ * (C) Copyright 2011 (Alejandro Cabrera <aldaya@gmail.com>)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -413,5 +403,5 @@ module_platform_driver(xwdt_driver);
MODULE_AUTHOR("Alejandro Cabrera <aldaya@gmail.com>");
MODULE_DESCRIPTION("Xilinx Watchdog driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] watchdog: xilinx: Fix driver header
2013-05-31 5:56 ` [PATCH v2 1/2] watchdog: xilinx: Fix driver header Michal Simek
@ 2013-06-01 15:29 ` Guenter Roeck
0 siblings, 0 replies; 8+ messages in thread
From: Guenter Roeck @ 2013-06-01 15:29 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, Michal Simek, Wim Van Sebroeck, linux-watchdog
On Fri, May 31, 2013 at 07:56:33AM +0200, Michal Simek wrote:
> - Remove reference for IP version
> - Fix header coding style
> - Remove notes which are visible from the code
> - Fix driver license according to header
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Changes in v2: None
>
> drivers/watchdog/of_xilinx_wdt.c | 30 ++++++++++--------------------
> 1 file changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
> index 2761ddb..d4a35ab 100644
> --- a/drivers/watchdog/of_xilinx_wdt.c
> +++ b/drivers/watchdog/of_xilinx_wdt.c
> @@ -1,23 +1,13 @@
> /*
> -* of_xilinx_wdt.c 1.01 A Watchdog Device Driver for Xilinx xps_timebase_wdt
> -*
> -* (C) Copyright 2011 (Alejandro Cabrera <aldaya@gmail.com>)
> -*
> -* -----------------------
> -*
> -* This program is free software; you can redistribute it and/or
> -* modify it under the terms of the GNU General Public License
> -* as published by the Free Software Foundation; either version
> -* 2 of the License, or (at your option) any later version.
> -*
> -* -----------------------
> -* 30-May-2011 Alejandro Cabrera <aldaya@gmail.com>
> -* - If "xlnx,wdt-enable-once" wasn't found on device tree the
> -* module will use CONFIG_WATCHDOG_NOWAYOUT
> -* - If the device tree parameters ("clock-frequency" and
> -* "xlnx,wdt-interval") wasn't found the driver won't
> -* know the wdt reset interval
> -*/
> + * Watchdog Device Driver for Xilinx axi/xps_timebase_wdt
> + *
> + * (C) Copyright 2011 (Alejandro Cabrera <aldaya@gmail.com>)
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version
> + * 2 of the License, or (at your option) any later version.
> + */
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> @@ -413,5 +403,5 @@ module_platform_driver(xwdt_driver);
>
> MODULE_AUTHOR("Alejandro Cabrera <aldaya@gmail.com>");
> MODULE_DESCRIPTION("Xilinx Watchdog driver");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> --
> 1.8.2.3
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string
2013-05-31 5:56 [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
2013-05-31 5:56 ` [PATCH v2 1/2] watchdog: xilinx: Fix driver header Michal Simek
@ 2013-05-31 5:56 ` Michal Simek
2013-06-01 15:29 ` Guenter Roeck
2013-06-10 9:10 ` [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
2013-06-27 19:21 ` Wim Van Sebroeck
3 siblings, 1 reply; 8+ messages in thread
From: Michal Simek @ 2013-05-31 5:56 UTC (permalink / raw)
To: linux-kernel
Cc: Michal Simek, Michal Simek, Guenter Roeck, Wim Van Sebroeck,
linux-watchdog
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
Watchdog 1.01.a is also compatible with 1.00.a.
Add the origin version to compatible list.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Extend compatible list with 1.00.a instead of replacing 1.01.a
reported by Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/of_xilinx_wdt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index d4a35ab..4dd281f 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -384,6 +384,7 @@ static int xwdt_remove(struct platform_device *dev)
/* Match table for of_platform binding */
static struct of_device_id xwdt_of_match[] = {
+ { .compatible = "xlnx,xps-timebase-wdt-1.00.a", },
{ .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
{},
};
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string
2013-05-31 5:56 ` [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string Michal Simek
@ 2013-06-01 15:29 ` Guenter Roeck
0 siblings, 0 replies; 8+ messages in thread
From: Guenter Roeck @ 2013-06-01 15:29 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, Michal Simek, Wim Van Sebroeck, linux-watchdog
On Fri, May 31, 2013 at 07:56:34AM +0200, Michal Simek wrote:
> Watchdog 1.01.a is also compatible with 1.00.a.
> Add the origin version to compatible list.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Changes in v2:
> - Extend compatible list with 1.00.a instead of replacing 1.01.a
> reported by Guenter Roeck <linux@roeck-us.net>
>
> drivers/watchdog/of_xilinx_wdt.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
> index d4a35ab..4dd281f 100644
> --- a/drivers/watchdog/of_xilinx_wdt.c
> +++ b/drivers/watchdog/of_xilinx_wdt.c
> @@ -384,6 +384,7 @@ static int xwdt_remove(struct platform_device *dev)
>
> /* Match table for of_platform binding */
> static struct of_device_id xwdt_of_match[] = {
> + { .compatible = "xlnx,xps-timebase-wdt-1.00.a", },
> { .compatible = "xlnx,xps-timebase-wdt-1.01.a", },
> {},
> };
> --
> 1.8.2.3
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/2] Xilinx watchdog changes
2013-05-31 5:56 [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
2013-05-31 5:56 ` [PATCH v2 1/2] watchdog: xilinx: Fix driver header Michal Simek
2013-05-31 5:56 ` [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string Michal Simek
@ 2013-06-10 9:10 ` Michal Simek
2013-06-26 13:00 ` Michal Simek
2013-06-27 19:21 ` Wim Van Sebroeck
3 siblings, 1 reply; 8+ messages in thread
From: Michal Simek @ 2013-06-10 9:10 UTC (permalink / raw)
To: Michal Simek
Cc: linux-kernel, Guenter Roeck, linux-watchdog, Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]
Hi Wim
On 05/31/2013 07:56 AM, Michal Simek wrote:
> The patchset fixes license header and add 1.00.a IP to compatible
> list.
>
> Thanks for your review,
> Michal
>
> Remove the 3rd patch from this series which incorrectly
> tried to support set timeout feature.
>
> Changes in v2:
> - Extend compatible list with 1.00.a instead of replacing 1.01.a
> reported by Guenter Roeck <linux@roeck-us.net>
>
> Michal Simek (2):
> watchdog: xilinx: Fix driver header
> watchdog: xilinx: Setup the origin compatible string
>
> drivers/watchdog/of_xilinx_wdt.c | 31 +++++++++++--------------------
> 1 file changed, 11 insertions(+), 20 deletions(-)
Can you please add these two patches to your tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/2] Xilinx watchdog changes
2013-06-10 9:10 ` [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
@ 2013-06-26 13:00 ` Michal Simek
0 siblings, 0 replies; 8+ messages in thread
From: Michal Simek @ 2013-06-26 13:00 UTC (permalink / raw)
To: monstr
Cc: Michal Simek, linux-kernel, Guenter Roeck, linux-watchdog,
Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
On 06/10/2013 11:10 AM, Michal Simek wrote:
> Hi Wim
>
> On 05/31/2013 07:56 AM, Michal Simek wrote:
>> The patchset fixes license header and add 1.00.a IP to compatible
>> list.
>>
>> Thanks for your review,
>> Michal
>>
>> Remove the 3rd patch from this series which incorrectly
>> tried to support set timeout feature.
>>
>> Changes in v2:
>> - Extend compatible list with 1.00.a instead of replacing 1.01.a
>> reported by Guenter Roeck <linux@roeck-us.net>
>>
>> Michal Simek (2):
>> watchdog: xilinx: Fix driver header
>> watchdog: xilinx: Setup the origin compatible string
>>
>> drivers/watchdog/of_xilinx_wdt.c | 31 +++++++++++--------------------
>> 1 file changed, 11 insertions(+), 20 deletions(-)
>
> Can you please add these two patches to your tree?
Wim: I can't see these patches in linux-next that's why I expect
you haven't added them to your branch.
Can you please look at it?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/2] Xilinx watchdog changes
2013-05-31 5:56 [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
` (2 preceding siblings ...)
2013-06-10 9:10 ` [PATCH v2 0/2] Xilinx watchdog changes Michal Simek
@ 2013-06-27 19:21 ` Wim Van Sebroeck
3 siblings, 0 replies; 8+ messages in thread
From: Wim Van Sebroeck @ 2013-06-27 19:21 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, Michal Simek, Guenter Roeck, linux-watchdog
Hi Michal,
> The patchset fixes license header and add 1.00.a IP to compatible
> list.
>
> Thanks for your review,
> Michal
>
> Remove the 3rd patch from this series which incorrectly
> tried to support set timeout feature.
>
> Changes in v2:
> - Extend compatible list with 1.00.a instead of replacing 1.01.a
> reported by Guenter Roeck <linux@roeck-us.net>
>
> Michal Simek (2):
> watchdog: xilinx: Fix driver header
> watchdog: xilinx: Setup the origin compatible string
>
> drivers/watchdog/of_xilinx_wdt.c | 31 +++++++++++--------------------
> 1 file changed, 11 insertions(+), 20 deletions(-)
Both patches added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 8+ messages in thread