From a421b3380fb85c7e6dc990d7c668899bebb4b5d1 Mon Sep 17 00:00:00 2001 From: Diana Z Date: Wed, 5 Apr 2023 15:27:09 -0600 Subject: Zephyr: Add NX20P3481 CONFIG Add a configuration for the now lesser-used NX20P3481 chip. BRANCH=None BUG=b:276468569 TEST=CQ+1 Change-Id: I28c2cc4821e4e456571bfb5584fa746845c9a750 Signed-off-by: Diana Z Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4404284 Reviewed-by: Abe Levkoy --- util/config_allowed.txt | 1 - zephyr/CMakeLists.txt | 2 ++ zephyr/Kconfig.ppc | 8 ++++++++ zephyr/shim/include/config_chip.h | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 264eada2fa..081d05d7e3 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -883,7 +883,6 @@ CONFIG_USART_HOST_COMMAND CONFIG_USB CONFIG_USBC_BACKWARDS_COMPATIBLE_DFP CONFIG_USBC_DISABLE_CHARGE_FROM_RP_DEF -CONFIG_USBC_PPC_NX20P3481 CONFIG_USBC_RETIMER_NB7V904M CONFIG_USBC_RETIMER_PI3DPX1207 CONFIG_USBC_RETIMER_PI3HDX1204 diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 09b52454a6..7b77bcf115 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -560,6 +560,8 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_PPC_AOZ1380 "${PLATFORM_EC}/driver/ppc/aoz1380.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_PPC_KTU1125 "${PLATFORM_EC}/driver/ppc/ktu1125.c") +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_PPC_NX20P3481 + "${PLATFORM_EC}/driver/ppc/nx20p348x.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483 "${PLATFORM_EC}/driver/ppc/nx20p348x.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC_PPC_RT1739 diff --git a/zephyr/Kconfig.ppc b/zephyr/Kconfig.ppc index a6d376159c..c7108e62a8 100644 --- a/zephyr/Kconfig.ppc +++ b/zephyr/Kconfig.ppc @@ -86,6 +86,14 @@ config PLATFORM_EC_USBC_PPC_KTU1125 solution to USB Type-C applications by eliminating the dependence on external components. +config PLATFORM_EC_USBC_PPC_NX20P3481 + bool "NX20P3481 High Voltage Sink/Source Combo Switch" + depends on DT_HAS_NXP_NX20P348X_ENABLED + select PLATFORM_EC_USBC_OCP + help + The NX20P3481 is a product with combined multiple power switches + and a LDO for USB PD application. + config PLATFORM_EC_USBC_PPC_NX20P3483 bool "NX20P3483 High Voltage Sink/Source Combo Switch" default y diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 14f733d3c8..7cfa79cb43 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1698,6 +1698,11 @@ extern char mock_jump_data[CONFIG_PLATFORM_EC_PRESERVED_END_OF_RAM_SIZE]; #define CONFIG_USBC_PPC_KTU1125 #endif +#undef CONFIG_USBC_PPC_NX20P3481 +#ifdef CONFIG_PLATFORM_EC_USBC_PPC_NX20P3481 +#define CONFIG_USBC_PPC_NX20P3481 +#endif + #undef CONFIG_USBC_PPC_NX20P3483 #ifdef CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483 #define CONFIG_USBC_PPC_NX20P3483 -- cgit v1.2.1