From cbfaea6aaac35cbc871b3d7054acd14a8f749f2d Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 22 Aug 2003 08:49:56 +0000
Subject: [PATCH] Add newly discovered ENE Technologies CardBus bridges to the
 list: 	CB710, CB720, CB1211, CB1225, CB1410 and CB1420 These are likely
 licensed designed from TI, and the Linux PCMCIA code treats them as TI chips.

Add comment, but no ID for the 711E1 from O2Micro.
---
 sys/dev/pccbb/pccbb.c      | 9 +++++++++
 sys/dev/pccbb/pccbbdevid.h | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index cfc5de057bbc..27a7fb1fbcca 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -154,6 +154,14 @@ struct yenta_chipinfo {
 	{PCIC_ID_TI4451, "TI4451 PCI-CardBus Bridge", CB_TI12XX},
 	{PCIC_ID_TI4510, "TI4510 PCI-CardBus Bridge", CB_TI12XX},
 
+	/* ENE */
+	{PCIC_ID_ENE_CB710, "ENE CB720 PCI-CardBus Bridge", CB_TI12XX},
+	{PCIC_ID_ENE_CB720, "ENE CB720 PCI-CardBus Bridge", CB_TI12XX},
+	{PCIC_ID_ENE_CB1211, "ENE CB1211 PCI-CardBus Bridge", CB_TI12XX},
+	{PCIC_ID_ENE_CB1225, "ENE CB1225 PCI-CardBus Bridge", CB_TI12XX},
+	{PCIC_ID_ENE_CB1410, "ENE CB1410 PCI-CardBus Bridge", CB_TI12XX},
+	{PCIC_ID_ENE_CB1420, "ENE CB1420 PCI-CardBus Bridge", CB_TI12XX},
+
 	/* Ricoh chips */
 	{PCIC_ID_RICOH_RL5C465, "RF5C465 PCI-CardBus Bridge", CB_RF5C46X},
 	{PCIC_ID_RICOH_RL5C466, "RF5C466 PCI-CardBus Bridge", CB_RF5C46X},
@@ -180,6 +188,7 @@ struct yenta_chipinfo {
 	{PCIC_ID_OZ6912, "O2Micro OZ6912/6972 PCI-CardBus Bridge", CB_O2MICRO},
 	{PCIC_ID_OZ6922, "O2Micro OZ6922 PCI-CardBus Bridge", CB_O2MICRO},
 	{PCIC_ID_OZ6933, "O2Micro OZ6933 PCI-CardBus Bridge", CB_O2MICRO},
+	/* 711E1 */
 
 	/* sentinel */
 	{0 /* null id */, "unknown", CB_UNKNOWN},
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index 6639c6a5b1eb..67b4a23248e0 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -31,6 +31,12 @@
 #define	PCIC_ID_CLPD6832	0x11101013ul
 #define	PCIC_ID_CLPD6833	0x11131013ul
 #define	PCIC_ID_CLPD6834	0x11121013ul
+#define PCIC_ID_ENE_CB710	0x14111524ul
+#define PCIC_ID_ENE_CB720	0x14211524ul	/* ??? */
+#define PCIC_ID_ENE_CB1211	0x12111524ul	/* ??? */
+#define PCIC_ID_ENE_CB1225	0x12251524ul	/* ??? */
+#define PCIC_ID_ENE_CB1410	0x14101524ul
+#define PCIC_ID_ENE_CB1420	0x14201524ul
 #define	PCIC_ID_INTEL_82092AA_0	0x12218086ul	/* 16bit I/O */
 #define	PCIC_ID_INTEL_82092AA_1	0x12228086ul	/* 16bit I/O */
 #define	PCIC_ID_OMEGA_82C094	0x1221119bul	/* 16bit I/O */
@@ -42,6 +48,7 @@
 #define	PCIC_ID_OZ6912		0x69721217ul	/* Also 6972 */
 #define	PCIC_ID_OZ6922		0x69251217ul
 #define	PCIC_ID_OZ6933		0x69331217ul
+/* O2Micro 711E1 */
 #define	PCIC_ID_RICOH_RL5C465	0x04651180ul
 #define	PCIC_ID_RICOH_RL5C466	0x04661180ul
 #define	PCIC_ID_RICOH_RL5C475	0x04751180ul