diff options
Diffstat (limited to 'zephyr/program')
| -rw-r--r-- | zephyr/program/corsola/voltorb/project.conf | 7 | ||||
| -rw-r--r-- | zephyr/program/nissa/yaviks/overlay.dtsi | 28 | ||||
| -rw-r--r-- | zephyr/program/nissa/yavilla/overlay.dtsi | 28 | ||||
| -rw-r--r-- | zephyr/program/rex/program.conf | 2 | ||||
| -rw-r--r-- | zephyr/program/rex/rex.dtsi | 25 | ||||
| -rw-r--r-- | zephyr/program/rex/rex/src/usb_mux_config.c | 8 | ||||
| -rw-r--r-- | zephyr/program/rex/usbc.dtsi | 6 |
7 files changed, 75 insertions, 29 deletions
diff --git a/zephyr/program/corsola/voltorb/project.conf b/zephyr/program/corsola/voltorb/project.conf index 53e619098a..3cb4f46e06 100644 --- a/zephyr/program/corsola/voltorb/project.conf +++ b/zephyr/program/corsola/voltorb/project.conf @@ -41,3 +41,10 @@ CONFIG_PLATFORM_EC_EXTPOWER_DEBOUNCE_MS=800 # Battery config CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV=15000 + +# Remove debug options and features for FW QUAL +CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=n +CONFIG_PLATFORM_EC_CMD_POWERINDEBUG=n +CONFIG_LOG=n +CONFIG_LOG_MODE_MINIMAL=n +CONFIG_SHELL_MINIMAL=y diff --git a/zephyr/program/nissa/yaviks/overlay.dtsi b/zephyr/program/nissa/yaviks/overlay.dtsi index 663b538953..a93b02c51c 100644 --- a/zephyr/program/nissa/yaviks/overlay.dtsi +++ b/zephyr/program/nissa/yaviks/overlay.dtsi @@ -213,24 +213,24 @@ }; }; }; +}; - binman { - ec-rw { - size = <0x50000>; - rw-fw { - rw-fwid { - /* Fix the lcoation of the FWID to the - * last 32 bytes of the flash. This - * ensures the RW entries in the FMAP - * stored in the RO section of flash - * are always correct. - */ - offset = <(0x50000 - 32)>; - }; +&binman { + ec-rw { + size = <0x50000>; + rw-fw { + rw-fwid { + /* Fix the lcoation of the FWID to the + * last 32 bytes of the flash. This + * ensures the RW entries in the FMAP + * stored in the RO section of flash + * are always correct. + */ + offset = <(0x50000 - 32)>; }; }; - pad-after = <0x50000>; }; + pad-after = <0x50000>; }; &thermistor_3V3_51K1_47K_4050B { diff --git a/zephyr/program/nissa/yavilla/overlay.dtsi b/zephyr/program/nissa/yavilla/overlay.dtsi index 663b538953..a93b02c51c 100644 --- a/zephyr/program/nissa/yavilla/overlay.dtsi +++ b/zephyr/program/nissa/yavilla/overlay.dtsi @@ -213,24 +213,24 @@ }; }; }; +}; - binman { - ec-rw { - size = <0x50000>; - rw-fw { - rw-fwid { - /* Fix the lcoation of the FWID to the - * last 32 bytes of the flash. This - * ensures the RW entries in the FMAP - * stored in the RO section of flash - * are always correct. - */ - offset = <(0x50000 - 32)>; - }; +&binman { + ec-rw { + size = <0x50000>; + rw-fw { + rw-fwid { + /* Fix the lcoation of the FWID to the + * last 32 bytes of the flash. This + * ensures the RW entries in the FMAP + * stored in the RO section of flash + * are always correct. + */ + offset = <(0x50000 - 32)>; }; }; - pad-after = <0x50000>; }; + pad-after = <0x50000>; }; &thermistor_3V3_51K1_47K_4050B { diff --git a/zephyr/program/rex/program.conf b/zephyr/program/rex/program.conf index 1e19f687de..75351088fe 100644 --- a/zephyr/program/rex/program.conf +++ b/zephyr/program/rex/program.conf @@ -96,7 +96,7 @@ CONFIG_PLATFORM_EC_USB_PD_DATA_RESET_MSG=y CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y CONFIG_PLATFORM_EC_USB_PID=0x504D -#USB Mux +# USB Mux CONFIG_PLATFORM_EC_USB_MUX_TASK=y # External power diff --git a/zephyr/program/rex/rex.dtsi b/zephyr/program/rex/rex.dtsi index 28f719d356..83d10b95d1 100644 --- a/zephyr/program/rex/rex.dtsi +++ b/zephyr/program/rex/rex.dtsi @@ -253,6 +253,17 @@ */ rst-gpios = <&gpio7 4 (GPIO_OPEN_DRAIN | GPIO_ACTIVE_LOW)>; }; + + rt1716_tcpc_port1: rt1716@4e { + compatible = "richtek,rt1715-tcpc"; + reg = <0x4e>; + /* a duplicate of the <&gpio_usb_c1_tcpc_int_odl> node in + * "named-gpios". This is the Zephyr preferred style, + * the "named-gpios" node will be dealt with at a later date. + */ + irq-gpios = <&gpio3 4 GPIO_ACTIVE_LOW>; + is-alt; + }; }; &i2c5_0 { @@ -282,6 +293,20 @@ status = "okay"; reg = <0x72>; }; + + ppc_port1_syv: ppc_syv@40 { + compatible = "silergy,syv682x"; + status = "okay"; + reg = <0x40>; + frs_en_gpio = <&gpio_usb_c1_frs_en>; + is-alt; + }; + + usb_c1_anx7452_retimer: usb-c1-anx7452-retimer@10{ + compatible = "analogix,anx7452"; + reg = <0x10>; + usb-en-pin = <&gpio_usb_c1_rt_rst_r_odl>; + }; }; &i2c7_0 { diff --git a/zephyr/program/rex/rex/src/usb_mux_config.c b/zephyr/program/rex/rex/src/usb_mux_config.c index a549235f3c..a3d2d4ab0c 100644 --- a/zephyr/program/rex/rex/src/usb_mux_config.c +++ b/zephyr/program/rex/rex/src/usb_mux_config.c @@ -11,6 +11,8 @@ #include "hooks.h" #include "ioexpander.h" #include "usb_mux.h" +#include "usbc/ppc.h" +#include "usbc/tcpci.h" #include "usbc/usb_muxes.h" #include <zephyr/drivers/gpio.h> @@ -47,5 +49,11 @@ static void setup_mux(void) if (val == FW_USB_DB_USB3) { LOG_INF("USB DB: Setting USB3 mux"); } + if (val == FW_USB_DB_USB4_ANX7452) { + LOG_INF("USB DB: Setting ANX7452 mux"); + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_chain_anx7452_port1); + TCPC_ENABLE_ALTERNATE_BY_NODELABEL(1, rt1716_tcpc_port1); + PPC_ENABLE_ALTERNATE_BY_NODELABEL(1, ppc_port1_syv); + } } DECLARE_HOOK(HOOK_INIT, setup_mux, HOOK_PRIO_INIT_I2C); diff --git a/zephyr/program/rex/usbc.dtsi b/zephyr/program/rex/usbc.dtsi index 84ae79fae6..e4565092ee 100644 --- a/zephyr/program/rex/usbc.dtsi +++ b/zephyr/program/rex/usbc.dtsi @@ -37,6 +37,12 @@ compatible = "cros-ec,usb-mux-chain"; usb-muxes = <&virtual_mux_c1 &tcpci_mux_c1>; }; + usb_mux_chain_anx7452_port1: usb-mux-chain-1-anx7452 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&usb_c1_anx7452_retimer + &virtual_mux_c1>; + alternative-chain; + }; }; port1-muxes { tcpci_mux_c1: tcpci-mux-c1 { |