From 60035bdf1f8e7acd2360f708648e9223a56efdb0 Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 18 Apr 2001 05:45:15 +0000 Subject: Add some more O2Micro devices I gleened from the web site/linux pcmcia cs. Add TI4451 as well. These are untested since I don't have the hardware to test against. Also, some O2Micro devices are #define w/o numbers as place holders so that I can encourage people to submit them when they appear in the channels. --- sys/dev/pccbb/pccbb.c | 8 ++++++-- sys/dev/pccbb/pccbbreg.h | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index c1637f42..33d7842 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -146,6 +146,8 @@ struct yenta_chipinfo { PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32}, {PCI_DEVICE_ID_PCIC_TI1451, "TI1451 PCI-CardBus Bridge", CB_TI12XX, PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32}, + {PCI_DEVICE_ID_PCIC_TI4451, "TI4451 PCI-CardBus Bridge", CB_TI12XX, + PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32}, /* Ricoh chips */ {PCI_DEVICE_ID_RICOH_RL5C465, "RF5C465 PCI-CardBus Bridge", @@ -176,9 +178,11 @@ struct yenta_chipinfo { CB_CIRRUS, PCCBB_PCIC_MEM_32}, /* 02Micro */ - {PCI_DEVICE_ID_PCIC_OZ6832, "O2Mirco OZ6832 PCI-CardBus Bridge", + {PCI_DEVICE_ID_PCIC_OZ6832, "O2Mirco OZ6832/6833 PCI-CardBus Bridge", + CB_CIRRUS, PCCBB_PCIC_MEM_32}, + {PCI_DEVICE_ID_PCIC_OZ6860, "O2Mirco OZ6836/6860 PCI-CardBus Bridge", CB_CIRRUS, PCCBB_PCIC_MEM_32}, - {PCI_DEVICE_ID_PCIC_OZ6872, "O2Mirco OZ6872 PCI-CardBus Bridge", + {PCI_DEVICE_ID_PCIC_OZ6872, "O2Mirco OZ6812/6872 PCI-CardBus Bridge", CB_CIRRUS, PCCBB_PCIC_MEM_32}, /* sentinel */ diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h index 3127ada..9580999 100644 --- a/sys/dev/pccbb/pccbbreg.h +++ b/sys/dev/pccbb/pccbbreg.h @@ -160,8 +160,12 @@ /* Vendor/Device IDs */ #define PCI_DEVICE_ID_PCIC_OZ6729 0x67291217ul #define PCI_DEVICE_ID_PCIC_OZ6730 0x673A1217ul -#define PCI_DEVICE_ID_PCIC_OZ6832 0x68321217ul -#define PCI_DEVICE_ID_PCIC_OZ6872 0x68721217ul +#define PCI_DEVICE_ID_PCIC_OZ6832 0x68321217ul /* Also 6833 */ +#define PCI_DEVICE_ID_PCIC_OZ6860 0x68361216ul /* Also 6836? */ +#define PCI_DEVICE_ID_PCIC_OZ6872 0x68721217ul /* Also 6812 */ +#define PCI_DEVICE_ID_PCIC_OZ6912 +#define PCI_DEVICE_ID_PCIC_OZ6922 +#define PCI_DEVICE_ID_PCIC_OZ6933 #define PCI_DEVICE_ID_PCIC_CLPD6729 0x11001013ul #define PCI_DEVICE_ID_PCIC_CLPD6832 0x11101013ul #define PCI_DEVICE_ID_PCIC_CLPD6833 0x11131013ul @@ -178,6 +182,7 @@ #define PCI_DEVICE_ID_PCIC_TI1420 0xac51104cul #define PCI_DEVICE_ID_PCIC_TI1450 0xac1b104cul #define PCI_DEVICE_ID_PCIC_TI1451 0xac52104cul +#define PCI_DEVICE_ID_PCIC_TI4451 0xac42104cul #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x06031179ul #define PCI_DEVICE_ID_TOSHIBA_TOPIC95B 0x060a1179ul #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f1179ul -- cgit v1.1