Patchwork [1/7] ASUS M2V support (v2): K8T890CF device ids (unchanged)

login
register
about
Submitter Tobias Diedrich
Date 2010-10-29 11:57:45
Message ID <20101029115745.GI31684@yumi.tdiedrich.de>
Download mbox | patch
Permalink /patch/2201/
State Accepted
Headers show

Comments

Tobias Diedrich - 2010-10-29 11:57:45
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 <ranma+coreboot@tdiedrich.de>

---
Rudolf Marek - 2010-11-02 20:55:01
Hi,

Acked-by: Rudolf Marek <r.marek@assembler.cz>

Committed revision 6012.

Thanks,
Rudolf


> ===================================================================
> --- src/southbridge/via/k8t890/k8t890_ctrl.c.orig	2010-10-27 11:34:19.000000000 +0200
> +++ src/southbridge/via/k8t890/k8t890_ctrl.c	2010-10-27 11:42:58.000000000 +0200
> @@ -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,
> Index: src/southbridge/via/vt8237r/vt8237_ctrl.c
> ===================================================================
> --- src/southbridge/via/vt8237r/vt8237_ctrl.c.orig	2010-10-27 11:34:19.000000000 +0200
> +++ src/southbridge/via/vt8237r/vt8237_ctrl.c	2010-10-27 11:48:47.000000000 +0200
> @@ -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;
> Index: src/include/device/pci_ids.h
> ===================================================================
> --- src/include/device/pci_ids.h.orig	2010-10-27 11:34:19.000000000 +0200
> +++ src/include/device/pci_ids.h	2010-10-27 11:40:16.000000000 +0200
> @@ -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
>

Patch

Index: src/southbridge/via/k8t890/k8t890_host.c
===================================================================
--- src/southbridge/via/k8t890/k8t890_host.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/k8t890/k8t890_host.c	2010-10-27 11:40:16.000000000 +0200
@@ -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,
Index: src/southbridge/via/k8t890/k8t890_traf_ctrl.c
===================================================================
--- src/southbridge/via/k8t890/k8t890_traf_ctrl.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/k8t890/k8t890_traf_ctrl.c	2010-10-27 11:40:16.000000000 +0200
@@ -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,
Index: src/southbridge/via/k8t890/k8t890_dram.c
===================================================================
--- src/southbridge/via/k8t890/k8t890_dram.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/k8t890/k8t890_dram.c	2010-10-27 11:40:16.000000000 +0200
@@ -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,
Index: src/southbridge/via/k8t890/k8t890_error.c
===================================================================
--- src/southbridge/via/k8t890/k8t890_error.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/k8t890/k8t890_error.c	2010-10-27 11:40:16.000000000 +0200
@@ -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,
Index: src/southbridge/via/k8t890/k8t890_ctrl.c
===================================================================
--- src/southbridge/via/k8t890/k8t890_ctrl.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/k8t890/k8t890_ctrl.c	2010-10-27 11:42:58.000000000 +0200
@@ -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,
Index: src/southbridge/via/vt8237r/vt8237_ctrl.c
===================================================================
--- src/southbridge/via/vt8237r/vt8237_ctrl.c.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/southbridge/via/vt8237r/vt8237_ctrl.c	2010-10-27 11:48:47.000000000 +0200
@@ -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;
Index: src/include/device/pci_ids.h
===================================================================
--- src/include/device/pci_ids.h.orig	2010-10-27 11:34:19.000000000 +0200
+++ src/include/device/pci_ids.h	2010-10-27 11:40:16.000000000 +0200
@@ -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