12 files changed, 59 insertions, 134 deletions
diff --git a/zephyr/dts/bindings/usbc/mux/amd,usbc-mux-amd-fp6.yaml b/zephyr/dts/bindings/usbc/mux/amd,usbc-mux-amd-fp6.yaml
new file mode 100644
index 0000000000..1ce1db82c7
--- /dev/null
+++ b/zephyr/dts/bindings/usbc/mux/amd,usbc-mux-amd-fp6.yaml
@@ -0,0 +1,9 @@
+# Copyright 2022 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: USB-C AMD-FP6 mux
+
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
+
+compatible: "amd,usbc-mux-amd-fp6"
diff --git a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml
index 9e4716d5d1..c4ac7782f0 100644
--- a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml
+++ b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml
@@ -1,26 +1,10 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 description: |
   Analogix re-timing MUX
 
-include: cros-ec,usbc-mux.yaml
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
 
 compatible: "analogix,anx7483"
-
-properties:
-  port:
-    type: phandle
-    required: true
-    description: phandle to the named i2c port
-
-  i2c-addr-flags:
-    type: string
-    required: true
-    description: I2C address of chip
-    enum:
-      - ANX7483_I2C_ADDR0_FLAGS
-      - ANX7483_I2C_ADDR1_FLAGS
-      - ANX7483_I2C_ADDR2_FLAGS
-      - ANX7483_I2C_ADDR3_FLAGS
diff --git a/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml b/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml
new file mode 100644
index 0000000000..25b042e28c
--- /dev/null
+++ b/zephyr/dts/bindings/usbc/mux/analogix,usbc-mux-anx7447.yaml
@@ -0,0 +1,15 @@
+# Copyright 2022 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: USBC ANX7447 USB MUX
+
+include: cros-ec,usbc-mux.yaml
+
+compatible: "analogix,usbc-mux-anx7447"
+
+properties:
+  hpd-update-enable:
+    type: boolean
+    description: |
+      Enable anx7447 hpd update callback
diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml
index 9b986a5942..548d510630 100644
--- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml
+++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml
@@ -1,10 +1,12 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 description: USBC TCPC USB MUX
 
-include: cros-ec,usbc-mux.yaml
+# Include base.yaml instead of i2c-device.yaml because the reg property is not
+# required for this node.
+include: ["base.yaml", "cros-ec,usbc-mux.yaml"]
 
 compatible: "cros-ec,usbc-mux-tcpci"
 
@@ -14,56 +16,3 @@ properties:
     required: false
     description: |
       Name of function used as hpd_update callback
-    enum:
-      - ps8xxx_tcpc_update_hpd_status
-
-  port:
-    type: phandle
-    required: false
-    description: |
-      If the TCPC in your design is used to manage both the power-delivery
-      interface and configure the mux for the USB superspeed signals, this
-      property, and the i2c-addr-flags should be omitted. The driver uses
-      the I2C configuration specified in the corresponding TCPC node.
-
-      Example below
-
-      port0@0 {
-          compatible = "named-usbc-port";
-          reg = <0>;
-          tcpc {
-              compatible = "parade,ps8xxx";
-              status = "okay";
-              port = <&i2c_tcpc0>;
-              i2c-addr-flags = "PS8XXX_I2C_ADDR1_FLAGS";
-          };
-          usb-muxes = <&usb_mux_0>;
-      };
-      usb_mux_0 usb-mux-0 {
-          compatible = "parade,usbc-mux-ps8xxx";
-          /* I2C configuration provide by TCPC node */
-      };
-
-      If the TCPC in your design only configures the USB superspeed signals,
-      for instance when the EC chip contains an embedded TCPC controller,
-      then port and i2c-addr-flags are required.
-
-      port0@0 {
-          compatible = "named-usbc-port";
-          reg = <0>;
-          tcpc {
-              compatible = "ite,it8xxx2-tcpc";
-          };
-      };
-      usb_mux_0 usb-mux-0 {
-          compatible = "parade,usbc-mux-ps8xxx";
-          port = <i2c_usbc0>;
-          i2c-addr-flags = "PS8XXX_I2C_ADDR1_FLAGS";
-      };
-
-  i2c-addr-flags:
-    type: int
-    required: false
-    description: |
-      I2C address of chip. If provided, port property has to be present too.
-      Please check description of port property for more information.
diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml
index cadeb6d35b..7231bc9e2c 100644
--- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml
+++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-virtual.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml
index 21cb8e0a3f..0e76f548a9 100644
--- a/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml
+++ b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/zephyr/dts/bindings/usbc/mux/intel,jhl804r.yaml b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml
index 5098080c25..6289d440f1 100644
--- a/zephyr/dts/bindings/usbc/mux/intel,jhl804r.yaml
+++ b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -6,7 +6,7 @@ description: Intel JHL8040R Thunderbolt 4 Retimer
 
 compatible: "intel,jhl8040r"
 
-include: cros-ec,usbc-mux.yaml
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
 
 properties:
     reset-pin:
@@ -20,13 +20,3 @@ properties:
     ls-en-pin:
       type: phandle
       required: false
-
-    port:
-      type: phandle
-      required: true
-      description: phandle to the named i2c port
-
-    i2c-addr-flags:
-      type: int
-      required: true
-      description: I2C address of chip
diff --git a/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml b/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml
index 4d4c360d47..3c9381aee1 100644
--- a/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml
+++ b/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml
@@ -1,23 +1,9 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 description: ITE IT5205 USB Type-C 3:2 alternate mode MUX
 
-include: cros-ec,usbc-mux.yaml
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
 
 compatible: "ite,it5205"
-
-properties:
-  port:
-    type: phandle
-    required: true
-    description: phandle to the named i2c port
-
-  i2c-addr-flags:
-    type: string
-    required: true
-    description: I2C address of chip
-    enum:
-      - IT5205_I2C_ADDR1_FLAGS
-      - IT5205_I2C_ADDR2_FLAGS
diff --git a/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml b/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml
new file mode 100644
index 0000000000..1ee0bbaf74
--- /dev/null
+++ b/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml
@@ -0,0 +1,9 @@
+# Copyright 2022 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: Parade PS8743 USB Type-C alternate mode MUX
+
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
+
+compatible: "parade,ps8743"
diff --git a/zephyr/dts/bindings/usbc/mux/parade,ps8818.yaml b/zephyr/dts/bindings/usbc/mux/parade,ps8818.yaml
new file mode 100644
index 0000000000..aafdf29341
--- /dev/null
+++ b/zephyr/dts/bindings/usbc/mux/parade,ps8818.yaml
@@ -0,0 +1,9 @@
+# Copyright 2022 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: USBC PS8818 Retimer
+
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
+
+compatible: "parade,ps8818"
diff --git a/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml b/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml
index 685544cbf4..4df0b35d76 100644
--- a/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml
+++ b/zephyr/dts/bindings/usbc/mux/parade,usbc-mux-ps8xxx.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -13,3 +13,5 @@ properties:
     description: |
       PS8xxx USB MUX almost always use this hdp_update callback
     default: "ps8xxx_tcpc_update_hpd_status"
+    enum:
+      - ps8xxx_tcpc_update_hpd_status
diff --git a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml
index 6c625459c1..d5a0b34e6c 100644
--- a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml
+++ b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -6,34 +6,6 @@ description: |
   TI TUSB546, TUSB1044, or TUSB1064 USB-C MUX, device variant depends on
   CONFIG_PLATFORM_EC_USB_MUX_TUSB_TYPE Kconfig choice
 
-include: cros-ec,usbc-mux.yaml
+include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"]
 
 compatible: "ti,tusb1064"
-
-properties:
-  port:
-    type: phandle
-    required: true
-    description: phandle to the named i2c port
-
-  i2c-addr-flags:
-    type: string
-    required: true
-    description: I2C address of chip
-    enum:
-      - TUSB1064_I2C_ADDR0_FLAGS
-      - TUSB1064_I2C_ADDR1_FLAGS
-      - TUSB1064_I2C_ADDR2_FLAGS
-      - TUSB1064_I2C_ADDR3_FLAGS
-      - TUSB1064_I2C_ADDR4_FLAGS
-      - TUSB1064_I2C_ADDR5_FLAGS
-      - TUSB1064_I2C_ADDR6_FLAGS
-      - TUSB1064_I2C_ADDR7_FLAGS
-      - TUSB1064_I2C_ADDR8_FLAGS
-      - TUSB1064_I2C_ADDR9_FLAGS
-      - TUSB1064_I2C_ADDR10_FLAGS
-      - TUSB1064_I2C_ADDR11_FLAGS
-      - TUSB1064_I2C_ADDR12_FLAGS
-      - TUSB1064_I2C_ADDR13_FLAGS
-      - TUSB1064_I2C_ADDR14_FLAGS
-      - TUSB1064_I2C_ADDR15_FLAGS