Package: discover-data
Tags: patch d-i
Currently, d-i isn't very good at detecting which module to use for
the PCMCIA bridge. Joey said that it currently "fails about 75% of the
time". The reason for this, I think, is that d-i uses
kernel-pcmcia-modules-*, while discover-data still mostly uses the
module names for the standalone pcmcia-modules-*. Some module names
have been corrected after bug reports, but not all.
pcmcia-cs includes the utility pcic_probe for detecting which module
to use for the bridge, and it supports the new module names. I have
merged this information into the pci.lst in discover-data, and the
resulting patch is attached. I hope this will improve PCMCIA support
in d-i.
--
Pelle
diff -urN discover-data-1.2004.02.08.orig/pci.lst discover-data-1.2004.02.08/pci.lst
--- discover-data-1.2004.02.08.orig/pci.lst 2004-02-08 22:27:02.000000000 +0100
+++ discover-data-1.2004.02.08/pci.lst 2004-02-22 18:40:50.000000000 +0100
@@ -399,7 +399,7 @@
10131010 sound cs46xx CS 4614/22/24 [CrystalClear SoundFusion Audio
Accelerator]
10131014 sound cs46xx CS 4614/22/24 [CrystalClear SoundFusion Audio
Accelerator]
10131100 bridge i82365 CL 6729
- 10131110 bridge i82365 PD 6832
+ 10131110 bridge yenta_socket PD 6832
10131112 unknown unknown PD 6834 PCMCIA/CardBus Ctrlr
10131113 unknown unknown PD 6833 PCMCIA/CardBus Ctrlr
10131200 video Server:XF86_SVGA GD754x (laptop) GD 7542
[Nordic]
@@ -999,35 +999,35 @@
104ca106 unknown unknown TMS320C6205
104cac10 unknown ignore PCI1050
104cac11 unknown ignore PCI1053
- 104cac12 bridge i82365 PCI1130
- 104cac13 bridge i82365 PCI1031
+ 104cac12 bridge yenta_socket PCI1130
+ 104cac13 bridge yenta_socket PCI1031
104cac15 bridge yenta_socket PCI1131
- 104cac16 bridge i82365 PCI1250
- 104cac17 bridge i82365 PCI1220
+ 104cac16 bridge yenta_socket PCI1250
+ 104cac17 bridge yenta_socket PCI1220
104cac18 unknown unknown PCI1260
- 104cac19 bridge i82365 PCI1221
- 104cac1a bridge i82365 PCI1210
+ 104cac19 bridge yenta_socket PCI1221
+ 104cac1a bridge yenta_socket PCI1210
104cac1b bridge yenta_socket PCI1450
104cac1c bridge yenta_socket PCI1225
- 104cac1d bridge i82365 PCI1251A
+ 104cac1d bridge yenta_socket PCI1251A
104cac1e bridge yenta_socket PCI1211
- 104cac1f bridge i82365 PCI1251B
+ 104cac1f bridge yenta_socket PCI1251B
104cac20 unknown unknown TI 2030
104cac21 unknown unknown PCI2031
104cac22 unknown unknown PCI2032 PCI Docking Bridge
104cac23 unknown unknown PCI2250 PCI-to-PCI Bridge
104cac28 unknown unknown PCI2050 PCI-to-PCI Bridge
- 104cac30 bridge i82365 PCI1260 PC card Cardbus Controller
- 104cac40 bridge i82365 PCI4450 PC card Cardbus Controller
- 104cac41 bridge i82365 PCI4410 PC card Cardbus Controller
- 104cac42 bridge i82365 PCI4451 PC card Cardbus Controller
- 104cac44 unknown unknown PCI4510 PC card Cardbus Controller
+ 104cac30 bridge yenta_socket PCI1260 PC card Cardbus Controller
+ 104cac40 bridge yenta_socket PCI4450 PC card Cardbus Controller
+ 104cac41 bridge yenta_socket PCI4410 PC card Cardbus Controller
+ 104cac42 bridge yenta_socket PCI4451 PC card Cardbus Controller
+ 104cac44 bridge yenta_socket PCI4510 PC card Cardbus Controller
104cac50 bridge yenta_socket PCI1410 PC card Cardbus Controller
- 104cac51 bridge i82092 PCI1420 PC card Cardbus Controller
- 104cac52 bridge i82365 PCI1451 PC card Cardbus Controller
- 104cac53 bridge i82365 PCI1421 PC card Cardbus Controller
- 104cac55 unknown unknown PCI1250 PC card Cardbus Controller
- 104cac56 unknown unknown PCI1510 PC card Cardbus Controller
+ 104cac51 bridge yenta_socket PCI1420 PC card Cardbus Controller
+ 104cac52 bridge yenta_socket PCI1451 PC card Cardbus Controller
+ 104cac53 bridge yenta_socket PCI1421 PC card Cardbus Controller
+ 104cac55 bridge yenta_socket PCI1250 PC card Cardbus Controller
+ 104cac56 bridge yenta_socket PCI1510 PC card Cardbus Controller
104cac60 unknown unknown PCI2040 PCI to DSP Bridge Controller
104cfe00 unknown unknown FireWire Host Controller
104cfe03 unknown unknown 12C01A FireWire Host Controller
@@ -1479,7 +1479,7 @@
10b2 Raytheon Company
10b3 Databook Inc
10b33106 unknown unknown DB87144
- 10b3b106 bridge i82365 DB87144
+ 10b3b106 bridge yenta_socket DB87144
10b4 STB Systems Inc
10b41b1d video Server:XFree86(s3virge) Velocity 128 3D
10b5 PLX Technology, Inc.
@@ -2464,10 +2464,10 @@
11790406 unknown unknown Tecra Video Capture device
11790407 unknown unknown DVD Decoder card (Version 2)
11790601 video Server:XFree86(trident) 601 (Trident Cyber 9525)
- 11790603 bridge i82365 ToPIC95 PCI to CardBus Bridge for Notebooks
- 1179060a bridge i82365 ToPIC95
+ 11790603 bridge i82365 ToPIC95-A PCI to CardBus Bridge for Notebooks
+ 1179060a bridge yenta_socket ToPIC95-B
1179060f bridge yenta_socket ToPIC97
- 11790617 unknown unknown ToPIC95 PCI to Cardbus Bridge with ZV Support
+ 11790617 bridge yenta_socket ToPIC100 PCI to Cardbus Bridge with ZV
Support
11790618 bridge ignore CPU to PCI and PCI to ISA bridge
11790701 unknown toshoboe FIR Port
11790804 unknown unknown TC6371AF SmartMedia Controller
@@ -2480,12 +2480,12 @@
117e T/R Systems
117f Integrated Circuit Systems
1180 Ricoh Co Ltd
- 11800465 bridge i82365 RL5c465
- 11800466 bridge i82365 RL5c466
- 11800475 bridge i82365 RL5c475
- 11800476 bridge i82365 RL5c476 II
- 11800477 bridge i82365 RL5c477
- 11800478 bridge i82365 RL5c478
+ 11800465 bridge yenta_socket RL5c465
+ 11800466 bridge yenta_socket RL5c466
+ 11800475 bridge yenta_socket RL5c475
+ 11800476 bridge yenta_socket RL5c476 II
+ 11800477 bridge yenta_socket RL5c477
+ 11800478 bridge yenta_socket RL5c478
11800522 unknown unknown R5C522 IEEE 1394 Controller
11800551 unknown unknown R5C551 IEEE 1394 Controller
11800552 unknown unknown R5C552 IEEE 1394 Controller
@@ -2797,10 +2797,10 @@
1217 O2 Micro, Inc.
12176729 bridge i82365 6729
1217673a bridge i82365 6730
- 12176832 bridge i82365 6832
- 12176836 bridge i82365 6836
- 12176872 bridge i82365 OZ6812 Cardbus Controller
- 12176925 unknown unknown OZ6922 Cardbus Controller
+ 12176832 bridge yenta_socket 6832/6833
+ 12176836 bridge yenta_socket 6836/6860
+ 12176872 bridge yenta_socket OZ6812 Cardbus Controller
+ 12176925 bridge yenta_socket OZ6922 Cardbus Controller
12176933 bridge yenta_socket OZ6933 Cardbus Controller
12176972 bridge yenta_socket OZ6912 Cardbus Controller
1218 Hybricon Corp.
@@ -4128,10 +4128,10 @@
15220100 unknown unknown PCI <-> IOBus Bridge
1523 MUSIC Semiconductors
1524 ENE Technology Inc
- 15241211 unknown unknown CB1211 Cardbus Controller
- 15241225 unknown unknown CB1225 Cardbus Controller
- 15241410 unknown unknown CB1410 Cardbus Controller
- 15241420 unknown unknown CB1420 Cardbus Controller
+ 15241211 bridge yenta_socket CB1211 Cardbus Controller
+ 15241225 bridge yenta_socket CB1225 Cardbus Controller
+ 15241410 bridge yenta_socket CB1410 Cardbus Controller
+ 15241420 bridge yenta_socket CB1420 Cardbus Controller
1525 IMPACT Technologies
1526 ISS, Inc
1527 SOLECTRON
@@ -4770,8 +4770,8 @@
80861162 unknown unknown Xscale 80200 Big Endian Companion Chip
80861200 unknown unknown Intel IXP1200 Network Processor
80861209 ethernet e100 82559ER
- 80861221 bridge i82365 82092AA_0
- 80861222 bridge i82365 82092AA_1
+ 80861221 bridge i82092 82092AA_0
+ 80861222 bridge i82092 82092AA_1
80861223 unknown unknown SAA7116
80861225 unknown unknown 82452KX/GX [Orion]
80861226 unknown unknown 82596
