[coreboot-gerrit] Patch set updated for coreboot: 48e2359 intel/i945: Add PCI ID of IGD on Intel 945G/945GZ/945GC

[HAOUAS Elyes (ehaouas@noos.fr)]

HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6192

-gerrit

commit 48e23594513563dbafd03a8f60dfcc61b93dc2ca
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Fri Jul 11 21:29:28 2014 +0200

    intel/i945: Add PCI ID of IGD on Intel 945G/945GZ/945GC
    
    Change-Id: I263eeba8fcfdfe9253449913bb46956c796ac825
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 src/include/device/pci_ids.h       | 7 +++++++
 src/northbridge/intel/i945/Kconfig | 3 ++-
 src/northbridge/intel/i945/gma.c   | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 4f15c37..dd7f037 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2357,6 +2357,13 @@
 #define PCI_DEVICE_ID_INTEL_82801GR_AC97_MODEM	0x27de
 #define PCI_DEVICE_ID_INTEL_82801GR_AC97_AUDIO	0x27dd
 #define PCI_DEVICE_ID_INTEL_82801GR_IDE		0x27df
+#if CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM
+#define PCI_DEVICE_ID_INTEL_I945_FUNC0		0x27a2
+#define PCI_DEVICE_ID_INTEL_I945_FUNC1		0x27a6
+#elif CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC
+#define PCI_DEVICE_ID_INTEL_I945_FUNC0		0x2772
+#define PCI_DEVICE_ID_INTEL_I945_FUNC1		0x2776
+#endif
 
 /* Intel 82801GDH (ICH7DH) */
 #define PCI_DEVICE_ID_INTEL_82801GDH_LAN	0x27dc
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index 360b2ab..99ea1fd 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -41,7 +41,8 @@ config BOOTBLOCK_NORTHBRIDGE_INIT
 
 config VGA_BIOS_ID
 	string
-	default "8086,27a2"
+	default "8086,27a2" if NORTHBRIDGE_INTEL_SUBTYPE_I945GM
+	default "8086,2772" if NORTHBRIDGE_INTEL_SUBTYPE_I945GC
 
 config CHANNEL_XOR_RANDOMIZATION
 	bool
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index c04483e..6a2ef89 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -144,11 +144,11 @@ static struct device_operations gma_func1_ops = {
 static const struct pci_driver i945_gma_func0_driver __pci_driver = {
 	.ops	= &gma_func0_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27a2,
+	.device	= PCI_DEVICE_ID_INTEL_I945_FUNC0,
 };
 
 static const struct pci_driver i945_gma_func1_driver __pci_driver = {
 	.ops	= &gma_func1_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27a6,
+	.device	= PCI_DEVICE_ID_INTEL_I945_FUNC1,
 };