diff options
author | Dawid Niedzwiecki <dn@semihalf.com> | 2022-08-10 14:11:20 +0200 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-26 18:37:55 +0000 |
commit | 8a6b84e62e3d717646bfc8764755a21c1b9a68c5 (patch) | |
tree | 7bd8aaa678418a6adc254049cdad4334dfa9c645 /zephyr/dts | |
parent | 933e50627a667c31f42b6f6e38860743b2a8540b (diff) | |
download | chrome-ec-8a6b84e62e3d717646bfc8764755a21c1b9a68c5.tar.gz |
zephyr: move mux nodes onto i2c buses
Move all USB-C mux nodes onto the i2c buses from named-usbc-port nodes.
The change should simplify the upstream process of the mux chips
drivers.
BUG=b:240618099
TEST=zmake build -a; make sure usb-c works
BRANCH=main
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: Ieab80f2ccf2f47f93597e90f5afbda8072b71d49
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3827181
Reviewed-by: Tomasz Michalec <tmichalec@google.com>
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/dts')
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml | 18 | ||||
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml | 55 | ||||
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml | 12 | ||||
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/ite,it5205.yaml | 16 | ||||
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml | 18 | ||||
-rw-r--r-- | zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml | 30 |
6 files changed, 8 insertions, 141 deletions
diff --git a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml index 9e4716d5d1..c1e6317d19 100644 --- a/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml +++ b/zephyr/dts/bindings/usbc/mux/analogix,anx7483.yaml @@ -5,22 +5,6 @@ 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/cros-ec,usbc-mux-tcpci.yaml b/zephyr/dts/bindings/usbc/mux/cros-ec,usbc-mux-tcpci.yaml index f7dda3042c..8656fee567 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 @@ -4,7 +4,9 @@ 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,54 +16,3 @@ properties: required: false description: | Name of function used as hpd_update callback - - 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/intel,jhl8040r.yaml b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml index 5098080c25..ebfeeea6c9 100644 --- a/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml +++ b/zephyr/dts/bindings/usbc/mux/intel,jhl8040r.yaml @@ -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..4176eb3801 100644 --- a/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml +++ b/zephyr/dts/bindings/usbc/mux/ite,it5205.yaml @@ -4,20 +4,6 @@ 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 index 003f3ce13c..5f5c0d278b 100644 --- a/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml +++ b/zephyr/dts/bindings/usbc/mux/parade,ps8743.yaml @@ -4,22 +4,6 @@ description: Parade PS8743 USB Type-C alternate mode MUX -include: cros-ec,usbc-mux.yaml +include: ["i2c-device.yaml", "cros-ec,usbc-mux.yaml"] compatible: "parade,ps8743" - -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: - - PS8743_I2C_ADDR0_FLAG - - PS8743_I2C_ADDR1_FLAG - - PS8743_I2C_ADDR2_FLAG - - PS8743_I2C_ADDR3_FLAG diff --git a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml index 6c625459c1..7ee9a2c0cd 100644 --- a/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml +++ b/zephyr/dts/bindings/usbc/mux/ti,tusb1064.yaml @@ -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 |