Skip to content

Armada 370/XP watchdog

Jason Cooper linux-arm-kernel linux-watchdog 8 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest2 of 18 patches 0 repliesNew
  2. v5 posting 4/41 of 20 patches 0 repliesSuperseded
  3. v5 posting 3/40 of 20 patches 0 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v5 posting 2/40 of 20 patches0 repliesSuperseded
v5 posting 1/40 of 20 patches0 repliesSuperseded
v2 posting 2/21 of 27 patches0 repliesSuperseded
v2 posting 1/20 of 27 patches0 repliesSuperseded
v15 of 15 patches0 repliesSuperseded

2 of 18 patches are in this archive. The cover letter announces 18.

Patches in v7 No applies recorded yet

#Subject and filesSizeRepliesApplied
11/18watchdog: orion: Add per-compatible watchdog start implementationdrivers/watchdog/orion_wdt.c+11 -10 replies
11/18watchdog: orion: Add per-compatible watchdog start implementation+0 -01 reply

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchGuenter RoeckSebastian HesselbarthWilly TarreauWim Van Sebroeck
11/18R-b T-b T-b A-b
11/18R-b T-b T-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v7 thread

Cover letter [PATCH v7 00/18] Armada 370/XP watchdog
Quoted 11 lines · Ezequiel Garcia

Yet another round. This time, addressing Guenter's comment about the nowayout parameter. So, to allow for proper nowayout behavior, we now restrict the initial watchdog stop; which is only done if the watchdog is not properly enabled.

I've dropped the clocksource patch which was previously part of the series. The patch is independent and will be merged through the subsystem maintainer, Daniel Lezcano.

Also, I've updated the multi_v7_defconfig, as per Jason Cooper request.

Quoted 8 lines

This series depends on Sebastian's irqchip fixes to clear the bridge irqs cause, which Jason picked here:

http://git.infradead.org/linux-mvebu.git mvebu-next/irqchip-fixes

Wim: Can we take all the watchdog changes through mvebu, with your Ack? This way, we can sort out the irqchip dependency.

Whole series applied as follows (with Wim's Acks):

Quoted 5 lines

Ezequiel Garcia (18):
watchdog: orion: Add clock error handling
watchdog: orion: Use atomic access for shared registers
watchdog: orion: Remove unused macros
watchdog: orion: Make sure the watchdog is initially stopped

Quoted 8 lines

watchdog: orion: Handle the interrupt so it's properly acked
watchdog: orion: Make RSTOUT register a separate resource
watchdog: orion: Remove unneeded BRIDGE_CAUSE clear
watchdog: orion: Introduce an orion_watchdog device structure
watchdog: orion: Introduce per-compatible of_device_id data
watchdog: orion: Add per-compatible clock initialization
watchdog: orion: Add per-compatible watchdog start implementation
watchdog: orion: Add support for Armada 370 and Armada XP SoC

to mvebu/watchdog (deps on mvebu/irqchip-fixes (renamed))

Quoted 3 lines

ARM: mvebu: Enable Armada 370/XP watchdog in the devicetree
ARM: kirkwood: Add RSTOUT 'reg' entry to devicetree
ARM: dove: Enable Dove watchdog in the devicetree

to mvebu/dt

Quoted 1 line

watchdog: orion: Enable the build on ARCH_MVEBU

to mvebu/watchdog

Quoted 2 lines

ARM: mvebu: Enable watchdog support in defconfig
ARM: dove: Enable watchdog support in the defconfig

to mvebu/defconfig

Quoted 9 lines
 .../devicetree/bindings/watchdog/marvel.txt        |  11 +-
 arch/arm/boot/dts/armada-370-xp.dtsi               |   4 +
 arch/arm/boot/dts/armada-370.dtsi                  |   5 +
 arch/arm/boot/dts/armada-xp.dtsi                   |   6 +
 arch/arm/boot/dts/dove.dtsi                        |   8 +
 arch/arm/boot/dts/kirkwood.dtsi                    |   2 +-
 arch/arm/configs/dove_defconfig                    |   2 +
 arch/arm/configs/multi_v7_defconfig                |   2 +
 arch/arm/configs/mvebu_defconfig                   |   2 +
Quoted 8 lines
 arch/arm/mach-dove/include/mach/bridge-regs.h      |   1 +
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h  |   1 +
 arch/arm/mach-mv78xx0/include/mach/bridge-regs.h   |   1 +
 arch/arm/mach-orion5x/include/mach/bridge-regs.h   |   1 +
 arch/arm/plat-orion/common.c                       |  10 +-
 drivers/watchdog/Kconfig                           |   2 +-
 drivers/watchdog/orion_wdt.c                       | 381 ++++++++++++++++-----
 16 files changed, 352 insertions(+), 87 deletions(-)

Great work, Ezequiel!

thx,

Jason.