Skip to contentSkip to conversation

watchdog updates for Linux 3.13

GIT PULL Guenter Roeck 3 participants 7 messages Oct 23, 2013 – Oct 29, 2013 Watchdog device drivers

lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

------

The following changes since commit 31d141e3a666269a3b6fcccddb0351caf7454240:

Linux 3.12-rc6 (2013-10-19 12:28:15 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git tags/watchdog-for-wim

for you to fetch changes up to 1f445d7f50f7609ac1f3c6ccd2552a58c7493e54:

watchdog: dw: Enable OF support for DW watchdog timer (2013-10-22 10:09:37 -0700)

----------------------------------------------------------------
w83627hf:
Convert to watchdog infrastructure, add support for W83697HF and W83697UG, and various other improvements.

Remove explicit drivers for W83697HF and W83697UG

New drivers:
MOXA ART watchdog driver
MIPS ralink watchdog driver
CSR SiRFprimaII and SiRFatlasVI

Various improvements and cleanup in several drivers

v2:
- Fixed spelling error in one of the drivers
- Added 'watchdog: Get rid of MODULE_ALIAS_MISCDEV statements' patch
- Updated version of ' watchdog: dw: Enable OF support for DW watchdog timer'

----------------------------------------------------------------
Boris BREZILLON (4):
watchdog: at91sam9_wdt: better watchdog support
watchdog: at91sam9_wdt: update device tree doc
ARM: at91/dt: add sam9 watchdog default options to SoCs
ARM: at91/dt: add watchdog properties to kizbox board

Dan Carpenter (1):
watchdog: ts72xx_wdt: cleanup return codes in ioctl

Dinh Nguyen (1):
watchdog: dw: Enable OF support for DW watchdog timer

Guenter Roeck (10):
watchdog: w83627hf: Convert to watchdog infrastructure
watchdog: w83627hf: Enable watchdog only once
watchdog: w83627hf: Enable watchdog device only if not already enabled
watchdog: w83627hf: Use helper functions to access superio registers
watchdog: w83627hf: Auto-detect IO address and supported chips
watchdog: w83627hf: Add support for W83697HF and W83697UG
watchdog: Remove drivers for W83697HF and W83697UG
watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
watchdog: pcwd_usb: Use allocated buffer for usb_control_msg
watchdog: ts72xx_wdt: Propagate return value from timeout_to_regval

Heiko Stübner (2):
watchdog: dw_wdt: convert to SIMPLE_DEV_PM_OPS
watchdog: dw_wdt: use clk_prepare_enable and clk_disable_unprepare

Jean Delvare (1):
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements

Jingoo Han (3):
watchdog: kempld_wdt: Add __user annotation
watchdog: dw_wdt: Add __user annotation
watchdog: use dev_get_platdata()

John Crispin (2):
watchdog: MIPS: add ralink watchdog driver
DT: Add documentation for rt2880-wdt

Jonas Jensen (1):
watchdog: Add MOXA ART watchdog driver

Michal Simek (1):
watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()

Niels de Vos (1):
watchdog: imx2_wdt: expose module alias for loading from device-tree

Sachin Kamat (3):
watchdog: at91rm9200: Remove redundant of_match_ptr
watchdog: orion: Remove redundant of_match_ptr
watchdog: sunxi: Remove redundant of_match_ptr

Xianglong Du (1):
watchdog: sirf: add watchdog driver of CSR SiRFprimaII and SiRFatlasVI

[email protected] (1):
documentation/devicetree: Move DT bindings from gpio to watchdog

 .../devicetree/bindings/watchdog/atmel-wdt.txt     |   30 +-
 .../devicetree/bindings/watchdog/dw_wdt.txt        |   21 +
 .../bindings/{gpio => watchdog}/men-a021-wdt.txt   |   12 +-
 .../bindings/watchdog/moxa,moxart-watchdog.txt     |   15 +
 .../devicetree/bindings/watchdog/rt2880-wdt.txt    |   19 +
 .../devicetree/bindings/watchdog/sirfsoc_wdt.txt   |   14 +
 arch/arm/boot/dts/at91sam9260.dtsi                 |    5 +
 arch/arm/boot/dts/at91sam9263.dtsi                 |    5 +
 arch/arm/boot/dts/at91sam9g45.dtsi                 |    5 +
 arch/arm/boot/dts/at91sam9n12.dtsi                 |    5 +
 arch/arm/boot/dts/at91sam9x5.dtsi                  |    5 +
 arch/arm/boot/dts/kizbox.dts                       |    6 +
 arch/arm/boot/dts/sama5d3.dtsi                     |    5 +
 arch/arm/configs/prima2_defconfig                  |    1 +
 drivers/watchdog/Kconfig                           |   74 +--
 drivers/watchdog/Makefile                          |    5 +-
 drivers/watchdog/acquirewdt.c                      |    4 +-
 drivers/watchdog/advantechwdt.c                    |    1 -
 drivers/watchdog/alim1535_wdt.c                    |    1 -
 drivers/watchdog/alim7101_wdt.c                    |    1 -
 drivers/watchdog/ar7_wdt.c                         |    1 -
 drivers/watchdog/at32ap700x_wdt.c                  |    1 -
 drivers/watchdog/at91rm9200_wdt.c                  |    3 +-
 drivers/watchdog/at91sam9_wdt.c                    |  309 +++++++----
 drivers/watchdog/ath79_wdt.c                       |    1 -
 drivers/watchdog/bcm2835_wdt.c                     |    1 -
 drivers/watchdog/bcm63xx_wdt.c                     |    1 -
 drivers/watchdog/bfin_wdt.c                        |    1 -
 drivers/watchdog/cpu5wdt.c                         |    1 -
 drivers/watchdog/davinci_wdt.c                     |    1 -
 drivers/watchdog/dw_wdt.c                          |   34 +-
 drivers/watchdog/ep93xx_wdt.c                      |    1 -
 drivers/watchdog/eurotechwdt.c                     |    1 -
 drivers/watchdog/gef_wdt.c                         |    1 -
 drivers/watchdog/geodewdt.c                        |    1 -
 drivers/watchdog/hpwdt.c                           |    1 -
 drivers/watchdog/i6300esb.c                        |    1 -
 drivers/watchdog/iTCO_wdt.c                        |    5 +-
 drivers/watchdog/ib700wdt.c                        |    1 -
 drivers/watchdog/ibmasr.c                          |    1 -
 drivers/watchdog/ie6xx_wdt.c                       |    1 -
 drivers/watchdog/imx2_wdt.c                        |    2 +-
 drivers/watchdog/indydog.c                         |    1 -
 drivers/watchdog/intel_scu_watchdog.c              |    1 -
 drivers/watchdog/iop_wdt.c                         |    1 -
 drivers/watchdog/it8712f_wdt.c                     |    1 -
 drivers/watchdog/it87_wdt.c                        |    1 -
 drivers/watchdog/ixp4xx_wdt.c                      |    2 -
 drivers/watchdog/jz4740_wdt.c                      |    1 -
 drivers/watchdog/kempld_wdt.c                      |    5 +-
 drivers/watchdog/ks8695_wdt.c                      |    1 -
 drivers/watchdog/lantiq_wdt.c                      |    1 -
 drivers/watchdog/m54xx_wdt.c                       |    1 -
 drivers/watchdog/machzwd.c                         |    1 -
 drivers/watchdog/max63xx_wdt.c                     |    1 -
 drivers/watchdog/mixcomwd.c                        |    1 -
 drivers/watchdog/moxart_wdt.c                      |  165 ++++++
 drivers/watchdog/mpc8xxx_wdt.c                     |    1 -
 drivers/watchdog/mtx-1_wdt.c                       |    1 -
 drivers/watchdog/mv64x60_wdt.c                     |    3 +-
 drivers/watchdog/nuc900_wdt.c                      |    1 -
 drivers/watchdog/nv_tco.c                          |    1 -
 drivers/watchdog/of_xilinx_wdt.c                   |    1 -
 drivers/watchdog/omap_wdt.c                        |    2 +-
 drivers/watchdog/orion_wdt.c                       |    3 +-
 drivers/watchdog/pc87413_wdt.c                     |    2 -
 drivers/watchdog/pcwd.c                            |    4 +-
 drivers/watchdog/pcwd_pci.c                        |    4 +-
 drivers/watchdog/pcwd_usb.c                        |   12 +-
 drivers/watchdog/pika_wdt.c                        |    2 -
 drivers/watchdog/pnx4008_wdt.c                     |    1 -
 drivers/watchdog/pnx833x_wdt.c                     |    1 -
 drivers/watchdog/rc32434_wdt.c                     |    4 +-
 drivers/watchdog/rdc321x_wdt.c                     |    3 +-
 drivers/watchdog/rt2880_wdt.c                      |  206 ++++++++
 drivers/watchdog/s3c2410_wdt.c                     |    2 -
 drivers/watchdog/sa1100_wdt.c                      |    1 -
 drivers/watchdog/sb_wdog.c                         |    1 -
 drivers/watchdog/sbc60xxwdt.c                      |    1 -
 drivers/watchdog/sbc7240_wdt.c                     |    2 -
 drivers/watchdog/sbc8360.c                         |    1 -
 drivers/watchdog/sbc_epx_c3.c                      |    1 -
 drivers/watchdog/sbc_fitpc2_wdt.c                  |    2 -
 drivers/watchdog/sc1200wdt.c                       |    1 -
 drivers/watchdog/sc520_wdt.c                       |    1 -
 drivers/watchdog/sch311x_wdt.c                     |    5 +-
 drivers/watchdog/scx200_wdt.c                      |    1 -
 drivers/watchdog/shwdt.c                           |    1 -
 drivers/watchdog/sirfsoc_wdt.c                     |  224 ++++++++
 drivers/watchdog/smsc37b787_wdt.c                  |    2 -
 drivers/watchdog/softdog.c                         |    1 -
 drivers/watchdog/sp5100_tco.c                      |    1 -
 drivers/watchdog/sp805_wdt.c                       |    1 -
 drivers/watchdog/stmp3xxx_rtc_wdt.c                |    5 +-
 drivers/watchdog/sunxi_wdt.c                       |    2 +-
 drivers/watchdog/ts72xx_wdt.c                      |   38 +-
 drivers/watchdog/txx9wdt.c                         |    1 -
 drivers/watchdog/ux500_wdt.c                       |    3 +-
 drivers/watchdog/w83627hf_wdt.c                    |  540 +++++++++++---------
 drivers/watchdog/w83697hf_wdt.c                    |  461 -----------------
 drivers/watchdog/w83697ug_wdt.c                    |  398 ---------------
 drivers/watchdog/w83877f_wdt.c                     |    1 -
 drivers/watchdog/w83977f_wdt.c                     |    1 -
 drivers/watchdog/wafer5823wdt.c                    |    1 -
 drivers/watchdog/wdrtas.c                          |    2 -
 drivers/watchdog/wdt.c                             |    2 -
 drivers/watchdog/wdt285.c                          |    1 -
 drivers/watchdog/wdt977.c                          |    1 -
 drivers/watchdog/wdt_pci.c                         |    2 -
 drivers/watchdog/wm831x_wdt.c                      |    8 +-
 drivers/watchdog/xen_wdt.c                         |    1 -
 111 files changed, 1372 insertions(+), 1385 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/dw_wdt.txt
 rename Documentation/devicetree/bindings/{gpio => watchdog}/men-a021-wdt.txt (61%)
 create mode 100644 Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
 create mode 100644 drivers/watchdog/moxart_wdt.c
 create mode 100644 drivers/watchdog/rt2880_wdt.c
 create mode 100644 drivers/watchdog/sirfsoc_wdt.c
 delete mode 100644 drivers/watchdog/w83697hf_wdt.c
 delete mode 100644 drivers/watchdog/w83697ug_wdt.c
#1 lore raw
Quoted 26 lines · Guenter Roeck

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

Quoted 7 lines

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

------

Hi Gunther,

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

But somehow I can't find his mail in the list archives. Maybe he accidently sent it to me directly (and of cause I've already deleted it :-(, sorry ).

Should I re-send the move-patch, which was acked by Stephen? Or do you still have it in an inbox?

Thanks a lot,
Johannes

author maintainer
#2 lore raw
Quoted 33 lines · Johannes Thumshirn
Quoted 32 lines · Guenter Roeck

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

Quoted 9 lines
Quoted 1 line

------

Hi Gunther,

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

I ended up reverting your patch on top of my tree. Wim can either do the same if/when he decides to pull the patches, or simply drop the patch before sending his next pull request to Linus.

Thanks,
Guenter

author maintainer
#3 lore raw
In reply to Johannes Thumshirn
Quoted 33 lines · Johannes Thumshirn
Quoted 32 lines · Guenter Roeck

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

Quoted 9 lines
Quoted 1 line

------

Hi Gunther,

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

Your original patch is at https://lkml.org/lkml/2013/8/21/251.
Do you want that version applied, with Stephen's Ack ?

Thanks,
Guenter

#4 lore raw
Quoted 38 lines · Guenter Roeck
Quoted 37 lines · Johannes Thumshirn
Quoted 26 lines · Guenter Roeck

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

Quoted 7 lines

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

------

Hi Gunther,

Quoted 9 lines
Quoted 5 lines

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

Your original patch is at https://lkml.org/lkml/2013/8/21/251.
Do you want that version applied, with Stephen's Ack ?

If you could do that, that would be great. If not I'll resend it.

Johannes

author maintainer
#5 lore raw
Quoted 45 lines · Johannes Thumshirn
Quoted 44 lines · Guenter Roeck
Quoted 42 lines · Johannes Thumshirn
Quoted 26 lines · Guenter Roeck

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

Quoted 7 lines

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

------

Hi Gunther,

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

Quoted 6 lines
Quoted 3 lines

Your original patch is at https://lkml.org/lkml/2013/8/21/251.
Do you want that version applied, with Stephen's Ack ?

If you could do that, that would be great. If not I'll resend it.

Ok, I applied it to the watchdog-next branch of my repository on kernel.org (on top of v2 and its revert).

Wim, please let me know how you want to handle it from there. You can pick it up from there (or direcetly from lkml), I could send you yet another pull request of the current branch, or I could rebase the branch again, drop v2 of the patch and its revert, and send you a pull request of the result. Or do nothing, of course.

Thanks,
Guenter

#6 lore raw

Hi Guenter,

Quoted 52 lines · Johannes Thumshirn
Quoted 45 lines · Guenter Roeck
Quoted 44 lines · Johannes Thumshirn
Quoted 42 lines · Guenter Roeck
Quoted 26 lines

* PGP Signed by an unknown key

Hi Wim,

This is v2 of my pull request. Please ignore the previous request. There are a couple of changes as outlined below, and I rebased the branch to 3.12-rc6.

Please consider pulling watchdog updates for Linux 3.13 from signed tag:

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-wim

The tag has been applied on top of the watchdog-next branch. The branch includes a number of patches I collected over the last few months. It does not include all submitted patches; only the ones I reviewed and felt comfortable with are included.

I reviewed all patches and ran build tests as well as source verification tests with both smatch and spatch. The branch has been on my Linux repo for a while, so presumably Fenguang's robot will have built the code as well. The w83627hf patches have been running on several servers for more than a month without problems.

You can find the most recent build results at
http://server.roeck-us.net:8010/builders/watchdog-next.

Quoted 7 lines

If you don't want to apply the entire series, please consider applying whatever subset you might feel comfortable with.

Thanks,
Guenter

------

Hi Gunther,

Can you please drop the patch from me from the pull request? I'm afraid something went wrong there, I thought Stephen Warren and I decided to just move the binding document and not change the bindings, as the driver went upstream in 3.11.

Quoted 6 lines
Quoted 3 lines

Your original patch is at https://lkml.org/lkml/2013/8/21/251.
Do you want that version applied, with Stephen's Ack ?

If you could do that, that would be great. If not I'll resend it.

Quoted 8 lines

Ok, I applied it to the watchdog-next branch of my repository on kernel.org (on top of v2 and its revert).

Wim, please let me know how you want to handle it from there. You can pick it up from there (or direcetly from lkml), I could send you yet another pull request of the current branch, or I could rebase the branch again, drop v2 of the patch and its revert, and send you a pull request of the result. Or do nothing, of course.

I added the old patch to linux-watchdog-next. So you don't need to do anything anymore.

Kind regards,
Wim.