From ce5ca00b634dc152a05b2de469187d6bc3729c51 Mon Sep 17 00:00:00 2001 From: Dawid Niedzwiecki Date: Thu, 7 Apr 2022 15:06:25 +0200 Subject: zephyr: add a symbol to USB-A power type choice Change the way of configuring USB-A power port type - add a symbol to the choice. Delete all configs that are set by default anyway. BUG=b:227472576 TEST=zmake testall BRANCH=main Signed-off-by: Dawid Niedzwiecki Change-Id: I08005659e41c4a78ef60210fe1f23fdf6dbf42f2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3575154 Reviewed-by: Keith Short Commit-Queue: Dawid Niedzwiecki --- zephyr/Kconfig.usba | 3 ++- zephyr/projects/brya/prj.conf | 1 - zephyr/projects/corsola/prj_kingler.conf | 1 - zephyr/projects/corsola/prj_krabby.conf | 1 - zephyr/projects/herobrine/prj.conf | 2 -- zephyr/projects/skyrim/prj.conf | 1 - zephyr/projects/trogdor/lazor/prj.conf | 2 -- 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/zephyr/Kconfig.usba b/zephyr/Kconfig.usba index cca91ef787..c0cbdacdfe 100644 --- a/zephyr/Kconfig.usba +++ b/zephyr/Kconfig.usba @@ -15,8 +15,9 @@ menuconfig PLATFORM_EC_USBA if PLATFORM_EC_USBA -choice +choice PLATFORM_EC_USBA_PORT_POWER_TYPE prompt "Port power control mode" + default PLATFORM_EC_USB_PORT_POWER_DUMB config PLATFORM_EC_USB_PORT_POWER_DUMB bool "Dumb" diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf index f4f7569458..a824bd1b91 100644 --- a/zephyr/projects/brya/prj.conf +++ b/zephyr/projects/brya/prj.conf @@ -160,7 +160,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP=n CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP=n CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf index 8cdc8f7261..fd28664a57 100644 --- a/zephyr/projects/corsola/prj_kingler.conf +++ b/zephyr/projects/corsola/prj_kingler.conf @@ -102,7 +102,6 @@ CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y # USBA CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USBC CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y diff --git a/zephyr/projects/corsola/prj_krabby.conf b/zephyr/projects/corsola/prj_krabby.conf index ebab7ce3bd..5dd1561898 100644 --- a/zephyr/projects/corsola/prj_krabby.conf +++ b/zephyr/projects/corsola/prj_krabby.conf @@ -108,7 +108,6 @@ CONFIG_TASK_PD_STACK_SIZE=1280 # USB-A CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USB-C CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n diff --git a/zephyr/projects/herobrine/prj.conf b/zephyr/projects/herobrine/prj.conf index 99d2d8c067..d61a8f7d32 100644 --- a/zephyr/projects/herobrine/prj.conf +++ b/zephyr/projects/herobrine/prj.conf @@ -100,7 +100,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y # USB-A CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USB-C CONFIG_PLATFORM_EC_USB_PD_FRS=y @@ -122,7 +121,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805=y CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=n CONFIG_PLATFORM_EC_USB_PD_LOGGING=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y CONFIG_PLATFORM_EC_CONFIG_USB_PD_3A_PORTS=2 # USB ID diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf index a9be70454b..77aecbe161 100644 --- a/zephyr/projects/skyrim/prj.conf +++ b/zephyr/projects/skyrim/prj.conf @@ -96,7 +96,6 @@ CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=50000 # USB-A CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USB-C CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index f95d5a4153..2a61f5854f 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -96,7 +96,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y # USB-A CONFIG_PLATFORM_EC_USBA=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USB-C CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y @@ -116,7 +115,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805=y CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=n CONFIG_PLATFORM_EC_USB_PD_LOGGING=y -CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y # USB ID # This is allocated specifically for Trogdor -- cgit v1.2.1