diff options
| author | Mark Brown <broonie@kernel.org> | 2024-09-12 12:38:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-09-12 12:38:44 +0100 |
| commit | f10d52087cbe85dcff2af3dc94c5b9d06e6d4b9a (patch) | |
| tree | d07ff0a3767fbb6118505de85ad657f78f512c06 /drivers/platform/x86/amd/pmc/pmc.c | |
| parent | 740c1c84bfa3d8c63bd3b01fb570e7452f51fbd8 (diff) | |
| parent | b787a33864121a565aeb0e88561bf6062a19f99c (diff) | |
spi: Merge up fixes
A patch for Qualcomm depends on some fixes.
Diffstat (limited to 'drivers/platform/x86/amd/pmc/pmc.c')
| -rw-r--r-- | drivers/platform/x86/amd/pmc/pmc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index a3d881f6e5d9..c3e51f0a5c33 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -764,6 +764,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) case AMD_CPU_ID_CB: case AMD_CPU_ID_PS: case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT: + case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT: return MSG_OS_HINT_RN; } return -EINVAL; @@ -967,6 +968,7 @@ static const struct pci_device_id pmc_pci_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SP) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) }, { } }; |