| From daniel.ritz-ml@swissonline.ch Fri Aug 18 07:50:50 2006 |
| From: Daniel Ritz <daniel.ritz-ml@swissonline.ch> |
| To: Greg KH <gregkh@suse.de>, Andrew Morton <akpm@osdl.org> |
| Subject: PCI: fix ICH6 quirks |
| Date: Fri, 18 Aug 2006 16:50:40 +0200 |
| Cc: Jean Delvare <khali@linux-fr.org>, |
| "linux-kernel" <linux-kernel@vger.kernel.org>, |
| "linux-pci" <linux-pci@atrey.karlin.mff.cuni.cz> |
| Content-Disposition: inline |
| Message-Id: <200608181650.41869.daniel.ritz-ml@swissonline.ch> |
| |
| From: Daniel Ritz <daniel.ritz-ml@swissonline.ch> |
| |
| [PATCH] PCI: fix ICH6 quirks |
| |
| - add the ICH6(R) LPC to the ICH6 ACPI quirks. currently only the ICH6-M is |
| handled. [ PCI_DEVICE_ID_INTEL_ICH6_1 is the ICH6-M LPC, ICH6_0 is the ICH6(R) ] |
| - remove the wrong quirk calling asus_hides_smbus_lpc() for ICH6. the register |
| modified in asus_hides_smbus_lpc() has a different meaning in ICH6. |
| |
| Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> |
| Cc: Jean Delvare <khali@linux-fr.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/pci/quirks.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- linux-2.6.17.9.orig/drivers/pci/quirks.c |
| +++ linux-2.6.17.9/drivers/pci/quirks.c |
| @@ -427,6 +427,7 @@ static void __devinit quirk_ich6_lpc_acp |
| pci_read_config_dword(dev, 0x48, ®ion); |
| quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH6 GPIO"); |
| } |
| +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, quirk_ich6_lpc_acpi ); |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, quirk_ich6_lpc_acpi ); |
| |
| /* |
| @@ -1043,7 +1044,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc ); |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc ); |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, asus_hides_smbus_lpc ); |
| -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, asus_hides_smbus_lpc ); |
| |
| static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev) |
| { |
