Xilinx watchdog changes
v2 cover Xilinx watchdog changes
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 <[email protected]>
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(-)
--
1.8.2.3
PATCH v2 1/2 watchdog: xilinx: Fix driver header
- Remove reference for IP version
- Fix header coding style
- Remove notes which are visible from the code
- Fix driver license according to header
---
Changes in v2: None
drivers/watchdog/of_xilinx_wdt.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
drivers/watchdog/of_xilinx_wdt.c +10 -20
@@ -1,23 +1,13 @@/* -* of_xilinx_wdt.c 1.01 A Watchdog Device Driver for Xilinx xps_timebase_wdt -* -* (C) Copyright 2011 (Alejandro Cabrera <[email protected]>) -* -* ----------------------- -* -* 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 <[email protected]> -* - 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 <[email protected]>) +* +* 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 <[email protected]>" );MODULE_DESCRIPTION ("Xilinx Watchdog driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS_MISCDEV (WATCHDOG_MINOR );
--
1.8.2.3
Re: [PATCH v2 1/2] watchdog: xilinx: Fix driver header
Quoted 6 lines · Michal Simek
- Remove reference for IP version
- Fix header coding style
- Remove notes which are visible from the code
- Fix driver license according to headerSigned-off-by Michal Simek <[email protected]>
Quoted 53 lines
---
Changes in v2: Nonedrivers/watchdog/of_xilinx_wdt.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)drivers/watchdog/of_xilinx_wdt.c +10
-21@@ -1,23 +1,13 @@/* -* of_xilinx_wdt.c 1.01 A Watchdog Device Driver for Xilinx xps_timebase_wdt -* -* (C) Copyright 2011 (Alejandro Cabrera <[email protected]>) -* -* ----------------------- -* -* 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 <[email protected]> -* - 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 <[email protected]>) +* +* 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 <[email protected]>" );MODULE_DESCRIPTION ("Xilinx Watchdog driver" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS_MISCDEV (WATCHDOG_MINOR ); --1.8.2.3
PATCH v2 2/2 watchdog: xilinx: Setup the origin compatible string
In reply to Michal SimekWatchdog 1.01.a is also compatible with 1.00.a.
Add the origin version to compatible list.
---
Changes in v2:
- Extend compatible list with 1.00.a instead of replacing 1.01.a reported by Guenter Roeck <[email protected]>
drivers/watchdog/of_xilinx_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/of_xilinx_wdt.c +1 -0
@@ -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
Re: [PATCH v2 2/2] watchdog: xilinx: Setup the origin compatible string
Quoted 4 lines · Michal Simek
Watchdog 1.01.a is also compatible with 1.00.a.
Add the origin version to compatible list.Signed-off-by Michal Simek <[email protected]>
Quoted 23 lines
---
Changes in v2:
- Extend compatible list with 1.00.a instead of replacing 1.01.a reported by Guenter Roeck <[email protected]>drivers/watchdog/of_xilinx_wdt.c | 1 + 1 file changed, 1 insertion(+)drivers/watchdog/of_xilinx_wdt.c +1
-1@@ -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
Hi Wim
Quoted 13 lines · Michal Simek
The patchset fixes license header and add 1.00.a IP to compatible list.
Thanks for your review,
MichalRemove 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 <[email protected]>
Quoted 6 lines
Michal Simek (2):
watchdog: xilinx: Fix driver header
watchdog: xilinx: Setup the origin compatible stringdrivers/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
Signature · 5 lines
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
Quoted 16 lines · Michal Simek
Hi Wim
Quoted 13 lines · Michal Simek
The patchset fixes license header and add 1.00.a IP to compatible list.
Thanks for your review,
MichalRemove 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 <[email protected]>
Quoted 8 lines
Quoted 6 lines
Michal Simek (2):
watchdog: xilinx: Fix driver header
watchdog: xilinx: Setup the origin compatible stringdrivers/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
Signature · 5 lines
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
Hi Michal,
Quoted 13 lines
The patchset fixes license header and add 1.00.a IP to compatible list.
Thanks for your review,
MichalRemove 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 <[email protected]>
Quoted 6 lines
Michal Simek (2):
watchdog: xilinx: Fix driver header
watchdog: xilinx: Setup the origin compatible stringdrivers/watchdog/of_xilinx_wdt.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)
Both patches added to linux-watchdog-next.
Kind regards,
Wim.