gscpcib(4) -- National Semiconductor Geode SC1100 PCI-ISA bridge driver.

Besides the core pcib(4) functionality, the gscpcib driver provides
support for the GPIO interface of this device.

ok deraadt@

6 files changed, 23 insertions, 7 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3b84018218e..d0ac7b871df 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.365 2004/05/30 08:11:26 grange Exp $
+#	$OpenBSD: GENERIC,v 1.366 2004/06/03 18:22:21 grange Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -46,6 +46,7 @@ pcibios0 at bios0 flags 0x0000	# use 0x30 for a total verbose
 isa0	at mainbus0
 isa0	at pcib?
 isa0	at ichpcib?
+isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0 bus ?
 
@@ -59,6 +60,8 @@ pci*	at ppb? bus ?
 pci*	at pchb? bus ?
 pcib*	at pci? dev ? function ?	# PCI-ISA bridge
 ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
+gpio*	at gscpcib?
 
 # power management and other environmental stuff
 #amdpm*	at pci? dev ? function ?	# AMD768MPX
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 26a3a1dfd3b..b7f528ea3d3 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.128 2004/06/03 03:12:55 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.129 2004/06/03 18:22:21 grange Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -50,6 +50,7 @@ pcibios0 at bios0 flags 0x0000
 isa0	at mainbus0
 isa0	at pcib?
 isa0	at ichpcib?
+isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0
 
@@ -62,6 +63,7 @@ pci*	at ppb? bus ?
 pci*	at pchb? bus ?
 pcib*	at pci? dev ? function ?	# PCI-ISA bridge
 ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
 
 # ISA PCMCIA controllers
 pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index d9eb2bc96bd..c7a0d727224 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.69 2004/06/03 03:12:55 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.70 2004/06/03 18:22:21 grange Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -50,6 +50,7 @@ pcibios0 at bios0 flags 0x0000
 isa0	at mainbus0
 isa0	at pcib?
 isa0	at ichpcib?
+isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0
 
@@ -62,6 +63,7 @@ pci*	at ppb? bus ?
 pci*	at pchb? bus ?
 pcib*	at pci? dev ? function ?	# PCI-ISA bridge
 ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
 
 # ISA PCMCIA controllers
 #pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index d2c0b3f28ec..76e9db57d6f 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.38 2004/06/03 04:07:38 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.39 2004/06/03 18:22:21 grange Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -50,6 +50,7 @@ pcibios0 at bios0 flags 0x0000
 isa0	at mainbus0
 isa0	at pcib?
 isa0	at ichpcib?
+isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0
 
@@ -62,6 +63,7 @@ pci*	at ppb? bus ?
 pci*	at pchb? bus ?
 pcib*	at pci? dev ? function ?	# PCI-ISA bridge
 ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
 
 # ISA PCMCIA controllers
 pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index e628eb4d105..9f2213ba41e 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.72 2004/06/03 03:12:38 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.73 2004/06/03 18:22:21 grange Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -51,6 +51,7 @@ pcibios0 at bios0 flags 0x0000
 isa0	at mainbus0
 isa0	at pcib?
 isa0	at ichpcib?
+isa0	at gscpcib?
 eisa0	at mainbus0
 pci*	at mainbus0
 
@@ -63,6 +64,7 @@ pci*	at ppb? bus ?
 pci*	at pchb? bus ?
 pcib*	at pci? dev ? function ?	# PCI-ISA bridge
 ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
 
 # CardBus bus support
 cardbus*	at cardslot?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 3b81e09b868..71623e52636 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.120 2004/06/03 18:13:13 grange Exp $
+#	$OpenBSD: files.i386,v 1.121 2004/06/03 18:22:21 grange Exp $
 #
 # new style config file for i386 architecture
 #
@@ -121,13 +121,18 @@ file	arch/i386/pci/geodesc.c		geodesc
 # PCI-ISA bridge chipsets
 device	pcib: isabus
 attach	pcib at pci
-file	arch/i386/pci/pcib.c		pcib | ichpcib
+file	arch/i386/pci/pcib.c		pcib | ichpcib | gscpcib
 
 # Intel ICHx/ICHx-M LPC bridges
 device	ichpcib: isabus
 attach	ichpcib at pci
 file	arch/i386/pci/ichpcib.c		ichpcib
 
+# National Semiconductor Geode SC1100 PCI-ISA bridge
+device	gscpcib: isabus, gpiobus
+attach	gscpcib at pci
+file	arch/i386/pci/gscpcib.c		gscpcib
+
 device	hme: ether, ifnet, mii, ifmedia
 file	dev/ic/hme.c			hme
 attach	hme at pci with hme_pci