Skip to contentSkip to conversation

SCx200 patches part 1/3 -- Watchdog driver

PATCH Christer Weinigel 1 participant 2 messages Jun 30, 2002 – Jul 1, 2002

lore
Share & tools
lore
#0 lore raw

Hi,

this is the forst patch out of three that adds support for the National Semiconductor SCx200 processor. The patches are fairly standalone, except that the two next patches both need some header file changes from this patch.

This patch adds a watchdog driver for the SCx200 processors, and also changes some header files that are needed.

The patch is against a 2.4.19-pre10 kernel.

/Christer

linux/Documentation/Configure.help renamed from linux/Documentation/Configure.help.orig +7 -0
diff -urw ./linux/Documentation/Configure.help.orig ./linux/Documentation/Configure.help
@@ -24982,6 +24982,13 @@
   information:  http://www.candelatech.com/~greear/vlan.html  If unsure,
   you can safely say 'N'.
 
+NatSemi SCx200 Watchdog
+CONFIG_SCx200_WDT
+  Enable the built-in watchdog timer support on the National 
+  Semiconductor SCx200 processors.
+
+  If compiled as a module, it will be called scx200_watchdog.o.
+
 #
 # A couple of things I keep forgetting:
 #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
linux/MAINTAINERS renamed from linux/MAINTAINERS.orig +6 -0
diff -urw ./linux/MAINTAINERS.orig ./linux/MAINTAINERS
@@ -1403,6 +1403,12 @@
 L:	[email protected]
 S:	Maintained
 
+SCx200 CPU SUPPORT
+P:	Christer Weinigel
+M:	[email protected]
+W:	http://www.nano-system.com
+S:	Supported
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:	Bent Hagemark
 M:	[email protected]
linux/drivers/char/Config.in renamed from linux/drivers/char/Config.in.orig +1 -0
diff -urw ./linux/drivers/char/Config.in.orig ./linux/drivers/char/Config.in
@@ -198,6 +198,7 @@
    tristate '  Mixcom Watchdog' CONFIG_MIXCOMWD 
    tristate '  SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
    dep_tristate '  SC1200 Watchdog Timer (EXPERIMENTAL)' CONFIG_SC1200_WDT $CONFIG_EXPERIMENTAL
+   tristate '  NatSemi SCx200 Watchdog' CONFIG_SCx200_WDT
    tristate '  Software Watchdog' CONFIG_SOFT_WATCHDOG
    tristate '  W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
    tristate '  WDT Watchdog timer' CONFIG_WDT
linux/drivers/char/Makefile renamed from linux/drivers/char/Makefile.orig +1 -0
diff -urw ./linux/drivers/char/Makefile.orig ./linux/drivers/char/Makefile
@@ -260,6 +260,7 @@
 obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
 obj-$(CONFIG_INDYDOG) += indydog.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 
linux/drivers/char/scx200_wdt.c renamed from linux/drivers/char/scx200_wdt.c.orig +279 -0

279 lines not on this page · raw message

linux/include/linux/pci_ids.h renamed from linux/include/linux/pci_ids.h.orig +6 -0
diff -urw ./linux/include/linux/pci_ids.h.orig ./linux/include/linux/pci_ids.h
@@ -287,6 +287,12 @@
 #define PCI_DEVICE_ID_NS_87560_USB	0x0012
 #define PCI_DEVICE_ID_NS_83815		0x0020
 #define PCI_DEVICE_ID_NS_83820		0x0022
+#define PCI_DEVICE_ID_NS_SCx200_BRIDGE	0x0500
+#define PCI_DEVICE_ID_NS_SCx200_SMI	0x0501
+#define PCI_DEVICE_ID_NS_SCx200_IDE	0x0502
+#define PCI_DEVICE_ID_NS_SCx200_AUDIO	0x0503
+#define PCI_DEVICE_ID_NS_SCx200_VIDEO	0x0504
+#define PCI_DEVICE_ID_NS_SCx200_XBUS	0x0505
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
 #define PCI_VENDOR_ID_TSENG		0x100c
linux/include/linux/scx200.h renamed from linux/include/linux/scx200.h.orig +56 -0

56 lines not on this page · raw message

Signature · 1 line
"Just how much can I get away with and still go to heaven?"
#1 lore raw

Re: SCx200 patches, updated for 2.4.19-rc1

Hi,

of course I managed to miss that you had released a 2.4.19-rc1 patch. I have updated the patches to match and they are available as:

http://basselope.nano-system.com/~wingel/scx200/p1-watchdog-2.4.19-rc1.diff
http://basselope.nano-system.com/~wingel/scx200/p2-docflash-2.4.19-rc1.diff
http://basselope.nano-system.com/~wingel/scx200/p3-i2c-2.4.19-rc1.diff

It might be better to wait with these patches until the final 2.4.19 is released, I'll do a new set of patches then.

/Christer

Signature · 1 line
"Just how much can I get away with and still go to heaven?"