usb_pd: Rename CONFIG_CMD_PD_CONTROL to CONFIG_HOSTCMD_PD_CONTROL

BUG=none
BRANCH=none
TEST=make buildall -j

Change-Id: I33a63d6ac45bbd46da74db34a21d1bb130476362
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2196946
Reviewed-by: Sooraj Govindan <sooraj.govindan@intel.corp-partner.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>

26 files changed, 31 insertions, 27 deletions

diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h
index 3eff17ba1a..dccabccbde 100644
--- a/baseboard/dragonegg/baseboard.h
+++ b/baseboard/dragonegg/baseboard.h
@@ -113,7 +113,7 @@
 #define CONFIG_USBC_VCONN
 #define CONFIG_USBC_VCONN_SWAP
 
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_CMD_PPC_DUMP
 
 /* TODO(b/111281797): Use correct PD delay values */
diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h
index 96daef28c2..466c5b05f9 100644
--- a/baseboard/grunt/baseboard.h
+++ b/baseboard/grunt/baseboard.h
@@ -109,7 +109,7 @@
 
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_TCPMV1
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_COMM_LOCKED
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index 664f02e606..27358ecb42 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -147,7 +147,7 @@
 #define CONFIG_USBC_VCONN_SWAP
 #define CONFIG_USBC_PPC_DEDICATED_INT
 
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_CMD_PPC_DUMP
 
 /* Include CLI command needed to support CCD testing. */
diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h
index fe19351bac..8e158e5b23 100644
--- a/baseboard/intelrvp/baseboard.h
+++ b/baseboard/intelrvp/baseboard.h
@@ -33,6 +33,9 @@
 #define CONFIG_CMD_USB_PD_CABLE
 #define CONFIG_CMD_USB_PD_PE
 
+/* Host commands  */
+#define CONFIG_HOSTCMD_PD_CONTROL
+
 /* Port80 display */
 #define CONFIG_MAX695X_SEVEN_SEGMENT_DISPLAY
 
diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h
index 6dbccb73b7..b06ccfd657 100644
--- a/baseboard/kalista/baseboard.h
+++ b/baseboard/kalista/baseboard.h
@@ -69,7 +69,7 @@
 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3
 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4
 
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h
index 7a22a81f4b..2a5351d907 100644
--- a/baseboard/octopus/baseboard.h
+++ b/baseboard/octopus/baseboard.h
@@ -201,7 +201,7 @@
 #define CONFIG_USB_PD_TCPM_MUX
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_BC12_DETECT_MAX14637
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_CMD_PPC_DUMP
 
 /* TODO(b/76218141): Use correct PD delay values */
diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h
index f1ad825e5c..8e52130e6b 100644
--- a/baseboard/trogdor/baseboard.h
+++ b/baseboard/trogdor/baseboard.h
@@ -93,7 +93,7 @@
 #define CONFIG_USB_PD_TCPMV2
 #define CONFIG_USB_DRP_ACC_TRYSRC
 #define CONFIG_USB_PD_DECODE_SOP
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DISCHARGE_PPC
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h
index a0fbc93568..e5db524f0f 100644
--- a/baseboard/volteer/baseboard.h
+++ b/baseboard/volteer/baseboard.h
@@ -161,7 +161,7 @@
 #define CONFIG_USB_PD_TCPM_TUSB422	/* USBC port C0 */
 #define CONFIG_USB_PD_TCPM_PS8815	/* USBC port USB3 DB */
 #define CONFIG_USB_PD_TCPM_MUX
-#define CONFIG_CMD_PD_CONTROL		/* Needed for TCPC FW update */
+#define CONFIG_HOSTCMD_PD_CONTROL		/* Needed for TCPC FW update */
 #define CONFIG_CMD_USB_PD_PE
 
 #define CONFIG_USB_PD_TRY_SRC
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h
index 945a448b99..a34c9ca1d3 100644
--- a/baseboard/zork/baseboard.h
+++ b/baseboard/zork/baseboard.h
@@ -135,7 +135,7 @@
 	#undef CONFIG_USB_TYPEC_PD_FAST_ROLE_SWAP
 #endif
 
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_CMD_TCPCI_DUMP
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_POWER_DELIVERY
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 00600ec755..8910d39198 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -48,7 +48,7 @@
 #define CONFIG_CMD_ACCEL_INFO
 #define CONFIG_CMD_BATT_MFG_ACCESS
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 
 /* SOC */
 #define CONFIG_CHIPSET_SKYLAKE
diff --git a/board/cheza/board.h b/board/cheza/board.h
index 820b4bf417..54f9d1f7e2 100644
--- a/board/cheza/board.h
+++ b/board/cheza/board.h
@@ -99,7 +99,7 @@
 /* USB */
 #define CONFIG_USB_POWER_DELIVERY
 #define CONFIG_USB_PD_TCPMV1
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DISCHARGE_PPC
diff --git a/board/coral/board.h b/board/coral/board.h
index 257e8e46c6..85ddd8e5c2 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -77,7 +77,7 @@
 #define CONFIG_TABLET_MODE
 
 /* USB PD config */
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DUAL_ROLE
diff --git a/board/elm/board.h b/board/elm/board.h
index 8859ff5594..a248f6b757 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -119,7 +119,7 @@
 #undef CONFIG_HOSTCMD_DEBUG_MODE
 #define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF
 #define CONFIG_CMD_I2C_PROTECT
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 
 /*
  * Flash layout:
diff --git a/board/eve/board.h b/board/eve/board.h
index b7afe3f462..513282cbd0 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -62,7 +62,7 @@
 #define CONFIG_CMD_ACCEL_INFO
 #define CONFIG_CMD_BATT_MFG_ACCESS
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 
 /* SOC */
 #define CONFIG_CHIPSET_SKYLAKE
diff --git a/board/fizz/board.h b/board/fizz/board.h
index 81a1da111f..209fe29dfe 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -77,7 +77,7 @@
 
 #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 50000
 
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/nami/board.h b/board/nami/board.h
index 95f5a38ddc..b12d8133bd 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -113,7 +113,7 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 1ea9c12f19..958e3d202c 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -87,7 +87,7 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef   CONFIG_EXTPOWER_DEBOUNCE_MS
 #define  CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index a150f9b7ba..556f6dc009 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -51,7 +51,7 @@
 #define CONFIG_CMD_ACCELS
 #define CONFIG_CMD_ACCEL_INFO
 #define CONFIG_CMD_BUTTON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_CMD_PPC_DUMP
 
 /* Battery */
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 8d845632cd..00effffe56 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -100,7 +100,7 @@
 #define CONFIG_CHARGER_PSYS_READ
 #endif
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef   CONFIG_EXTPOWER_DEBOUNCE_MS
 #define  CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/puff/board.h b/board/puff/board.h
index 95ed4df8cf..9c6314819d 100644
--- a/board/puff/board.h
+++ b/board/puff/board.h
@@ -59,7 +59,7 @@
 #define CONFIG_CMD_CHARGEN
 #undef CONFIG_CMD_FASTCHARGE
 #undef CONFIG_CMD_KEYBOARD
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #undef CONFIG_CMD_PWR_AVG
 #define CONFIG_CMD_PPC_DUMP
 #define CONFIG_CMD_TCPCI_DUMP
diff --git a/board/rammus/board.h b/board/rammus/board.h
index f4f10da1b3..7a569392a5 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -83,7 +83,7 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_EXTPOWER_GPIO
 #undef   CONFIG_EXTPOWER_DEBOUNCE_MS
 #define  CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/reef/board.h b/board/reef/board.h
index f37e315034..8b38811024 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -75,7 +75,7 @@
 #define CONFIG_TABLET_MODE
 
 /* USB PD config */
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DUAL_ROLE
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index b8f8210848..37addcbbb0 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -65,7 +65,7 @@
 /* USB PD config */
 #define CONFIG_USB_MUX_PI3USB30532
 #define CONFIG_USB_MUX_PS8740
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DUAL_ROLE
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index c516b0eb5b..0e630e15fb 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -75,7 +75,7 @@
 #define CONFIG_TABLET_MODE
 
 /* USB PD config */
-#define CONFIG_CMD_PD_CONTROL
+#define CONFIG_HOSTCMD_PD_CONTROL
 #define CONFIG_USB_PD_ALT_MODE
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_DUAL_ROLE
diff --git a/common/usb_pd_host_cmd.c b/common/usb_pd_host_cmd.c
index 128b467502..8bb96228c0 100644
--- a/common/usb_pd_host_cmd.c
+++ b/common/usb_pd_host_cmd.c
@@ -510,7 +510,7 @@ DECLARE_HOST_COMMAND(EC_CMD_GET_PD_PORT_CAPS,
 		     hc_get_pd_port_caps,
 		     EC_VER_MASK(0));
 
-#ifdef CONFIG_CMD_PD_CONTROL
+#ifdef CONFIG_HOSTCMD_PD_CONTROL
 static enum ec_status pd_control(struct host_cmd_handler_args *args)
 {
 	static int pd_control_disabled[CONFIG_USB_PD_PORT_MAX_COUNT];
@@ -585,8 +585,7 @@ static enum ec_status pd_control(struct host_cmd_handler_args *args)
 
 	return EC_RES_SUCCESS;
 }
-
 DECLARE_HOST_COMMAND(EC_CMD_PD_CONTROL, pd_control, EC_VER_MASK(0));
-#endif /* CONFIG_CMD_PD_CONTROL */
+#endif /* CONFIG_HOSTCMD_PD_CONTROL */
 
 #endif /* HAS_TASK_HOSTCMD */
diff --git a/include/config.h b/include/config.h
index 899a71adfc..15c0dcc83a 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1245,7 +1245,6 @@
 #define CONFIG_CMD_MEM
 #define CONFIG_CMD_MMAPINFO
 #define CONFIG_CMD_PD
-#undef  CONFIG_CMD_PD_CONTROL
 #undef  CONFIG_CMD_PD_DEV_DUMP_INFO
 #undef  CONFIG_CMD_PD_FLASH
 #define CONFIG_CMD_PECI
@@ -2074,6 +2073,9 @@
 /* Flash commands over PD */
 #define CONFIG_HOSTCMD_FLASHPD
 
+/* Host command to control USB-PD chip */
+#undef CONFIG_HOSTCMD_PD_CONTROL
+
 /* Set entry in PD MCU's device rw_hash table */
 #define CONFIG_HOSTCMD_RWHASHPD