[commit] r6012 - in trunk/src: include/device southbridge/via/k8t890 southbridge/via/vt8237r

[repository service]

Author: ruik
Date: Tue Nov  2 21:54:37 2010
New Revision: 6012
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6012

Log:
This adds pci device ids and pci_driver structs for the K8T890 CF
variant. It also adds additional dev_find_device calls in k8t890_ctrl.c for
subfunctions 3 and 7.

Signed-off-by: Tobias Diedrich 
Acked-by: Rudolf Marek

Modified:
   trunk/src/include/device/pci_ids.h
   trunk/src/southbridge/via/k8t890/k8t890_ctrl.c
   trunk/src/southbridge/via/k8t890/k8t890_dram.c
   trunk/src/southbridge/via/k8t890/k8t890_error.c
   trunk/src/southbridge/via/k8t890/k8t890_host.c
   trunk/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
   trunk/src/southbridge/via/vt8237r/vt8237_ctrl.c

Modified: trunk/src/include/device/pci_ids.h
==============================================================================
--- trunk/src/include/device/pci_ids.h	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/include/device/pci_ids.h	Tue Nov  2 21:54:37 2010	(r6012)
@@ -1204,6 +1204,13 @@
 #define PCI_DEVICE_ID_VIA_K8T890CE_4	0x4238
 #define PCI_DEVICE_ID_VIA_K8T890CE_5	0x5238
 #define PCI_DEVICE_ID_VIA_K8T890CE_7	0x7238
+#define PCI_DEVICE_ID_VIA_K8T890CF_0	0x0351
+#define PCI_DEVICE_ID_VIA_K8T890CF_1	0x1351
+#define PCI_DEVICE_ID_VIA_K8T890CF_2	0x2351
+#define PCI_DEVICE_ID_VIA_K8T890CF_3	0x3351
+#define PCI_DEVICE_ID_VIA_K8T890CF_4	0x4351
+#define PCI_DEVICE_ID_VIA_K8T890CF_5	0x5351
+#define PCI_DEVICE_ID_VIA_K8T890CF_7	0x7351
 #define PCI_DEVICE_ID_VIA_K8M890CE_0	0x0336
 #define PCI_DEVICE_ID_VIA_K8M890CE_1	0x1336
 #define PCI_DEVICE_ID_VIA_K8M890CE_2	0x2336

Modified: trunk/src/southbridge/via/k8t890/k8t890_ctrl.c
==============================================================================
--- trunk/src/southbridge/via/k8t890/k8t890_ctrl.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/k8t890/k8t890_ctrl.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -36,8 +36,12 @@
    devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
    				   PCI_DEVICE_ID_VIA_K8T890CE_3, 0);

-		if (!devfun3)
-			devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
+	if (!devfun3)
+		devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
+					   PCI_DEVICE_ID_VIA_K8T890CF_3, 0);
+
+	if (!devfun3)
+		devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
    				   PCI_DEVICE_ID_VIA_K8M890CE_3, 0);

pci_write_config8(dev, 0x70, 0xc2);
@@ -175,6 +179,12 @@
    .device	= PCI_DEVICE_ID_VIA_K8T890CE_7,
 };

+static const struct pci_driver northbridge_driver_tcf __pci_driver = {
+	.ops	= &ctrl_ops,
+	.vendor	= PCI_VENDOR_ID_VIA,
+	.device	= PCI_DEVICE_ID_VIA_K8T890CF_7,
+};
+
 static const struct pci_driver northbridge_driver_m __pci_driver = {
    .ops	= &ctrl_ops,
    .vendor	= PCI_VENDOR_ID_VIA,

Modified: trunk/src/southbridge/via/k8t890/k8t890_dram.c
==============================================================================
--- trunk/src/southbridge/via/k8t890/k8t890_dram.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/k8t890/k8t890_dram.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -170,6 +170,12 @@
    .device	= PCI_DEVICE_ID_VIA_K8T890CE_3,
 };

+static const struct pci_driver northbridge_driver_tcf __pci_driver = {
+	.ops	= &dram_ops_t,
+	.vendor	= PCI_VENDOR_ID_VIA,
+	.device	= PCI_DEVICE_ID_VIA_K8T890CF_3,
+};
+
 static const struct pci_driver northbridge_driver_m __pci_driver = {
    .ops	= &dram_ops_m,
    .vendor	= PCI_VENDOR_ID_VIA,

Modified: trunk/src/southbridge/via/k8t890/k8t890_error.c
==============================================================================
--- trunk/src/southbridge/via/k8t890/k8t890_error.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/k8t890/k8t890_error.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -48,6 +48,12 @@
    .device	= PCI_DEVICE_ID_VIA_K8T890CE_1,
 };

+static const struct pci_driver northbridge_driver_tcf __pci_driver = {
+	.ops	= &error_ops,
+	.vendor	= PCI_VENDOR_ID_VIA,
+	.device	= PCI_DEVICE_ID_VIA_K8T890CF_1,
+};
+
 static const struct pci_driver northbridge_driver_m __pci_driver = {
    .ops	= &error_ops,
    .vendor	= PCI_VENDOR_ID_VIA,

Modified: trunk/src/southbridge/via/k8t890/k8t890_host.c
==============================================================================
--- trunk/src/southbridge/via/k8t890/k8t890_host.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/k8t890/k8t890_host.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -76,6 +76,12 @@
    .device	= PCI_DEVICE_ID_VIA_K8T890CE_0,
 };

+static const struct pci_driver northbridge_driver_tcf __pci_driver = {
+	.ops	= &host_ops_t,
+	.vendor	= PCI_VENDOR_ID_VIA,
+	.device	= PCI_DEVICE_ID_VIA_K8T890CF_0,
+};
+
 static const struct pci_driver northbridge_driver_m __pci_driver = {
    .ops	= &host_ops_m,
    .vendor	= PCI_VENDOR_ID_VIA,

Modified: trunk/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
==============================================================================
--- trunk/src/southbridge/via/k8t890/k8t890_traf_ctrl.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/k8t890/k8t890_traf_ctrl.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -144,6 +144,12 @@
    .device	= PCI_DEVICE_ID_VIA_K8T890CE_5,
 };

+static const struct pci_driver northbridge_driver_tcf __pci_driver = {
+	.ops	= &traf_ctrl_ops_t,
+	.vendor	= PCI_VENDOR_ID_VIA,
+	.device	= PCI_DEVICE_ID_VIA_K8T890CF_5,
+};
+
 static const struct pci_driver northbridge_driver_m __pci_driver = {
    .ops	= &traf_ctrl_ops_m,
    .vendor	= PCI_VENDOR_ID_VIA,

Modified: trunk/src/southbridge/via/vt8237r/vt8237_ctrl.c
==============================================================================
--- trunk/src/southbridge/via/vt8237r/vt8237_ctrl.c	Mon Nov  1 16:20:27 2010	(r6011)
+++ trunk/src/southbridge/via/vt8237r/vt8237_ctrl.c	Tue Nov  2 21:54:37 2010	(r6012)
@@ -37,6 +37,9 @@
    	devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
    				  PCI_DEVICE_ID_VIA_K8M890CE_3, 0);
    if (!devfun3)
+		devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,
+					  PCI_DEVICE_ID_VIA_K8T890CF_3, 0);
+	if (!devfun3)
    	die("Unknown NB");

/* CPU to PCI Flow Control 1 & 2, just fill in recommended. */
@@ -109,6 +112,9 @@
    if (!devfun7)
    	devfun7 = dev_find_device(PCI_VENDOR_ID_VIA,
    				  PCI_DEVICE_ID_VIA_K8M890CE_7, 0);
+	if (!devfun7)
+		devfun7 = dev_find_device(PCI_VENDOR_ID_VIA,
+					  PCI_DEVICE_ID_VIA_K8T890CF_7, 0);
    /* No pairing NB was found. */
    if (!devfun7)
    	return;