]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
x86, quirk: Fix SB600 revision check
authorAndreas Herrmann <andreas.herrmann3@amd.com>
Tue, 15 Mar 2011 14:31:37 +0000 (15:31 +0100)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 26 Jun 2011 16:47:03 +0000 (12:47 -0400)
commit 1d3e09a304e6c4e004ca06356578b171e8735d3c upstream.

Commit 7f74f8f28a2bd9db9404f7d364e2097a0c42cc12
(x86 quirk: Fix polarity for IRQ0 pin2 override on SB800
systems) introduced a regression. It removed some SB600 specific
code to determine the revision ID without adapting a
corresponding revision ID check for SB600.

See this mail thread:

  http://marc.info/?l=linux-kernel&m=129980296006380&w=2

This patch adapts the corresponding check to cover all SB600
revisions.

Tested-by: Wang Lei <f3d27b@gmail.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20110315143137.GD29499@alberich.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/x86/kernel/early-quirks.c

index ef01d3d6a5a95dc4312e618f4d61036bf974247a..f67a33c7f4156fd40354bf812b73ddc9a071fdc6 100644 (file)
@@ -161,7 +161,12 @@ static void __init ati_bugs_contd(int num, int slot, int func)
        if (rev >= 0x40)
                acpi_fix_pin2_polarity = 1;
 
-       if (rev > 0x13)
+       /*
+        * SB600: revisions 0x11, 0x12, 0x13, 0x14, ...
+        * SB700: revisions 0x39, 0x3a, ...
+        * SB800: revisions 0x40, 0x41, ...
+        */
+       if (rev >= 0x39)
                return;
 
        if (acpi_use_timer_override)