Sat Aug 27 09:28:56 2011 UTC ()
Enable some gpio devices.


(mbalmer)
diff -r1.1048 -r1.1049 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.1048 -r1.1049 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2011/08/18 20:55:20 1.1048
+++ src/sys/arch/i386/conf/GENERIC 2011/08/27 09:28:55 1.1049
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1048 2011/08/18 20:55:20 jakllsch Exp $ 1# $NetBSD: GENERIC,v 1.1049 2011/08/27 09:28:55 mbalmer Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1048 $" 25#ident "GENERIC-$Revision: 1.1049 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options VM86 # virtual 8086 emulation 30options VM86 # virtual 8086 emulation
31options USER_LDT # user-settable LDT; used by WINE 31options USER_LDT # user-settable LDT; used by WINE
32#options PAE # PAE mode (36 bits physical addressing) 32#options PAE # PAE mode (36 bits physical addressing)
33 33
34# CPU features 34# CPU features
35acpicpu* at cpu? # ACPI CPU (including frequency scaling) 35acpicpu* at cpu? # ACPI CPU (including frequency scaling)
36coretemp* at cpu? # Intel on-die thermal sensor 36coretemp* at cpu? # Intel on-die thermal sensor
37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
38#odcm0 at cpu0 # On-demand clock modulation 38#odcm0 at cpu0 # On-demand clock modulation
@@ -446,27 +446,27 @@ gpio* at elansc? @@ -446,27 +446,27 @@ gpio* at elansc?
446# Temperatures 446# Temperatures
447amdtemp* at pchb? # AMD CPU Temperature sensors 447amdtemp* at pchb? # AMD CPU Temperature sensors
448 448
449# PCI bridges 449# PCI bridges
450#amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET 450#amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET
451#hpet* at amdpcib? 451#hpet* at amdpcib?
452ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, 452ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter,
453 # watchdog, SpeedStep and HPET 453 # watchdog, SpeedStep and HPET
454fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator 454fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
455#hpet* at ichlpcib? 455#hpet* at ichlpcib?
456gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ 456gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
457gpio* at gcscpcib? # timecounter, watchdog and GPIO 457gpio* at gcscpcib? # timecounter, watchdog and GPIO
458#piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep 458#piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep
459#gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support 459gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA w/ GPIO
460viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support 460viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support
461iic* at viapcib? 461iic* at viapcib?
462rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ 462rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
463 # watchdog 463 # watchdog
464pchb* at pci? dev ? function ? # PCI-Host bridges 464pchb* at pci? dev ? function ? # PCI-Host bridges
465pceb* at pci? dev ? function ? # PCI-EISA bridges 465pceb* at pci? dev ? function ? # PCI-EISA bridges
466pcib* at pci? dev ? function ? # PCI-ISA bridges 466pcib* at pci? dev ? function ? # PCI-ISA bridges
467pcmb* at pci? dev ? function ? # PCI-MCA bridges 467pcmb* at pci? dev ? function ? # PCI-MCA bridges
468ppb* at pci? dev ? function ? # PCI-PCI bridges 468ppb* at pci? dev ? function ? # PCI-PCI bridges
469# XXX 'puc's aren't really bridges, but there's no better place for them here 469# XXX 'puc's aren't really bridges, but there's no better place for them here
470puc* at pci? dev ? function ? # PCI "universal" comm. cards 470puc* at pci? dev ? function ? # PCI "universal" comm. cards
471 471
472pwdog* at pci ? dev ? function ? # QUANCOM PWDOG1 472pwdog* at pci ? dev ? function ? # QUANCOM PWDOG1
@@ -696,36 +696,40 @@ iic* at piixpm? # SMBus on PIIX4 @@ -696,36 +696,40 @@ iic* at piixpm? # SMBus on PIIX4
696#spdmem* at iic? addr 0x53 696#spdmem* at iic? addr 0x53
697#spdmem* at iic? addr 0x54 697#spdmem* at iic? addr 0x54
698#spdmem* at iic? addr 0x55 698#spdmem* at iic? addr 0x55
699#spdmem* at iic? addr 0x56 699#spdmem* at iic? addr 0x56
700#spdmem* at iic? addr 0x57 700#spdmem* at iic? addr 0x57
701 701
702# I2O devices 702# I2O devices
703iop* at pci? dev ? function ? # I/O processor 703iop* at pci? dev ? function ? # I/O processor
704iopsp* at iop? tid ? # SCSI/FC-AL ports 704iopsp* at iop? tid ? # SCSI/FC-AL ports
705ld* at iop? tid ? # block devices 705ld* at iop? tid ? # block devices
706dpti* at iop? tid 0 # DPT/Adaptec control interface 706dpti* at iop? tid 0 # DPT/Adaptec control interface
707 707
708# GPIO devices 708# GPIO devices
709#gpio* at gscpcib? 709gpio* at gscpcib?
710#gpio* at gpiosim? 710#gpio* at gpiosim?
711 711
712# 1-Wire support 712# 1-Wire support
713#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio 713#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
714#gpioow* at gpio? 714gpioow* at gpio?
715#onewire* at gpioow? 715onewire* at gpioow?
716 716
717# 1-Wire devices 717# 1-Wire devices
718#owtemp* at onewire? # Temperature sensors 718owtemp* at onewire? # Temperature sensors
 719
 720# i2c support
 721gpioiic* at gpio?
 722iic* at gpioiic?
719 723
720# Keylock support 724# Keylock support
721#gpiolock* at gpio? 725#gpiolock* at gpio?
722 726
723# SCSI Controllers and Devices 727# SCSI Controllers and Devices
724 728
725# PCI SCSI controllers 729# PCI SCSI controllers
726adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI 730adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
727adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI 731adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
728ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI 732ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
729ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI 733ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI
730bha* at pci? dev ? function ? # BusLogic 9xx SCSI 734bha* at pci? dev ? function ? # BusLogic 9xx SCSI
731dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID 735dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID