diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2024-01-02 13:13:01 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2024-01-02 13:13:01 +0100 |
| commit | 2ad815797ef01136091e502944e05b6794b9e5b8 (patch) | |
| tree | b2ddef3601a2e5a71d581c377ff0979e8c4b962b /drivers/platform/x86/intel/pmc/adl.c | |
| parent | 27f2b08735c90d0f6bd5888edb58bbce7fcf22a8 (diff) | |
| parent | 70681aa0746ae61d7668b9f651221fad5e30c71e (diff) | |
Merge tag 'platform-drivers-x86-v6.7-6' into pdx86/for-next
Merge the 'platform-drivers-x86-v6.7-6' fixes into pdx86/for-next
so that the "Intel PMC GBE LTR regression" fixes can also be
applied to the new Arrow Lake and Lunar Lake platform support
code in pdx86/for-next .
Diffstat (limited to 'drivers/platform/x86/intel/pmc/adl.c')
| -rw-r--r-- | drivers/platform/x86/intel/pmc/adl.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/platform/x86/intel/pmc/adl.c b/drivers/platform/x86/intel/pmc/adl.c index 882f2d5d8937..e7878558fd90 100644 --- a/drivers/platform/x86/intel/pmc/adl.c +++ b/drivers/platform/x86/intel/pmc/adl.c @@ -316,6 +316,9 @@ int adl_core_init(struct pmc_dev *pmcdev) struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN]; int ret; + pmcdev->suspend = cnl_suspend; + pmcdev->resume = cnl_resume; + pmc->map = &adl_reg_map; ret = get_primary_reg_base(pmc); if (ret) @@ -323,11 +326,5 @@ int adl_core_init(struct pmc_dev *pmcdev) pmc_core_get_low_power_modes(pmcdev); - /* Due to a hardware limitation, the GBE LTR blocks PC10 - * when a cable is attached. Tell the PMC to ignore it. - */ - dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n"); - pmc_core_send_ltr_ignore(pmcdev, 3); - return 0; } |