From 870d00144f5f9216c42a3517cb7d8721787a7275 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 29 Sep 2005 19:59:03 +0000 Subject: [PATCH] o Add a bunch of o2micro controller IDs o Add SMC34C90 to list as well, since I've found enough more data about it since my original research to know it is appropriate for this driver. --- sys/dev/pccbb/pccbb_pci.c | 7 +++++++ sys/dev/pccbb/pccbbdevid.h | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index 404cb752ae92..859e2516df45 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -195,7 +195,14 @@ static struct yenta_chipinfo { {PCIC_ID_OZ6922, "O2Micro OZ6922 PCI-CardBus Bridge", CB_O2MICRO}, {PCIC_ID_OZ6933, "O2Micro OZ6933 PCI-CardBus Bridge", CB_O2MICRO}, {PCIC_ID_OZ711E1, "O2Micro OZ711E1 PCI-CardBus Bridge", CB_O2MICRO}, + {PCIC_ID_OZ711EC1, "O2Micro OZ711EC1/M1 PCI-CardBus Bridge", CB_O2MICRO}, + {PCIC_ID_OZ711E2, "O2Micro OZ711E2 PCI-CardBus Bridge", CB_O2MICRO}, {PCIC_ID_OZ711M1, "O2Micro OZ711M1 PCI-CardBus Bridge", CB_O2MICRO}, + {PCIC_ID_OZ711M2, "O2Micro OZ711M2 PCI-CardBus Bridge", CB_O2MICRO}, + {PCIC_ID_OZ711M3, "O2Micro OZ711M3 PCI-CardBus Bridge", CB_O2MICRO}, + + /* SMC */ + {PCIC_ID_SMC34C90, "SMC 34C90 PCI-CardBus Bridge", CB_CIRRUS, /* sentinel */ {0 /* null id */, "unknown", CB_UNKNOWN}, diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h index 6db43829cde0..9f2cc46574d5 100644 --- a/sys/dev/pccbb/pccbbdevid.h +++ b/sys/dev/pccbb/pccbbdevid.h @@ -40,22 +40,26 @@ #define PCIC_ID_INTEL_82092AA_1 0x12228086ul /* 16bit I/O */ #define PCIC_ID_OMEGA_82C094 0x1221119bul /* 16bit I/O */ #define PCIC_ID_OZ6729 0x67291217ul /* 16bit I/O */ -#define PCIC_ID_OZ6730 0x673A1217ul /* 16bit I/O */ +#define PCIC_ID_OZ6730 0x673a1217ul /* 16bit I/O */ #define PCIC_ID_OZ6832 0x68321217ul /* Also 6833 */ #define PCIC_ID_OZ6860 0x68361217ul /* Also 6836 */ #define PCIC_ID_OZ6872 0x68721217ul /* Also 6812 */ #define PCIC_ID_OZ6912 0x69721217ul /* Also 6972 */ #define PCIC_ID_OZ6922 0x69251217ul #define PCIC_ID_OZ6933 0x69331217ul +#define PCIC_ID_OZ711EC1 0x71121217uk /* O2Micro 711EC1/M1 */ #define PCIC_ID_OZ711E1 0x71131217ul /* O2Micro 711E1 */ #define PCIC_ID_OZ711M1 0x71141217ul /* O2Micro 711M1 */ +#define PCIC_ID_OZ711E2 0x71e21217ul +#define PCIC_ID_OZ711M2 0x72121217ul +#define PCIC_ID_OZ711M3 0x72231217ul #define PCIC_ID_RICOH_RL5C465 0x04651180ul #define PCIC_ID_RICOH_RL5C466 0x04661180ul #define PCIC_ID_RICOH_RL5C475 0x04751180ul #define PCIC_ID_RICOH_RL5C476 0x04761180ul #define PCIC_ID_RICOH_RL5C477 0x04771180ul #define PCIC_ID_RICOH_RL5C478 0x04781180ul -#define PCIC_ID_SMC_34C90 0xb10610b3ul /* XXX */ +#define PCIC_ID_SMC_34C90 0xb10610b3ul #define PCIC_ID_TI1031 0xac13104cul #define PCIC_ID_TI1130 0xac12104cul #define PCIC_ID_TI1131 0xac15104cul