soc/intel/{cnl,jsl,tgl,ehl,adl}: rename PMC device init/enable callbacks
The current names of the PMC init/enable callbacks are very confusing.
Rename them.
Change-Id: I69f54f3b4e1ea9a9b4fa5c8dd9c0d454d7cd1283
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57995
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/soc/intel/alderlake/pmc.c b/src/soc/intel/alderlake/pmc.c
index 0e0a568a..6f9b03b 100644
--- a/src/soc/intel/alderlake/pmc.c
+++ b/src/soc/intel/alderlake/pmc.c
@@ -66,7 +66,7 @@
write32(pmcbase + DSX_CFG, reg);
}
-static void pmc_init(struct device *dev)
+static void soc_pmc_enable(struct device *dev)
{
const config_t *config = config_of_soc();
@@ -140,7 +140,7 @@
dev_path(dev));
}
-static void soc_acpi_mode_init(struct device *dev)
+static void soc_pmc_init(struct device *dev)
{
/*
* pmc_set_acpi_mode() should be delayed until BS_DEV_INIT in order
@@ -165,8 +165,8 @@
struct device_operations pmc_ops = {
.read_resources = soc_pmc_read_resources,
.set_resources = noop_set_resources,
- .init = soc_acpi_mode_init,
- .enable = pmc_init,
+ .init = soc_pmc_init,
+ .enable = soc_pmc_enable,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt = soc_pmc_fill_ssdt,
#endif
diff --git a/src/soc/intel/cannonlake/pmc.c b/src/soc/intel/cannonlake/pmc.c
index 817cdd7..d502e06 100644
--- a/src/soc/intel/cannonlake/pmc.c
+++ b/src/soc/intel/cannonlake/pmc.c
@@ -84,7 +84,7 @@
res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}
-static void pmc_init(struct device *dev)
+static void soc_pmc_enable(struct device *dev)
{
const config_t *config = config_of_soc();
@@ -98,7 +98,7 @@
config_deep_sx(config->deep_sx_config);
}
-static void soc_acpi_mode_init(struct device *dev)
+static void soc_pmc_init(struct device *dev)
{
/*
* PMC initialization happens earlier for this SoC because FSP-Silicon
@@ -129,8 +129,8 @@
struct device_operations pmc_ops = {
.read_resources = soc_pmc_read_resources,
.set_resources = noop_set_resources,
- .init = soc_acpi_mode_init,
- .enable = pmc_init,
+ .init = soc_pmc_init,
+ .enable = soc_pmc_enable,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt = pmc_fill_ssdt,
#endif
diff --git a/src/soc/intel/elkhartlake/pmc.c b/src/soc/intel/elkhartlake/pmc.c
index eeeceb5..bcc8c8b 100644
--- a/src/soc/intel/elkhartlake/pmc.c
+++ b/src/soc/intel/elkhartlake/pmc.c
@@ -53,7 +53,7 @@
write32(pmcbase + DSX_CFG, reg);
}
-static void pmc_init(struct device *dev)
+static void soc_pmc_enable(struct device *dev)
{
const config_t *config = config_of_soc();
@@ -80,7 +80,7 @@
res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}
-static void soc_acpi_mode_init(struct device *dev)
+static void soc_pmc_init(struct device *dev)
{
/*
* pmc_set_acpi_mode() should be delayed until BS_DEV_INIT in order
@@ -103,8 +103,8 @@
struct device_operations pmc_ops = {
.read_resources = soc_pmc_read_resources,
.set_resources = noop_set_resources,
- .init = soc_acpi_mode_init,
- .enable = pmc_init,
+ .init = soc_pmc_init,
+ .enable = soc_pmc_enable,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt = pmc_fill_ssdt,
#endif
diff --git a/src/soc/intel/jasperlake/pmc.c b/src/soc/intel/jasperlake/pmc.c
index 6223ed7..a9fc525 100644
--- a/src/soc/intel/jasperlake/pmc.c
+++ b/src/soc/intel/jasperlake/pmc.c
@@ -53,7 +53,7 @@
write32(pmcbase + DSX_CFG, reg);
}
-static void pmc_init(struct device *dev)
+static void soc_pmc_enable(struct device *dev)
{
const config_t *config = config_of_soc();
@@ -80,7 +80,7 @@
res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}
-static void soc_acpi_mode_init(struct device *dev)
+static void soc_pmc_init(struct device *dev)
{
/*
* pmc_set_acpi_mode() should be delayed until BS_DEV_INIT in order
@@ -111,8 +111,8 @@
struct device_operations pmc_ops = {
.read_resources = soc_pmc_read_resources,
.set_resources = noop_set_resources,
- .init = soc_acpi_mode_init,
- .enable = pmc_init,
+ .init = soc_pmc_init,
+ .enable = soc_pmc_enable,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt = pmc_fill_ssdt,
#endif
diff --git a/src/soc/intel/tigerlake/pmc.c b/src/soc/intel/tigerlake/pmc.c
index 426d8a9..ce37007 100644
--- a/src/soc/intel/tigerlake/pmc.c
+++ b/src/soc/intel/tigerlake/pmc.c
@@ -65,7 +65,7 @@
write32(pmcbase + DSX_CFG, reg);
}
-static void pmc_init(struct device *dev)
+static void soc_pmc_enable(struct device *dev)
{
const config_t *config = config_of_soc();
@@ -139,7 +139,7 @@
dev_path(dev));
}
-static void soc_acpi_mode_init(struct device *dev)
+static void soc_pmc_init(struct device *dev)
{
/*
* pmc_set_acpi_mode() should be delayed until BS_DEV_INIT in order
@@ -164,8 +164,8 @@
struct device_operations pmc_ops = {
.read_resources = soc_pmc_read_resources,
.set_resources = noop_set_resources,
- .init = soc_acpi_mode_init,
- .enable = pmc_init,
+ .init = soc_pmc_init,
+ .enable = soc_pmc_enable,
#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt = soc_pmc_fill_ssdt,
#endif