diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:46:22 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:46:22 +0300 |
| commit | 7d40efd67dd313826a12dc4b03635ece97bb6d04 (patch) | |
| tree | 08765befd3ce627bdcb6c1fc484132b76c435dfa /drivers/platform | |
| parent | d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b (diff) | |
| parent | ab8131028710d009ab93d6bffd2a2749ade909b0 (diff) | |
| download | linux-7d40efd67dd313826a12dc4b03635ece97bb6d04.tar.xz | |
Merge branch 'x86/platform' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/amd/pmc/pmc-quirks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c index b4f49720c87f..b706b1f4d94b 100644 --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c @@ -11,6 +11,7 @@ #include <linux/dmi.h> #include <linux/io.h> #include <linux/ioport.h> +#include <asm/amd/fch.h> #include "pmc.h" @@ -20,7 +21,7 @@ struct quirk_entry { }; static struct quirk_entry quirk_s2idle_bug = { - .s2idle_bug_mmio = 0xfed80380, + .s2idle_bug_mmio = FCH_PM_BASE + FCH_PM_SCRATCH, }; static struct quirk_entry quirk_spurious_8042 = { |