arm64: dts: imx8mp-evk: add typec node
Subsystems (2)
PATCH v3 1/4 arm64: dts: imx8mp-evk: add typec node
From: Xu Yang <[email protected]>
The first USB port features a Type-C connector with dual data role and dual power role capabilities. Add the Type-C device node and enable the corresponding USB controller and phy node.
---
Changes in v3:
- remove the patch which switches the node to flattened model
Changes in v2:
- remove usb3_phy1 tuning property added by mistake
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 69 ++++++++++++++++++++ 1 file changed, 69 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +69 -0
@@ -6,6 +6,7 @@ /dts-v1/; #include <dt-bindings/phy/phy-imx8-pcie.h> +#include <dt-bindings/usb/pd.h> #include "imx8mp.dtsi" / {
@@ -636,6 +637,35 @@ adv7535_out: endpoint { }; }; + + ptn5110: tcpc@50 { + compatible = "nxp,ptn5110", "tcpci"; + reg = <0x50>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_typec>; + interrupt-parent = <&gpio4>; + interrupts = <19 IRQ_TYPE_LEVEL_LOW>; + orientation-gpios = <&gpio4 20 GPIO_ACTIVE_HIGH>; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + data-role = "dual"; + try-power-role = "sink"; + source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; + sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM) + PDO_VAR(5000, 20000, 3000)>; + op-sink-microwatt = <15000000>; + self-powered; + + port { + typec_con_hs: endpoint { + remote-endpoint = <&usb3_data_hs>; + }; + }; + }; + }; }; &i2c3 {
@@ -851,6 +881,38 @@ &uart2 { status = "okay"; }; +&usb3_phy0 { + fsl,phy-tx-vref-tune-percent = <122>; + fsl,phy-tx-preemp-amp-tune-microamp = <1800>; + fsl,phy-tx-vboost-level-microvolt = <1156>; + fsl,phy-comp-dis-tune-percent = <115>; + fsl,phy-pcs-tx-deemph-3p5db-attenuation-db = <33>; + fsl,phy-pcs-tx-swing-full-percent = <100>; + status = "okay"; +}; + +&usb3_0 { + status = "okay"; +}; + +&usb_dwc3_0 { + dr_mode = "otg"; + hnp-disable; + srp-disable; + adp-disable; + usb-role-switch; + role-switch-default-mode = "peripheral"; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + status = "okay"; + + port { + usb3_data_hs: endpoint { + remote-endpoint = <&typec_con_hs>; + }; + }; +}; + &usb3_phy1 { status = "okay"; };
@@ -1179,6 +1241,13 @@ MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX 0x140 >; }; + pinctrl_typec: typecgrp { + fsl,pins = < + MX8MP_IOMUXC_SAI1_TXD7__GPIO4_IO19 0x1c4 + MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20 0x16 + >; + }; + pinctrl_usb1_vbus: usb1grp { fsl,pins = < MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR 0x10
Signature · 1 line
2.34.1
PATCH v3 2/4 arm64: dts: imx8mp-evk: add usb3_phy1 tuning properties
From: Xu Yang <[email protected]>
Add some tuning properties for usb3_phy1 to improve signal.
---
Changes in v3:
- no changes
Changes in v2:
- new patch
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -0
@@ -914,6 +914,8 @@ usb3_data_hs: endpoint { }; &usb3_phy1 { + fsl,phy-tx-preemp-amp-tune-microamp = <1800>; + fsl,phy-tx-vref-tune-percent = <116>; status = "okay"; };
Signature · 1 line
2.34.1
PATCH v3 3/4 arm64: dts: imx95: switch usb3 controller to flattened model
In reply to Xu YangFrom: Xu Yang <[email protected]>
Switch to use flattened model for USB3 controller. To enable USB controller with restricted DMA access range to work correctly, add a simple-bus to constrain the dma address.
Note:
This changes the USB controller compatible string from "fsl,imx95-dwc3" to "nxp,imx95-dwc3". This requires a kernel with CONFIG_USB_DWC3_IMX enabled; otherwise, the new DTB will not be compatible with older one. As i.MX95 is a new SoC and is still under development, it's acceptable at development early phase.
---
Changes in v3:
- no changes
Changes in v2:
- add note in the commit message
--- arch/arm64/boot/dts/freescale/imx95.dtsi | 48 ++++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-)
arch/arm64/boot/dts/freescale/imx95.dtsi +24 -24
@@ -1867,45 +1867,45 @@ pmu@49252000 { }; }; - usb3: usb@4c010010 { - compatible = "fsl,imx95-dwc3", "fsl,imx8mp-dwc3"; - reg = <0x0 0x4c010010 0x0 0x04>, - <0x0 0x4c1f0000 0x0 0x20>; - clocks = <&scmi_clk IMX95_CLK_HSIO>, - <&scmi_clk IMX95_CLK_32K>; - clock-names = "hsio", "suspend"; - interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + hsio_blk_ctl: syscon@4c0100c0 { + compatible = "nxp,imx95-hsio-blk-ctl", "syscon"; + reg = <0x0 0x4c0100c0 0x0 0x1>; + #clock-cells = <1>; + clocks = <&clk_sys100m>; + power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; + }; + + bus@4c100000 { + compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; - ranges; - power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; dma-ranges = <0x0 0x0 0x0 0x0 0x10 0x0>; - status = "disabled"; + ranges; - usb3_dwc3: usb@4c100000 { - compatible = "snps,dwc3"; - reg = <0x0 0x4c100000 0x0 0x10000>; + usb3: usb3_dwc3: usb@4c100000 { + compatible = "nxp,imx95-dwc3", "nxp,imx8mp-dwc3"; + reg = <0x0 0x4c100000 0x0 0x10000>, + <0x0 0x4c010010 0x0 0x04>, + <0x0 0x4c1f0000 0x0 0x20>; + reg-names = "core", "blkctl", "glue"; clocks = <&scmi_clk IMX95_CLK_HSIO>, + <&scmi_clk IMX95_CLK_HSIO>, <&scmi_clk IMX95_CLK_24M>, <&scmi_clk IMX95_CLK_32K>; - clock-names = "bus_early", "ref", "suspend"; - interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "hsio", "bus_early", "ref", "suspend"; + interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "dwc_usb3", "wakeup"; + power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; phys = <&usb3_phy>, <&usb3_phy>; phy-names = "usb2-phy", "usb3-phy"; snps,gfladj-refclk-lpm-sel-quirk; snps,parkmode-disable-ss-quirk; iommus = <&smmu 0xe>; + status = "disabled"; }; }; - hsio_blk_ctl: syscon@4c0100c0 { - compatible = "nxp,imx95-hsio-blk-ctl", "syscon"; - reg = <0x0 0x4c0100c0 0x0 0x1>; - #clock-cells = <1>; - clocks = <&clk_sys100m>; - power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; - }; - usb3_phy: phy@4c1f0040 { compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy"; reg = <0x0 0x4c1f0040 0x0 0x40>,
Signature · 1 line
2.34.1
[email protected]
AI reviewRe: [PATCH v3 3/4] arm64: dts: imx95: switch usb3 controller to flattened model
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] The newly added wrapper node `bus@4c100000` contains a unit address but lacks a `reg` property…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The newly added wrapper node bus@4c100000 contains a unit address but lacks a reg property, violating the Devicetree Specification and triggering a DTC warning. --
commit a2bcbb6922581174c083a123854fd752994b591f
Author: Xu Yang <[email protected]>
arm64: dts: imx95: switch usb3 controller to flattened model
This commit switches the USB3 controller to use a flattened model. It adds a simple-bus wrapper to constrain the DMA address range so the controller can access memory correctly.
Quoted 4 lines
arch/arm64/boot/dts/freescale/imx95.dtsi +0
-0
[ ... ]
Quoted 1 line
arch/arm64/boot/dts/freescale/imx95.dtsi +0
-0@@ -1772,45 +1772,45 @@ smmu: iommu@490d0000 {
[ ... ]
arch/arm64/boot/dts/freescale/imx95.dtsi pmu@49252000 { · line 1883
Quoted 9 lines
arch/arm64/boot/dts/freescale/imx95.dtsi +3
-3+ bus@4c100000 { + compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; - ranges; - power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; dma-ranges = <0x0 0x0 0x0 0x0 0x10 0x0>; - status = "disabled"; + ranges;
[Severity: Low]
Does this new wrapper node trigger a DTC unit_address_vs_reg warning?
Because the node has a unit address (@4c100000) but lacks a reg property, it violates the devicetree specification. Empty ranges properties are ignored by DTC for this check, which will result in a build warning when compiling with W=1.
Quoted 2 lines
arch/arm64/boot/dts/freescale/imx95.dtsi +0
-1- usb3_dwc3: usb@4c100000 {
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
PATCH v3 4/4 arm64: dts: imx8mq-evk: add typec node
In reply to Xu YangFrom: Xu Yang <[email protected]>
The first USB port features a Type-C connector with dual data role and dual power role capabilities. Add the Type-C device node and enable the corresponding USB controller and phy node.
---
Changes in v3:
- no changes
Changes in v2:
- no changes
--- arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 59 ++++++++++++++++++++ 1 file changed, 59 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq-evk.dts +59 -0
@@ -6,6 +6,7 @@ /dts-v1/; +#include <dt-bindings/usb/pd.h> #include "imx8mq.dtsi" / {
@@ -330,6 +331,35 @@ vgen6_reg: vgen6 { }; }; }; + + ptn5110: tcpc@50 { + compatible = "nxp,ptn5110", "tcpci"; + reg = <0x50>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_typec>; + interrupt-parent = <&gpio3>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + orientation-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + data-role = "dual"; + try-power-role = "sink"; + source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; + sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM) + PDO_VAR(5000, 20000, 3000)>; + op-sink-microwatt = <15000000>; + self-powered; + + port { + typec_con_hs: endpoint { + remote-endpoint = <&usb3_data_hs>; + }; + }; + }; + }; }; &lcdif {
@@ -498,6 +528,28 @@ &uart1 { status = "okay"; }; +&usb3_phy0 { + status = "okay"; +}; + +&usb_dwc3_0 { + dr_mode = "otg"; + hnp-disable; + srp-disable; + adp-disable; + usb-role-switch; + role-switch-default-mode = "peripheral"; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + status = "okay"; + + port { + usb3_data_hs: endpoint { + remote-endpoint = <&typec_con_hs>; + }; + }; +}; + &usb3_phy1 { status = "okay"; };
@@ -650,6 +702,13 @@ MX8MQ_IOMUXC_SPDIF_RX_SPDIF1_IN 0xd6 >; }; + pinctrl_typec: typecgrp { + fsl,pins = < + MX8MQ_IOMUXC_NAND_CE2_B_GPIO3_IO3 0x17059 + MX8MQ_IOMUXC_NAND_RE_B_GPIO3_IO15 0x16 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX8MQ_IOMUXC_UART1_RXD_UART1_DCE_RX 0x49
Signature · 1 line
2.34.1
[email protected]
AppliedFrom: Frank Li <[email protected]>
Quoted 3 lines · Xu Yang
The first USB port features a Type-C connector with dual data role and dual power role capabilities. Add the Type-C device node and enable the corresponding USB controller and phy node.
Applied, thanks!
[1/4] arm64: dts: imx8mp-evk: add typec node
commit: 6e62bc736674601a8764f01217ac539e75d71fc8
[2/4] arm64: dts: imx8mp-evk: add usb3_phy1 tuning properties
commit: 05d5a7fcb2399d4398a651dcf3b4a01290418435
[3/4] arm64: dts: imx95: switch usb3 controller to flattened model
commit: 94aad340fbf22a8a2484879c1e862c856d0e946f
[4/4] arm64: dts: imx8mq-evk: add typec node
commit: b9fff21cbd480f47f04debbce6c14f48dd715f0aBest regards,
Signature · 1 line
Frank Li <[email protected]>