summaryrefslogtreecommitdiff
path: root/drivers/platform/x86/intel/pmc/adl.c
diff options
context:
space:
mode:
authorXi Pardee <xi.pardee@intel.com>2023-06-13 15:53:41 -0700
committerHans de Goede <hdegoede@redhat.com>2023-06-20 12:51:08 +0200
commit804951203aa541ad6720c9726c173d18aeb3ab6b (patch)
tree0d57d9114d71599e612a5898b4ee8ab0cb569850 /drivers/platform/x86/intel/pmc/adl.c
parent9682cfd1973d01e43c2764c662e6d3291ddf770d (diff)
platform/x86:intel/pmc: Combine core_init() and core_configure()
Combine core_init() and core_configure() functions to have a cleaner setup for platforms. Signed-off-by: Xi Pardee <xi.pardee@intel.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20230613225347.2720665-3-rajvi.jingar@linux.intel.com Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform/x86/intel/pmc/adl.c')
-rw-r--r--drivers/platform/x86/intel/pmc/adl.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/platform/x86/intel/pmc/adl.c b/drivers/platform/x86/intel/pmc/adl.c
index 5cbd40979f2a..f678ce308cc7 100644
--- a/drivers/platform/x86/intel/pmc/adl.c
+++ b/drivers/platform/x86/intel/pmc/adl.c
@@ -309,17 +309,20 @@ const struct pmc_reg_map adl_reg_map = {
.lpm_live_status_offset = ADL_LPM_LIVE_STATUS_OFFSET,
};
-void adl_core_configure(struct pmc_dev *pmcdev)
+int adl_core_init(struct pmc_dev *pmcdev)
{
+ int ret;
+
+ pmcdev->map = &adl_reg_map;
+ ret = get_primary_reg_base(pmcdev);
+ if (ret)
+ return ret;
+
/* 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);
-}
-void adl_core_init(struct pmc_dev *pmcdev)
-{
- pmcdev->map = &adl_reg_map;
- pmcdev->core_configure = adl_core_configure;
+ return 0;
}