Skip to contentSkip to conversation

m68knommu,watchdog: Add MCF548x watchdog driver.

PATCH In review Philippe De Muyter 2 participants 2 messages Nov 3, 2010 – Nov 4, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68knommu,watchdog: Add MCF548x watchdog driver.

---
 arch/m68k/include/asm/m548xgpt.h |    2 +
 drivers/watchdog/Kconfig         |    7 +-
 drivers/watchdog/Makefile        |    3 +-
 drivers/watchdog/m548x_wdt.c     |  227 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 236 insertions(+), 3 deletions(-)
 create mode 100644 drivers/watchdog/m548x_wdt.c
arch/m68k/include/asm/m548xgpt.h +2 -0
index c8ef158..33b2eef 100644
@@ -59,11 +59,13 @@
 #define MCF_GPT_GMS_GPIO_INPUT     (0x00000000)
 #define MCF_GPT_GMS_GPIO_OUTLO     (0x00000020)
 #define MCF_GPT_GMS_GPIO_OUTHI     (0x00000030)
+#define MCF_GPT_GMS_GPIO_MASK      (0x00000030)
 #define MCF_GPT_GMS_TMS_DISABLE    (0x00000000)
 #define MCF_GPT_GMS_TMS_INCAPT     (0x00000001)
 #define MCF_GPT_GMS_TMS_OUTCAPT    (0x00000002)
 #define MCF_GPT_GMS_TMS_PWM        (0x00000003)
 #define MCF_GPT_GMS_TMS_GPIO       (0x00000004)
+#define MCF_GPT_GMS_TMS_MASK       (0x00000007)
 
 /* Bit definitions and macros for MCF_GPT_GCIR */
 #define MCF_GPT_GCIR_CNT(x)        (((x)&0x0000FFFF)<<0)
drivers/watchdog/Kconfig +6 -1
index c356146..1a58eb3 100644
@@ -828,7 +828,12 @@ config SBC_EPX_C3_WATCHDOG
 
 # M68K Architecture
 
-# M68KNOMMU Architecture
+config M548x_WATCHDOG 
+ 	tristate "MCF548x watchdog support" 
+ 	depends on WATCHDOG 
+ 	help 
+ 	  To compile this driver as a module, choose M here: the 
+ 	  module will be called m548x_wdt.
 
 # MIPS Architecture
 
drivers/watchdog/Makefile +1 -2
index 8374503..3d7b596 100644
@@ -104,8 +104,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 # M32R Architecture
 
 # M68K Architecture
-
-# M68KNOMMU Architecture
+obj-$(CONFIG_M548x_WATCHDOG) += m548x_wdt.o
 
 # MIPS Architecture
 obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o
drivers/watchdog/m548x_wdt.c new file +227 -0

227 lines not on this page · raw message

Signature · 1 line
1.7.1
#1 lore raw

Hi Philippe,

Quoted 9 lines
---
 arch/m68k/include/asm/m548xgpt.h |    2 +
 drivers/watchdog/Kconfig         |    7 +-
 drivers/watchdog/Makefile        |    3 +-
 drivers/watchdog/m548x_wdt.c     |  227 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 236 insertions(+), 3 deletions(-)
 create mode 100644 drivers/watchdog/m548x_wdt.c

Will look at this after I looked at some other patches and after review of 2 other new watchdog drivers. So expect something within 2 weeks.

Kind regards,
Wim.