diff options
author | Tomasz Michalec <tm@semihalf.com> | 2022-07-20 14:02:43 +0200 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-13 11:17:57 +0000 |
commit | 713e44a1648853db8b4fb936faa6d349e858ec01 (patch) | |
tree | 08870b8ff90df9044a011205b77ee27573701418 | |
parent | 7a31262e625a9b60cd3be8af991f4c2b71ddbc1c (diff) | |
download | chrome-ec-713e44a1648853db8b4fb936faa6d349e858ec01.tar.gz |
zephyr: nissa: usb_mux: Split struct usb_mux in nissa boards
Update nissa boards to use new struct usb_mux_chain.
BUG=b:236274003
TEST=zmake build -a
TEST=./twister -T zephyr/test
BRANCH=None
Cq-Depend: chromium:3779618
Signed-off-by: Tomasz Michalec <tm@semihalf.com>
Change-Id: Icf0dbef327d8cc5172fef960b6cecb792e1eb887
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3780417
Reviewed-by: Keith Short <keithshort@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Tested-by: Tomasz Michalec <tmichalec@google.com>
Commit-Queue: Tomasz Michalec <tmichalec@google.com>
-rw-r--r-- | zephyr/projects/nissa/craask/overlay.dts | 18 | ||||
-rw-r--r-- | zephyr/projects/nissa/include/nissa_common.h | 2 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/overlay.dts | 18 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/overlay.dts | 18 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/overlay.dts | 18 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/overlay.dts | 5 | ||||
-rw-r--r-- | zephyr/projects/nissa/src/sub_board.c | 2 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/overlay.dts | 18 | ||||
-rw-r--r-- | zephyr/projects/nissa/yaviks/overlay.dts | 18 |
9 files changed, 77 insertions, 40 deletions
diff --git a/zephyr/projects/nissa/craask/overlay.dts b/zephyr/projects/nissa/craask/overlay.dts index e1f58ef395..908fd2411d 100644 --- a/zephyr/projects/nissa/craask/overlay.dts +++ b/zephyr/projects/nissa/craask/overlay.dts @@ -212,7 +212,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -228,11 +231,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/include/nissa_common.h b/zephyr/projects/nissa/include/nissa_common.h index 80a9024da1..7cdaba2e50 100644 --- a/zephyr/projects/nissa/include/nissa_common.h +++ b/zephyr/projects/nissa/include/nissa_common.h @@ -18,8 +18,6 @@ enum nissa_sub_board_type { NISSA_SB_HDMI_A = 3, /* HDMI, USB type A */ }; -extern struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT]; - enum nissa_sub_board_type nissa_get_sb_type(void); #endif /* __CROS_EC_NISSA_NISSA_COMMON_H__ */ diff --git a/zephyr/projects/nissa/joxer/overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts index 630442f194..3f7b0355c0 100644 --- a/zephyr/projects/nissa/joxer/overlay.dts +++ b/zephyr/projects/nissa/joxer/overlay.dts @@ -238,7 +238,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -250,11 +253,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; 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 da3a6901af..ef43c973e1 100644 --- a/zephyr/projects/nissa/nereid/overlay.dts +++ b/zephyr/projects/nissa/nereid/overlay.dts @@ -209,7 +209,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -221,11 +224,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; 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 89eca90642..cccb7b73cf 100644 --- a/zephyr/projects/nissa/nivviks/overlay.dts +++ b/zephyr/projects/nissa/nivviks/overlay.dts @@ -213,7 +213,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -229,11 +232,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { diff --git a/zephyr/projects/nissa/pujjo/overlay.dts b/zephyr/projects/nissa/pujjo/overlay.dts index ce10a6e84d..27b386d910 100644 --- a/zephyr/projects/nissa/pujjo/overlay.dts +++ b/zephyr/projects/nissa/pujjo/overlay.dts @@ -203,7 +203,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { diff --git a/zephyr/projects/nissa/src/sub_board.c b/zephyr/projects/nissa/src/sub_board.c index 9088a684a7..29820872b3 100644 --- a/zephyr/projects/nissa/src/sub_board.c +++ b/zephyr/projects/nissa/src/sub_board.c @@ -180,7 +180,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_mux = NULL; + usb_muxes[1].next = NULL; } #endif diff --git a/zephyr/projects/nissa/xivu/overlay.dts b/zephyr/projects/nissa/xivu/overlay.dts index 79af01d2ee..b078d47ba8 100644 --- a/zephyr/projects/nissa/xivu/overlay.dts +++ b/zephyr/projects/nissa/xivu/overlay.dts @@ -203,7 +203,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -219,11 +222,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; 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 55404d0a54..98de848a91 100644 --- a/zephyr/projects/nissa/yaviks/overlay.dts +++ b/zephyr/projects/nissa/yaviks/overlay.dts @@ -206,7 +206,10 @@ reg = <0>; bc12 = <&bc12_port0>; chg = <&chg_port0>; - usb-muxes = <&virtual_mux_0>; + usb-mux-chain-0 { + compatible = "cros-ec,usb-mux-chain"; + usb-muxes = <&virtual_mux_0>; + }; }; port0-muxes { virtual_mux_0: virtual-mux-0 { @@ -218,11 +221,14 @@ reg = <1>; bc12 = <&bc12_port1>; chg = <&chg_port1>; - /* - * 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 { + 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>; + }; }; port1-muxes { virtual_mux_1: virtual-mux-1 { |