Skip to contentSkip to conversation

watchdog: octeontx_wdt: Add MIPS Octeon support

PATCH New Stefan Roese 1 participant 2 messages May 11, 2022 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 watchdog: octeontx_wdt: Add MIPS Octeon support

This patch adds support for the Marvell Octeon watchdog driver, which currently only support the ARM64 Octeon TX & TX2 platforms. Since the IP is pretty similar, it makes sense to extend this driver to also support the MIPS Octeon SoC.

A follow-up patch will enable this watchdog support on the EBB7304 eval board.

Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
---
 drivers/watchdog/Kconfig        |  9 ++---
 drivers/watchdog/octeontx_wdt.c | 67 ++++++++++++++++++++++++---------
 2 files changed, 53 insertions(+), 23 deletions(-)
drivers/watchdog/Kconfig +4 -5
index c3eb8a8aec1b..2c6116fb7f9c 100644
@@ -213,14 +213,13 @@ config WDT_NPCM
 	  It performs full SoC reset.
 
 config WDT_OCTEONTX
-	bool "OcteonTX core watchdog support"
-	depends on WDT && (ARCH_OCTEONTX || ARCH_OCTEONTX2)
+	bool "Octeon core watchdog support"
+	depends on WDT && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
 	default y
 	imply WATCHDOG
 	help
-	  This enables OcteonTX watchdog driver, which can be
-	  found on OcteonTX/TX2 chipsets and inline with driver model.
-	  Only supports watchdog reset.
+	  This enables the Octeon watchdog driver, which can be found on
+	  various Octeon parts such as Octeon II/III and OcteonTX/TX2.
 
 config WDT_OMAP3
 	bool "TI OMAP watchdog timer support"
drivers/watchdog/octeontx_wdt.c +49 -18

132 lines not on this page · raw message

Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/2 mips: octeon: octeon_ebb7304_defconfig: Enable watchdog support

This patch enables the recently added watchdog support on the MIPS Octeon EBB7304 eval board.

Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
Cc Daniel Schwierzeck <[email protected]>
---
 configs/octeon_ebb7304_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/octeon_ebb7304_defconfig +2 -0
index f70f0d214cf9..f6dc4feef742 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_MTD=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_WDT=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
@@ -87,4 +88,5 @@ CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_WDT=y
 CONFIG_HEXDUMP=y
Signature · 1 line
2.36.1