Sat Jan 21 23:46:49 2012 UTC ()
Change dependency iic to i2cbus for fb drivers. OK macallan.


(rkujawa)
diff -r1.351 -r1.352 src/sys/dev/pci/files.pci
cvs diff -r1.351 -r1.352 src/sys/dev/pci/files.pci (expand / switch to unified diff)

--- src/sys/dev/pci/files.pci 2012/01/03 00:25:49 1.351
+++ src/sys/dev/pci/files.pci 2012/01/21 23:46:49 1.352
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.pci,v 1.351 2012/01/03 00:25:49 macallan Exp $ 1# $NetBSD: files.pci,v 1.352 2012/01/21 23:46:49 rkujawa Exp $
2# 2#
3# Config file and device description for machine-independent PCI code. 3# Config file and device description for machine-independent PCI code.
4# Included by ports that need it. Requires that the SCSI files be 4# Included by ports that need it. Requires that the SCSI files be
5# defined first. 5# defined first.
6 6
7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE 7defflag opt_pci.h PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE
8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE 8defparam opt_pci.h PCI_NETBSD_ENABLE_IDE
9 9
10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET 10defflag opt_bktr.h BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL 11 BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL
12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX 12defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX
13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT 13 BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT
14 14
@@ -827,27 +827,27 @@ file dev/pci/machfb.c machfb @@ -827,27 +827,27 @@ file dev/pci/machfb.c machfb
827 827
828# 3Dfx Voodoo3 framebuffer console driver 828# 3Dfx Voodoo3 framebuffer console driver
829device voodoofb: wsemuldisplaydev, rasops8, vcons, videomode, drm 829device voodoofb: wsemuldisplaydev, rasops8, vcons, videomode, drm
830attach voodoofb at pci 830attach voodoofb at pci
831file dev/pci/voodoofb.c voodoofb 831file dev/pci/voodoofb.c voodoofb
832 832
833# VIA UniChrome framebuffer console driver 833# VIA UniChrome framebuffer console driver
834device unichromefb: wsemuldisplaydev, rasops16, rasops32, vcons, drm 834device unichromefb: wsemuldisplaydev, rasops16, rasops32, vcons, drm
835attach unichromefb at pci 835attach unichromefb at pci
836file dev/pci/unichromefb.c unichromefb needs-flag 836file dev/pci/unichromefb.c unichromefb needs-flag
837 837
838# ATI Radeon framebuffer console driver 838# ATI Radeon framebuffer console driver
839# (Note: to enable the BIOS parser, add options RADEON_BIOS_INIT to the config) 839# (Note: to enable the BIOS parser, add options RADEON_BIOS_INIT to the config)
840device radeonfb: wsemuldisplaydev, videomode, rasops8, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm 840device radeonfb: wsemuldisplaydev, videomode, rasops8, rasops32, vcons, splash, i2cbus, i2c_bitbang, ddc_read_edid, edid, drm
841attach radeonfb at pci 841attach radeonfb at pci
842file dev/pci/radeonfb.c radeonfb 842file dev/pci/radeonfb.c radeonfb
843file dev/pci/radeonfb_i2c.c radeonfb 843file dev/pci/radeonfb_i2c.c radeonfb
844file dev/pci/radeonfb_bios.c radeonfb 844file dev/pci/radeonfb_bios.c radeonfb
845defflag opt_radeonfb.h RADEONFB_DEBUG 845defflag opt_radeonfb.h RADEONFB_DEBUG
846defflag opt_radeonfb.h RADEONFB_BIOS_INIT 846defflag opt_radeonfb.h RADEONFB_BIOS_INIT
847defflag opt_radeonfb.h RADEONFB_BIOS_DEBUG 847defflag opt_radeonfb.h RADEONFB_BIOS_DEBUG
848defflag opt_radeonfb.h RADEONFB_MMAP_BARS 848defflag opt_radeonfb.h RADEONFB_MMAP_BARS
849defflag opt_radeonfb.h RADEONFB_DEPTH_32 849defflag opt_radeonfb.h RADEONFB_DEPTH_32
850 850
851# Chelsio Terminator 3 (T3) 10 gigabit ethernet 851# Chelsio Terminator 3 (T3) 10 gigabit ethernet
852device cxgbc { } 852device cxgbc { }
853attach cxgbc at pci 853attach cxgbc at pci
@@ -970,27 +970,27 @@ file dev/pci/genfb_pci.c genfb_pci @@ -970,27 +970,27 @@ file dev/pci/genfb_pci.c genfb_pci
970# NVIDIA nForce2/3/4 SMBus controller 970# NVIDIA nForce2/3/4 SMBus controller
971device nfsmbc { } 971device nfsmbc { }
972attach nfsmbc at pci 972attach nfsmbc at pci
973device nfsmb: i2cbus 973device nfsmb: i2cbus
974attach nfsmb at nfsmbc 974attach nfsmb at nfsmbc
975file dev/pci/nfsmb.c nfsmbc | nfsmb 975file dev/pci/nfsmb.c nfsmbc | nfsmb
976 976
977# Intel ICH SMBus controller 977# Intel ICH SMBus controller
978device ichsmb: i2cbus 978device ichsmb: i2cbus
979attach ichsmb at pci 979attach ichsmb at pci
980file dev/pci/ichsmb.c ichsmb 980file dev/pci/ichsmb.c ichsmb
981 981
982# ATI Rage 128 framebuffer console driver 982# ATI Rage 128 framebuffer console driver
983device r128fb: wsemuldisplaydev, rasops8, rasops32, vcons, videomode, iic, i2c_bitbang 983device r128fb: wsemuldisplaydev, rasops8, rasops32, vcons, videomode, i2cbus, i2c_bitbang
984attach r128fb at pci 984attach r128fb at pci
985file dev/pci/r128fb.c r128fb 985file dev/pci/r128fb.c r128fb
986defflag opt_r128fb.h R128FB_DEBUG 986defflag opt_r128fb.h R128FB_DEBUG
987defflag opt_r128fb.h R128FB_WAIT 987defflag opt_r128fb.h R128FB_WAIT
988 988
989# Attansic/Atheros L1 Gigabit-Ethernet 989# Attansic/Atheros L1 Gigabit-Ethernet
990device age: ether, ifnet, arp, mii, mii_phy 990device age: ether, ifnet, arp, mii, mii_phy
991attach age at pci 991attach age at pci
992file dev/pci/if_age.c age 992file dev/pci/if_age.c age
993 993
994# Attansic/Atheros L1C/L2C Gigabit Ethernet 994# Attansic/Atheros L1C/L2C Gigabit Ethernet
995device alc: ether, ifnet, arp, mii, mii_phy 995device alc: ether, ifnet, arp, mii, mii_phy
996attach alc at pci 996attach alc at pci
@@ -1022,36 +1022,36 @@ include "dev/pci/n8/files.n8" @@ -1022,36 +1022,36 @@ include "dev/pci/n8/files.n8"
1022 1022
1023# 1023#
1024# Broadcom AirForce / Apple Airport Extreme 1024# Broadcom AirForce / Apple Airport Extreme
1025# 1025#
1026attach bwi at pci with bwi_pci 1026attach bwi at pci with bwi_pci
1027file dev/pci/if_bwi_pci.c bwi_pci 1027file dev/pci/if_bwi_pci.c bwi_pci
1028 1028
1029# Marvell Serial-ATA Host Controller 1029# Marvell Serial-ATA Host Controller
1030attach mvsata at pci with mvsata_pci 1030attach mvsata at pci with mvsata_pci
1031file dev/pci/mvsata_pci.c mvsata_pci 1031file dev/pci/mvsata_pci.c mvsata_pci
1032 1032
1033include "dev/pci/voyager/files.voyager" 1033include "dev/pci/voyager/files.voyager"
1034# Silicon Motion SM502 / Voyager GX 1034# Silicon Motion SM502 / Voyager GX
1035device voyager: iic, i2c_bitbang, voyagerbus, i2cbus 1035device voyager: i2cbus, i2c_bitbang, voyagerbus, i2cbus
1036attach voyager at pci 1036attach voyager at pci
1037file dev/pci/voyager.c voyager 1037file dev/pci/voyager.c voyager
1038defflag opt_voyager.h VOYAGER_DEBUG 1038defflag opt_voyager.h VOYAGER_DEBUG
1039 1039
1040# High Definition Audio 1040# High Definition Audio
1041include "dev/pci/hdaudio/files.hdaudio" 1041include "dev/pci/hdaudio/files.hdaudio"
1042 1042
1043# Permedia 2 / Sun PGX32 / Raptor 1043# Permedia 2 / Sun PGX32 / Raptor
1044device pm2fb: wsemuldisplaydev, rasops8, vcons, videomode, iic, i2c_bitbang 1044device pm2fb: wsemuldisplaydev, rasops8, vcons, videomode, i2cbus, i2c_bitbang
1045attach pm2fb at pci 1045attach pm2fb at pci
1046file dev/pci/pm2fb.c pm2fb 1046file dev/pci/pm2fb.c pm2fb
1047defflag opt_pm2fb.h PM2FB_DEBUG 1047defflag opt_pm2fb.h PM2FB_DEBUG
1048 1048
1049# 3Dlabs Wildcat / Sun XVR-500, 1200, Expert3D etc. 1049# 3Dlabs Wildcat / Sun XVR-500, 1200, Expert3D etc.
1050device wcfb: wsemuldisplaydev, rasops8, vcons 1050device wcfb: wsemuldisplaydev, rasops8, vcons
1051attach wcfb at pci 1051attach wcfb at pci
1052file dev/pci/wcfb.c wcfb 1052file dev/pci/wcfb.c wcfb
1053defflag opt_wcfb.h WCFB_DEBUG 1053defflag opt_wcfb.h WCFB_DEBUG
1054 1054
1055# Domex 536, 5380-compatible SCSI HBA 1055# Domex 536, 5380-compatible SCSI HBA
1056attach nca at pci with nca_pci 1056attach nca at pci with nca_pci
1057file dev/pci/nca_pci.c nca_pci 1057file dev/pci/nca_pci.c nca_pci