diff options
| -rw-r--r-- | zephyr/projects/nissa/craask/overlay.dts | 9 | ||||
| -rw-r--r-- | zephyr/projects/nissa/joxer/overlay.dts | 9 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nereid/overlay.dts | 9 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nivviks/overlay.dts | 9 | ||||
| -rw-r--r-- | zephyr/projects/nissa/src/sub_board.c | 3 | ||||
| -rw-r--r-- | zephyr/projects/nissa/xivu/overlay.dts | 9 | ||||
| -rw-r--r-- | zephyr/projects/nissa/yaviks/overlay.dts | 9 |
7 files changed, 32 insertions, 25 deletions
diff --git a/zephyr/projects/nissa/craask/overlay.dts b/zephyr/projects/nissa/craask/overlay.dts index 908fd2411d..3c54941e9c 100644 --- a/zephyr/projects/nissa/craask/overlay.dts +++ b/zephyr/projects/nissa/craask/overlay.dts @@ -233,12 +233,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/joxer/overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts index 3f7b0355c0..e0b7422edd 100644 --- a/zephyr/projects/nissa/joxer/overlay.dts +++ b/zephyr/projects/nissa/joxer/overlay.dts @@ -255,12 +255,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/nereid/overlay.dts b/zephyr/projects/nissa/nereid/overlay.dts index ef43c973e1..a6fab925d8 100644 --- a/zephyr/projects/nissa/nereid/overlay.dts +++ b/zephyr/projects/nissa/nereid/overlay.dts @@ -226,12 +226,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/nivviks/overlay.dts b/zephyr/projects/nissa/nivviks/overlay.dts index cccb7b73cf..bb32f098e8 100644 --- a/zephyr/projects/nissa/nivviks/overlay.dts +++ b/zephyr/projects/nissa/nivviks/overlay.dts @@ -234,12 +234,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/src/sub_board.c b/zephyr/projects/nissa/src/sub_board.c index 29820872b3..89a9954037 100644 --- a/zephyr/projects/nissa/src/sub_board.c +++ b/zephyr/projects/nissa/src/sub_board.c @@ -18,6 +18,7 @@ #include "hooks.h" #include "usb_charge.h" #include "usb_pd.h" +#include "usbc/usb_muxes.h" #include "task.h" #include "nissa_common.h" @@ -180,7 +181,7 @@ static void nereid_subboard_config(void) GPIO_INPUT | GPIO_PULL_UP); } else { /* Port doesn't exist, doesn't need muxing */ - usb_muxes[1].next = NULL; + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_chain_1_no_mux); } #endif diff --git a/zephyr/projects/nissa/xivu/overlay.dts b/zephyr/projects/nissa/xivu/overlay.dts index b078d47ba8..2c7f685502 100644 --- a/zephyr/projects/nissa/xivu/overlay.dts +++ b/zephyr/projects/nissa/xivu/overlay.dts @@ -224,12 +224,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &anx7483_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/yaviks/overlay.dts b/zephyr/projects/nissa/yaviks/overlay.dts index 98de848a91..56bcd98d31 100644 --- a/zephyr/projects/nissa/yaviks/overlay.dts +++ b/zephyr/projects/nissa/yaviks/overlay.dts @@ -223,12 +223,13 @@ chg = <&chg_port1>; usb-mux-chain-1 { compatible = "cros-ec,usb-mux-chain"; - /* - * Some sub-boards may disable all usb muxes in - * chain except virtual_mux_1 - */ usb-muxes = <&virtual_mux_1 &tcpci_mux_1>; }; + usb_mux_chain_1_no_mux: usb-mux-chain-1-no-mux { + compatible = "cros-ec,usb-mux-chain"; + alternative-chain; + usb-muxes = <&virtual_mux_1>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { |