config: rename HOSTCMD_ESPI_* to HOST_INTERFACE_ESPI_*

Rename ESPI additional configs to match the name of base config
that selects ESPI as HOST_INTERFACE.

BUG=b:195416058
BRANCH=main
TEST=zmake testall && make buildall

Change-Id: I137449a1a58b1ea0d9794ebc0900e1b68413819d
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3291744
Reviewed-by: Sam Hurst <shurst@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

6 files changed, 23 insertions, 22 deletions

diff --git a/chip/it83xx/lpc.c b/chip/it83xx/lpc.c
index d9b869d571..d985577a0c 100644
--- a/chip/it83xx/lpc.c
+++ b/chip/it83xx/lpc.c
@@ -138,7 +138,7 @@ static void lpc_generate_smi(void)
 {
 #ifdef CONFIG_HOST_INTERFACE_ESPI
 	espi_vw_set_wire(VW_SMI_L, 0);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	espi_vw_set_wire(VW_SMI_L, 1);
 #else
 	gpio_set_level(GPIO_PCH_SMI_L, 0);
@@ -151,7 +151,7 @@ static void lpc_generate_sci(void)
 {
 #ifdef CONFIG_HOST_INTERFACE_ESPI
 	espi_vw_set_wire(VW_SCI_L, 0);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	espi_vw_set_wire(VW_SCI_L, 1);
 #else
 	gpio_set_level(GPIO_PCH_SCI_L, 0);
diff --git a/chip/mchp/espi.c b/chip/mchp/espi.c
index 6d98eba913..a04ce6c478 100644
--- a/chip/mchp/espi.c
+++ b/chip/mchp/espi.c
@@ -44,22 +44,22 @@
 #endif
 
 /* Default config to use maximum frequency */
-#ifndef CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ
+#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ
 #if defined(CHIP_FAMILY_MEC172X)
-#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_66M
+#define CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_66M
 #else
-#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_50M
+#define CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ MCHP_ESPI_CAP1_MAX_FREQ_50M
 #endif
 #endif
 
 /* Default config to support all modes */
-#ifndef CONFIG_HOSTCMD_ESPI_EC_MODE
-#define CONFIG_HOSTCMD_ESPI_EC_MODE MCHP_ESPI_CAP1_ALL_MODE
+#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_MODE
+#define CONFIG_HOST_INTERFACE_ESPI_EC_MODE MCHP_ESPI_CAP1_ALL_MODE
 #endif
 
 /* Default config to support all channels */
-#ifndef CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP
-#define CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP
+#ifndef CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP
+#define CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP MCHP_ESPI_CAP0_ALL_CHAN_SUPP
 #endif
 /*
  * eSPI slave to master virtual wire pulse timeout.
@@ -695,7 +695,7 @@ int espi_vw_pulse_wire(enum espi_vw_signal signal, int pulse_level)
 		return rc;
 
 	/* Ensure a minimum pulse width is met. */
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 
 	/* drive to requested active state */
 	rc = espi_vw_s2m_set_w4m(ridx, src_num, level);
@@ -1335,14 +1335,15 @@ void espi_init(void)
 	gpio_config_module(MODULE_LPC, 1);
 
 	/* Set channel */
-	MCHP_ESPI_IO_CAP0 = CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP;
+	MCHP_ESPI_IO_CAP0 = CONFIG_HOST_INTERFACE_ESPI_EC_CHAN_BITMAP;
 
 	/* Set eSPI frequency & mode */
 	MCHP_ESPI_IO_CAP1 =
 		(MCHP_ESPI_IO_CAP1 &
 		 (~(MCHP_ESPI_CAP1_MAX_FREQ_MASK | MCHP_ESPI_CAP1_IO_MASK))) |
-		CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ |
-		(CONFIG_HOSTCMD_ESPI_EC_MODE << MCHP_ESPI_CAP1_IO_BITPOS);
+		CONFIG_HOST_INTERFACE_ESPI_EC_MAX_FREQ |
+		(CONFIG_HOST_INTERFACE_ESPI_EC_MODE
+		 << MCHP_ESPI_CAP1_IO_BITPOS);
 
 #ifdef CONFIG_HOST_INTERFACE_ESPI
 	MCHP_ESPI_IO_PLTRST_SRC = MCHP_ESPI_PLTRST_SRC_VW;
diff --git a/chip/mchp/lpc.c b/chip/mchp/lpc.c
index a6536bd7f4..0d30afd640 100644
--- a/chip/mchp/lpc.c
+++ b/chip/mchp/lpc.c
@@ -108,7 +108,7 @@ static void lpc_generate_sci(void)
 	espi_vw_pulse_wire(VW_SCI_L, 0);
 #else
 	MCHP_ACPI_PM_STS |= 1;
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	MCHP_ACPI_PM_STS &= ~1;
 #endif
 #endif
diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c
index 58dc65461c..6b28b10321 100644
--- a/chip/mec1322/lpc.c
+++ b/chip/mec1322/lpc.c
@@ -83,7 +83,7 @@ static void lpc_generate_sci(void)
 	gpio_set_level(CONFIG_SCI_GPIO, 1);
 #else
 	MEC1322_ACPI_PM_STS |= 1;
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	MEC1322_ACPI_PM_STS &= ~1;
 #endif
 }
diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c
index dfd3befa5b..cd08fc2783 100644
--- a/chip/npcx/espi.c
+++ b/chip/npcx/espi.c
@@ -62,7 +62,7 @@ struct vw_event_t {
 /* Default settings of VWEVMS registers (Please refer Table.43/44) */
 static const struct vwevms_config_t espi_in_list[] = {
 /* IDX EN ENPL ENESP IE/WE          VW Event Bit 0 - 3 (M->S)         */
-#ifdef CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST
+#ifdef CONFIG_HOST_INTERFACE_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST
 	{ 0x02, 1, 0, 1, 1 }, /* SLP_S3#,   SLP_S4#,    SLP_S5#,   Reserve */
 #else
 	{ 0x02, 1, 0, 0, 1 }, /* SLP_S3#,   SLP_S4#,    SLP_S5#,   Reserve */
diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c
index 1227b4c53f..70b6f6ad2c 100644
--- a/chip/npcx/lpc.c
+++ b/chip/npcx/lpc.c
@@ -152,7 +152,7 @@ static void lpc_generate_smi(void)
 	/* Generate a falling edge */
 	espi_wait_vw_not_dirty(VW_SMI_L, ESPI_DIRTY_WAIT_TIME_US);
 	NPCX_HIPMIC(PMC_ACPI) = NPCX_VW_SMI(0);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	espi_wait_vw_not_dirty(VW_SMI_L, ESPI_DIRTY_WAIT_TIME_US);
 
 	/* Set signal high */
@@ -160,10 +160,10 @@ static void lpc_generate_smi(void)
 #else
 	/* SET SMIB bit to pull SMI_L to high.*/
 	SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	/* Generate a falling edge */
 	CLEAR_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	/* Set signal high */
 	SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SMIB);
 #endif
@@ -199,7 +199,7 @@ static void lpc_generate_sci(void)
 	/* Generate a falling edge */
 	espi_wait_vw_not_dirty(VW_SCI_L, ESPI_DIRTY_WAIT_TIME_US);
 	NPCX_HIPMIC(PMC_ACPI) = NPCX_VW_SCI(0);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	espi_wait_vw_not_dirty(VW_SCI_L, ESPI_DIRTY_WAIT_TIME_US);
 
 	/* Set signal high */
@@ -207,10 +207,10 @@ static void lpc_generate_sci(void)
 #else
 	/* Set SCIB bit to pull SCI_L to high.*/
 	SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	/* Generate a falling edge */
 	CLEAR_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB);
-	udelay(CONFIG_ESPI_DEFAULT_VW_WIDTH_US);
+	udelay(CONFIG_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US);
 	/* Set signal high */
 	SET_BIT(NPCX_HIPMIC(PMC_ACPI), NPCX_HIPMIC_SCIB);
 #endif