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>

5 files changed, 20 insertions, 20 deletions

diff --git a/src/soc/intel/alderlake/pmc.c b/src/soc/intel/alderlake/pmc.c
index 0e0a568a88c5..6f9b03b16fc3 100644
--- a/src/soc/intel/alderlake/pmc.c
+++ b/src/soc/intel/alderlake/pmc.c
@@ -66,7 +66,7 @@ static void config_deep_sx(uint32_t deepsx_config)
 	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 @@ static void soc_pmc_fill_ssdt(const struct device *dev)
 	       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 @@ BOOT_STATE_INIT_ENTRY(BS_DEV_INIT_CHIPS, BS_ON_EXIT, pm1_enable_pwrbtn_smi, NULL
 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 817cdd77dcc1..d502e0675a1f 100644
--- a/src/soc/intel/cannonlake/pmc.c
+++ b/src/soc/intel/cannonlake/pmc.c
@@ -84,7 +84,7 @@ static void soc_pmc_read_resources(struct device *dev)
 	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 @@ static void pmc_init(struct device *dev)
 	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 @@ static void pmc_fill_ssdt(const struct device *dev)
 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 eeeceb511f23..bcc8c8b04fa6 100644
--- a/src/soc/intel/elkhartlake/pmc.c
+++ b/src/soc/intel/elkhartlake/pmc.c
@@ -53,7 +53,7 @@ static void config_deep_sx(uint32_t deepsx_config)
 	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 @@ static void soc_pmc_read_resources(struct device *dev)
 	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 @@ static void pmc_fill_ssdt(const struct device *dev)
 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 6223ed7eee98..a9fc52577951 100644
--- a/src/soc/intel/jasperlake/pmc.c
+++ b/src/soc/intel/jasperlake/pmc.c
@@ -53,7 +53,7 @@ static void config_deep_sx(uint32_t deepsx_config)
 	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 @@ static void soc_pmc_read_resources(struct device *dev)
 	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 @@ static void pmc_fill_ssdt(const struct device *dev)
 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 426d8a9ce961..ce37007116d9 100644
--- a/src/soc/intel/tigerlake/pmc.c
+++ b/src/soc/intel/tigerlake/pmc.c
@@ -65,7 +65,7 @@ static void config_deep_sx(uint32_t deepsx_config)
 	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 @@ static void soc_pmc_fill_ssdt(const struct device *dev)
 	       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 @@ BOOT_STATE_INIT_ENTRY(BS_DEV_INIT_CHIPS, BS_ON_EXIT, pm1_enable_pwrbtn_smi, NULL
 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