diff mbox series

[v8,1/3] phy: fsl-imx8mq-usb: add tca function driver for imx95

Message ID 20241015111018.2388913-1-xu.yang_2@nxp.com
State Superseded
Headers show
Series [v8,1/3] phy: fsl-imx8mq-usb: add tca function driver for imx95 | expand

Commit Message

Xu Yang Oct. 15, 2024, 11:10 a.m. UTC 
The i.MX95 USB3 phy has a Type-C Assist block (TCA). This block consists
two functional blocks (XBar assist and VBus assist) and one system
access interface using APB.

The primary functionality of XBar assist is:
 - switching lane for flip
 - moving unused lanes into lower power states.

This info can be get from:
i.MX95 RM Chapter 163.3.8 Type-C assist (TCA) block.

This will add support for TCA block to achieve lane switching and tca
lower power functionality.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
Reviewed-by: Jun Li <jun.li@nxp.com>

---
Changes in v2:
 - return the value of imx95_usb_phy_get_tca()
Changes in v3:
 - no changes
Changes in v4:
 - remove compatible check for imx95
 - check whether tca register region exist or not, yes means has tca,
   otherwise skip tca setup
Changes in v5:
 - no changes
Changes in v6:
 - no changes
Changes in v7:
 - fix sparse warnings in imx95_usb_phy_get_tca()
Changes in v8:
 - #define TCA_INFO 0xFC -> 0xfc
---
 drivers/phy/freescale/Kconfig              |   1 +
 drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 243 +++++++++++++++++++++
 2 files changed, 244 insertions(+)

Comments

Alexander Stein Oct. 16, 2024, 8:38 a.m. UTC | #1 
Hello,

Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> Add usb3 phy and controller nodes for imx95.
> 
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> 
> ---
> Changes in v2:
>  - no changes
> Changes in v3:
>  - no changes
> Changes in v4:
>  - reorder nodes
> Changes in v5:
>  - no changes
> Changes in v6:
>  - rebase to latest
> Changes in v7:
>  - no changes
> Changes in v8:
>  - no changes
> ---
>  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> index 03661e76550f..e3faa8462759 100644
> --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
>  			};
>  		};
>  
> +		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>;
> +			#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";
> +
> +			usb3_dwc3: usb@4c100000 {
> +				compatible = "snps,dwc3";
> +				reg = <0x0 0x4c100000 0x0 0x10000>;
> +				clocks = <&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>;
> +				phys = <&usb3_phy>, <&usb3_phy>;
> +				phy-names = "usb2-phy", "usb3-phy";
> +				snps,gfladj-refclk-lpm-sel-quirk;
> +				snps,parkmode-disable-ss-quirk;

Downstream kernel also configures
> snps,tx-max-burst = /bits/ 8 <4>;
> snps,tx-thr-num-pkt = /bits/ 8 <1>;

is this not needed and omitted on purpose?

Best regards,
Alexander

> +				iommus = <&smmu 0xe>;
> +			};
> +		};
> +
> +		usb3_phy: phy@4c1f0040 {
> +			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
> +			reg = <0x0 0x4c1f0040 0x0 0x40>,
> +			      <0x0 0x4c1fc000 0x0 0x100>;
> +			clocks = <&scmi_clk IMX95_CLK_HSIO>;
> +			clock-names = "phy";
> +			#phy-cells = <0>;
> +			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
> +			orientation-switch;
> +			status = "disabled";
> +		};
> +
>  		pcie0: pcie@4c300000 {
>  			compatible = "fsl,imx95-pcie";
>  			reg = <0 0x4c300000 0 0x10000>,
>
Alexander Stein Oct. 16, 2024, 8:53 a.m. UTC | #2 
Hi,

another thing I just noticed.

Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> Add usb3 phy and controller nodes for imx95.
> 
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> 
> ---
> Changes in v2:
>  - no changes
> Changes in v3:
>  - no changes
> Changes in v4:
>  - reorder nodes
> Changes in v5:
>  - no changes
> Changes in v6:
>  - rebase to latest
> Changes in v7:
>  - no changes
> Changes in v8:
>  - no changes
> ---
>  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> index 03661e76550f..e3faa8462759 100644
> --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
>  			};
>  		};
>  
> +		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>;
> +			#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";
> +
> +			usb3_dwc3: usb@4c100000 {
> +				compatible = "snps,dwc3";
> +				reg = <0x0 0x4c100000 0x0 0x10000>;
> +				clocks = <&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>;
> +				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>;
> +			};
> +		};
> +
> +		usb3_phy: phy@4c1f0040 {
> +			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
> +			reg = <0x0 0x4c1f0040 0x0 0x40>,
> +			      <0x0 0x4c1fc000 0x0 0x100>;
> +			clocks = <&scmi_clk IMX95_CLK_HSIO>;
> +			clock-names = "phy";
> +			#phy-cells = <0>;
> +			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
> +			orientation-switch;
> +			status = "disabled";

I got these dtbs check warnings:

arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb:
 phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
        'port' is a required property
        'ports' is a required property
        from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb: 
 phy@4c1f0040: Unevaluated properties are not allowed ('orientation-switch' was unexpected)
        from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#


How am I supposed to specify a port when the usb3 is used in host mode, thus
no USB Type-C connector and no 'port' OF-graph accordingly?

Best regards,
Alexander

> +		};
> +
>  		pcie0: pcie@4c300000 {
>  			compatible = "fsl,imx95-pcie";
>  			reg = <0 0x4c300000 0 0x10000>,
>
Xu Yang Oct. 16, 2024, 10:30 a.m. UTC | #3 
On Wed, Oct 16, 2024 at 10:38:52AM +0200, Alexander Stein wrote:
> Hello,
> 
> Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> > Add usb3 phy and controller nodes for imx95.
> > 
> > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > 
> > ---
> > Changes in v2:
> >  - no changes
> > Changes in v3:
> >  - no changes
> > Changes in v4:
> >  - reorder nodes
> > Changes in v5:
> >  - no changes
> > Changes in v6:
> >  - rebase to latest
> > Changes in v7:
> >  - no changes
> > Changes in v8:
> >  - no changes
> > ---
> >  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
> >  1 file changed, 43 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > index 03661e76550f..e3faa8462759 100644
> > --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
> >  			};
> >  		};
> >  
> > +		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>;
> > +			#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";
> > +
> > +			usb3_dwc3: usb@4c100000 {
> > +				compatible = "snps,dwc3";
> > +				reg = <0x0 0x4c100000 0x0 0x10000>;
> > +				clocks = <&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>;
> > +				phys = <&usb3_phy>, <&usb3_phy>;
> > +				phy-names = "usb2-phy", "usb3-phy";
> > +				snps,gfladj-refclk-lpm-sel-quirk;
> > +				snps,parkmode-disable-ss-quirk;
> 
> Downstream kernel also configures
> > snps,tx-max-burst = /bits/ 8 <4>;
> > snps,tx-thr-num-pkt = /bits/ 8 <1>;
> 
> is this not needed and omitted on purpose?

Yes, on purpose. The later newer soc doesn't need these properties.

Thanks,
Xu Yang
Xu Yang Oct. 16, 2024, 10:41 a.m. UTC | #4 
On Wed, Oct 16, 2024 at 10:53:50AM +0200, Alexander Stein wrote:
> Hi,
> 
> another thing I just noticed.
> 
> Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> > Add usb3 phy and controller nodes for imx95.
> > 
> > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > 
> > ---
> > Changes in v2:
> >  - no changes
> > Changes in v3:
> >  - no changes
> > Changes in v4:
> >  - reorder nodes
> > Changes in v5:
> >  - no changes
> > Changes in v6:
> >  - rebase to latest
> > Changes in v7:
> >  - no changes
> > Changes in v8:
> >  - no changes
> > ---
> >  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
> >  1 file changed, 43 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > index 03661e76550f..e3faa8462759 100644
> > --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
> >  			};
> >  		};
> >  
> > +		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>;
> > +			#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";
> > +
> > +			usb3_dwc3: usb@4c100000 {
> > +				compatible = "snps,dwc3";
> > +				reg = <0x0 0x4c100000 0x0 0x10000>;
> > +				clocks = <&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>;
> > +				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>;
> > +			};
> > +		};
> > +
> > +		usb3_phy: phy@4c1f0040 {
> > +			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
> > +			reg = <0x0 0x4c1f0040 0x0 0x40>,
> > +			      <0x0 0x4c1fc000 0x0 0x100>;
> > +			clocks = <&scmi_clk IMX95_CLK_HSIO>;
> > +			clock-names = "phy";
> > +			#phy-cells = <0>;
> > +			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
> > +			orientation-switch;
> > +			status = "disabled";
> 
> I got these dtbs check warnings:
> 
> arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb:
>  phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
>         'port' is a required property
>         'ports' is a required property
>         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb: 
>  phy@4c1f0040: Unevaluated properties are not allowed ('orientation-switch' was unexpected)
>         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#

Are you checking on usb tree? You need below two dt-binding patch.

 - dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95
 - dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"

> 
> 
> How am I supposed to specify a port when the usb3 is used in host mode, thus
> no USB Type-C connector and no 'port' OF-graph accordingly?

Host-only mode with Type-A connector? No Typec-C connector?
Sorry, I do not get your meaning.

Thanks,
Xu Yang
Alexander Stein Oct. 16, 2024, 11:03 a.m. UTC | #5 
Hi,

Am Mittwoch, 16. Oktober 2024, 12:41:40 CEST schrieb Xu Yang:
> On Wed, Oct 16, 2024 at 10:53:50AM +0200, Alexander Stein wrote:
> > Hi,
> > 
> > another thing I just noticed.
> > 
> > Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> > > Add usb3 phy and controller nodes for imx95.
> > > 
> > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > > 
> > > ---
> > > Changes in v2:
> > >  - no changes
> > > Changes in v3:
> > >  - no changes
> > > Changes in v4:
> > >  - reorder nodes
> > > Changes in v5:
> > >  - no changes
> > > Changes in v6:
> > >  - rebase to latest
> > > Changes in v7:
> > >  - no changes
> > > Changes in v8:
> > >  - no changes
> > > ---
> > >  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
> > >  1 file changed, 43 insertions(+)
> > > 
> > > diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > index 03661e76550f..e3faa8462759 100644
> > > --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
> > >  			};
> > >  		};
> > >  
> > > +		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>;
> > > +			#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";
> > > +
> > > +			usb3_dwc3: usb@4c100000 {
> > > +				compatible = "snps,dwc3";
> > > +				reg = <0x0 0x4c100000 0x0 0x10000>;
> > > +				clocks = <&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>;
> > > +				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>;
> > > +			};
> > > +		};
> > > +
> > > +		usb3_phy: phy@4c1f0040 {
> > > +			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
> > > +			reg = <0x0 0x4c1f0040 0x0 0x40>,
> > > +			      <0x0 0x4c1fc000 0x0 0x100>;
> > > +			clocks = <&scmi_clk IMX95_CLK_HSIO>;
> > > +			clock-names = "phy";
> > > +			#phy-cells = <0>;
> > > +			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
> > > +			orientation-switch;
> > > +			status = "disabled";
> > 
> > I got these dtbs check warnings:
> > 
> > arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb:
> >  phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
> >         'port' is a required property
> >         'ports' is a required property
> >         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> > arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb: 
> >  phy@4c1f0040: Unevaluated properties are not allowed ('orientation-switch' was unexpected)
> >         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> 
> Are you checking on usb tree? You need below two dt-binding patch.
> 
>  - dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95
>  - dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"

Yes, these patches are already in linux-next. I'm on next-20241016.

> > 
> > 
> > How am I supposed to specify a port when the usb3 is used in host mode, thus
> > no USB Type-C connector and no 'port' OF-graph accordingly?
> 
> Host-only mode with Type-A connector? No Typec-C connector?
> Sorry, I do not get your meaning.

Yes, no Type-C connector. Actually not even a Type-A as there is an
on-board USB hub attached to this host.

Best regards,
Alexander
Alexander Stein Oct. 17, 2024, 11:40 a.m. UTC | #6 
Hi,

Am Donnerstag, 17. Oktober 2024, 12:28:11 CEST schrieb Xu Yang:
> On Wed, Oct 16, 2024 at 01:03:53PM +0200, Alexander Stein wrote:
> > Hi,
> > 
> > Am Mittwoch, 16. Oktober 2024, 12:41:40 CEST schrieb Xu Yang:
> > > On Wed, Oct 16, 2024 at 10:53:50AM +0200, Alexander Stein wrote:
> > > > Hi,
> > > > 
> > > > another thing I just noticed.
> > > > 
> > > > Am Dienstag, 15. Oktober 2024, 13:10:17 CEST schrieb Xu Yang:
> > > > > Add usb3 phy and controller nodes for imx95.
> > > > > 
> > > > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > > > > 
> > > > > ---
> > > > > Changes in v2:
> > > > >  - no changes
> > > > > Changes in v3:
> > > > >  - no changes
> > > > > Changes in v4:
> > > > >  - reorder nodes
> > > > > Changes in v5:
> > > > >  - no changes
> > > > > Changes in v6:
> > > > >  - rebase to latest
> > > > > Changes in v7:
> > > > >  - no changes
> > > > > Changes in v8:
> > > > >  - no changes
> > > > > ---
> > > > >  arch/arm64/boot/dts/freescale/imx95.dtsi | 43 ++++++++++++++++++++++++
> > > > >  1 file changed, 43 insertions(+)
> > > > > 
> > > > > diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > > > index 03661e76550f..e3faa8462759 100644
> > > > > --- a/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > > > +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
> > > > > @@ -1473,6 +1473,49 @@ smmu: iommu@490d0000 {
> > > > >  			};
> > > > >  		};
> > > > >  
> > > > > +		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>;
> > > > > +			#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";
> > > > > +
> > > > > +			usb3_dwc3: usb@4c100000 {
> > > > > +				compatible = "snps,dwc3";
> > > > > +				reg = <0x0 0x4c100000 0x0 0x10000>;
> > > > > +				clocks = <&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>;
> > > > > +				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>;
> > > > > +			};
> > > > > +		};
> > > > > +
> > > > > +		usb3_phy: phy@4c1f0040 {
> > > > > +			compatible = "fsl,imx95-usb-phy", "fsl,imx8mp-usb-phy";
> > > > > +			reg = <0x0 0x4c1f0040 0x0 0x40>,
> > > > > +			      <0x0 0x4c1fc000 0x0 0x100>;
> > > > > +			clocks = <&scmi_clk IMX95_CLK_HSIO>;
> > > > > +			clock-names = "phy";
> > > > > +			#phy-cells = <0>;
> > > > > +			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
> > > > > +			orientation-switch;
> > > > > +			status = "disabled";
> > > > 
> > > > I got these dtbs check warnings:
> > > > 
> > > > arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb:
> > > >  phy@4c1f0040: 'oneOf' conditional failed, one must be fixed:
> > > >         'port' is a required property
> > > >         'ports' is a required property
> > > >         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> > > > arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dtb: 
> > > >  phy@4c1f0040: Unevaluated properties are not allowed ('orientation-switch' was unexpected)
> > > >         from schema $id: http://devicetree.org/schemas/phy/fsl,imx8mq-usb-phy.yaml#
> > > 
> > > Are you checking on usb tree? You need below two dt-binding patch.
> > > 
> > >  - dt-bindings: usb: dwc3-imx8mp: add compatible string for imx95
> > >  - dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"
> > 
> > Yes, these patches are already in linux-next. I'm on next-20241016.
> > 
> > > > 
> > > > 
> > > > How am I supposed to specify a port when the usb3 is used in host mode, thus
> > > > no USB Type-C connector and no 'port' OF-graph accordingly?
> > > 
> > > Host-only mode with Type-A connector? No Typec-C connector?
> > > Sorry, I do not get your meaning.
> > 
> > Yes, no Type-C connector. Actually not even a Type-A as there is an
> > on-board USB hub attached to this host.
> 
> Understood. imx95 usb phy can work w/o typec. So I may need modify the
> dt-binding to be similar to the following format:
> 
> If property "orientation-switch" exist and compatible contain "fsl,imx95-usb-phy",
> then refer to usb-switch.yaml.

What 'works' is adding an empty port node to the usb3_phy. But this feels like a workaround.

> However, I'm not sure how to do that now. Do you know?

DT guys, can you more input how to proceed?

Best regards,
Alexander
Frank Li Oct. 21, 2024, 6:57 p.m. UTC | #7 
On Mon, Oct 21, 2024 at 11:48:03PM +0530, Vinod Koul wrote:
> On 15-10-24, 19:10, Xu Yang wrote:
>
> > @@ -359,6 +587,8 @@ static const struct of_device_id imx8mq_usb_phy_of_match[] = {
> >  	 .data = &imx8mq_usb_phy_ops,},
> >  	{.compatible = "fsl,imx8mp-usb-phy",
> >  	 .data = &imx8mp_usb_phy_ops,},
> > +	{.compatible = "fsl,imx95-usb-phy",
> > +	 .data = &imx8mp_usb_phy_ops,},
>
> Where is fsl,imx95-usb-phy documented?

fsl,imx95-usb-phy already in kernel tree. This patch just add new tca
function for it.

commit 814ab2641a22c0febf425d0a19c9cd4df00ba4bc
Author: Xu Yang <xu.yang_2@nxp.com>
Date:   Wed Sep 11 14:17:16 2024 +0800

    dt-bindings: phy: imx8mq-usb: add compatible "fsl,imx95-usb-phy"

    The usb phy in i.MX95 is compatible with i.MX8MP's, this will add a
    compatible "fsl,imx95-usb-phy" for i.MX95. Also change reg maxItems
    to 2 since i.MX95 needs another regmap to control Type-C Assist (TCA)
    block. Since i.MX95 usb phy is able to switch SS lanes, this will also
    add orientation-switch and port property to the file.

    Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

    Link: https://lore.kernel.org/r/20240911061720.495606-1-xu.yang_2@nxp.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Frank

>
> --
> ~Vinod
diff mbox series

Patch

diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig
index dcd9acff6d01..81f53564ee15 100644
--- a/drivers/phy/freescale/Kconfig
+++ b/drivers/phy/freescale/Kconfig
@@ -5,6 +5,7 @@  if (ARCH_MXC && ARM64) || COMPILE_TEST
 config PHY_FSL_IMX8MQ_USB
 	tristate "Freescale i.MX8M USB3 PHY"
 	depends on OF && HAS_IOMEM
+	depends on TYPEC || TYPEC=n
 	select GENERIC_PHY
 	default ARCH_MXC && ARM64
 
diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
index adc6394626ce..f2b2da8cedc3 100644
--- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
+++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
@@ -10,6 +10,7 @@ 
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
+#include <linux/usb/typec_mux.h>
 
 #define PHY_CTRL0			0x0
 #define PHY_CTRL0_REF_SSP_EN		BIT(2)
@@ -50,11 +51,66 @@ 
 
 #define PHY_TUNE_DEFAULT		0xffffffff
 
+#define TCA_CLK_RST			0x00
+#define TCA_CLK_RST_SW			BIT(9)
+#define TCA_CLK_RST_REF_CLK_EN		BIT(1)
+#define TCA_CLK_RST_SUSPEND_CLK_EN	BIT(0)
+
+#define TCA_INTR_EN			0x04
+#define TCA_INTR_STS			0x08
+
+#define TCA_GCFG			0x10
+#define TCA_GCFG_ROLE_HSTDEV		BIT(4)
+#define TCA_GCFG_OP_MODE		GENMASK(1, 0)
+#define TCA_GCFG_OP_MODE_SYSMODE	0
+#define TCA_GCFG_OP_MODE_SYNCMODE	1
+
+#define TCA_TCPC			0x14
+#define TCA_TCPC_VALID			BIT(4)
+#define TCA_TCPC_LOW_POWER_EN		BIT(3)
+#define TCA_TCPC_ORIENTATION_NORMAL	BIT(2)
+#define TCA_TCPC_MUX_CONTRL		GENMASK(1, 0)
+#define TCA_TCPC_MUX_CONTRL_NO_CONN	0
+#define TCA_TCPC_MUX_CONTRL_USB_CONN	1
+
+#define TCA_SYSMODE_CFG			0x18
+#define TCA_SYSMODE_TCPC_DISABLE	BIT(3)
+#define TCA_SYSMODE_TCPC_FLIP		BIT(2)
+
+#define TCA_CTRLSYNCMODE_CFG0		0x20
+#define TCA_CTRLSYNCMODE_CFG1           0x20
+
+#define TCA_PSTATE			0x30
+#define TCA_PSTATE_CM_STS		BIT(4)
+#define TCA_PSTATE_TX_STS		BIT(3)
+#define TCA_PSTATE_RX_PLL_STS		BIT(2)
+#define TCA_PSTATE_PIPE0_POWER_DOWN	GENMASK(1, 0)
+
+#define TCA_GEN_STATUS			0x34
+#define TCA_GEN_DEV_POR			BIT(12)
+#define TCA_GEN_REF_CLK_SEL		BIT(8)
+#define TCA_GEN_TYPEC_FLIP_INVERT	BIT(4)
+#define TCA_GEN_PHY_TYPEC_DISABLE	BIT(3)
+#define TCA_GEN_PHY_TYPEC_FLIP		BIT(2)
+
+#define TCA_VBUS_CTRL			0x40
+#define TCA_VBUS_STATUS			0x44
+
+#define TCA_INFO			0xfc
+
+struct tca_blk {
+	struct typec_switch_dev *sw;
+	void __iomem *base;
+	struct mutex mutex;
+	enum typec_orientation orientation;
+};
+
 struct imx8mq_usb_phy {
 	struct phy *phy;
 	struct clk *clk;
 	void __iomem *base;
 	struct regulator *vbus;
+	struct tca_blk *tca;
 	u32 pcs_tx_swing_full;
 	u32 pcs_tx_deemph_3p5db;
 	u32 tx_vref_tune;
@@ -64,6 +120,175 @@  struct imx8mq_usb_phy {
 	u32 comp_dis_tune;
 };
 
+
+static void tca_blk_orientation_set(struct tca_blk *tca,
+				enum typec_orientation orientation);
+
+#ifdef CONFIG_TYPEC
+
+static int tca_blk_typec_switch_set(struct typec_switch_dev *sw,
+				enum typec_orientation orientation)
+{
+	struct imx8mq_usb_phy *imx_phy = typec_switch_get_drvdata(sw);
+	struct tca_blk *tca = imx_phy->tca;
+	int ret;
+
+	if (tca->orientation == orientation)
+		return 0;
+
+	ret = clk_prepare_enable(imx_phy->clk);
+	if (ret)
+		return ret;
+
+	tca_blk_orientation_set(tca, orientation);
+	clk_disable_unprepare(imx_phy->clk);
+
+	return 0;
+}
+
+static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
+					struct imx8mq_usb_phy *imx_phy)
+{
+	struct device *dev = &pdev->dev;
+	struct typec_switch_dev *sw;
+	struct typec_switch_desc sw_desc = { };
+
+	sw_desc.drvdata = imx_phy;
+	sw_desc.fwnode = dev->fwnode;
+	sw_desc.set = tca_blk_typec_switch_set;
+	sw_desc.name = NULL;
+
+	sw = typec_switch_register(dev, &sw_desc);
+	if (IS_ERR(sw)) {
+		dev_err(dev, "Error register tca orientation switch: %ld",
+				PTR_ERR(sw));
+		return NULL;
+	}
+
+	return sw;
+}
+
+static void tca_blk_put_typec_switch(struct typec_switch_dev *sw)
+{
+	typec_switch_unregister(sw);
+}
+
+#else
+
+static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
+			struct imx8mq_usb_phy *imx_phy)
+{
+	return NULL;
+}
+
+static void tca_blk_put_typec_switch(struct typec_switch_dev *sw) {}
+
+#endif /* CONFIG_TYPEC */
+
+static void tca_blk_orientation_set(struct tca_blk *tca,
+				enum typec_orientation orientation)
+{
+	u32 val;
+
+	mutex_lock(&tca->mutex);
+
+	if (orientation == TYPEC_ORIENTATION_NONE) {
+		/*
+		 * use Controller Synced Mode for TCA low power enable and
+		 * put PHY to USB safe state.
+		 */
+		val = readl(tca->base + TCA_GCFG);
+		val = FIELD_PREP(TCA_GCFG_OP_MODE, TCA_GCFG_OP_MODE_SYNCMODE);
+		writel(val, tca->base + TCA_GCFG);
+
+		val = readl(tca->base + TCA_TCPC);
+		val = TCA_TCPC_VALID | TCA_TCPC_LOW_POWER_EN;
+		writel(val, tca->base + TCA_TCPC);
+
+		goto out;
+	}
+
+	/* use System Configuration Mode for TCA mux control. */
+	val = readl(tca->base + TCA_GCFG);
+	val = FIELD_PREP(TCA_GCFG_OP_MODE, TCA_GCFG_OP_MODE_SYSMODE);
+	writel(val, tca->base + TCA_GCFG);
+
+	/* Disable TCA module */
+	val = readl(tca->base + TCA_SYSMODE_CFG);
+	val |= TCA_SYSMODE_TCPC_DISABLE;
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+	if (orientation == TYPEC_ORIENTATION_REVERSE)
+		val |= TCA_SYSMODE_TCPC_FLIP;
+	else if (orientation == TYPEC_ORIENTATION_NORMAL)
+		val &= ~TCA_SYSMODE_TCPC_FLIP;
+
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+	/* Enable TCA module */
+	val &= ~TCA_SYSMODE_TCPC_DISABLE;
+	writel(val, tca->base + TCA_SYSMODE_CFG);
+
+out:
+	tca->orientation = orientation;
+	mutex_unlock(&tca->mutex);
+}
+
+static void tca_blk_init(struct tca_blk *tca)
+{
+	u32 val;
+
+	/* reset XBar block */
+	val = readl(tca->base + TCA_CLK_RST);
+	val &= ~TCA_CLK_RST_SW;
+	writel(val, tca->base + TCA_CLK_RST);
+
+	udelay(100);
+
+	/* clear reset */
+	val |= TCA_CLK_RST_SW;
+	writel(val, tca->base + TCA_CLK_RST);
+
+	tca_blk_orientation_set(tca, tca->orientation);
+}
+
+static struct tca_blk *imx95_usb_phy_get_tca(struct platform_device *pdev,
+				struct imx8mq_usb_phy *imx_phy)
+{
+	struct device *dev = &pdev->dev;
+	struct resource *res;
+	struct tca_blk *tca;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+	if (!res)
+		return NULL;
+
+	tca = devm_kzalloc(dev, sizeof(*tca), GFP_KERNEL);
+	if (!tca)
+		return ERR_PTR(-ENOMEM);
+
+	tca->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(tca->base))
+		return ERR_CAST(tca->base);
+
+	mutex_init(&tca->mutex);
+
+	tca->orientation = TYPEC_ORIENTATION_NORMAL;
+	tca->sw = tca_blk_get_typec_switch(pdev, imx_phy);
+
+	return tca;
+}
+
+static void imx95_usb_phy_put_tca(struct imx8mq_usb_phy *imx_phy)
+{
+	struct tca_blk *tca = imx_phy->tca;
+
+	if (!tca)
+		return;
+
+	tca_blk_put_typec_switch(tca->sw);
+}
+
 static u32 phy_tx_vref_tune_from_property(u32 percent)
 {
 	percent = clamp(percent, 94U, 124U);
@@ -315,6 +540,9 @@  static int imx8mp_usb_phy_init(struct phy *phy)
 
 	imx8m_phy_tune(imx_phy);
 
+	if (imx_phy->tca)
+		tca_blk_init(imx_phy->tca);
+
 	return 0;
 }
 
@@ -359,6 +587,8 @@  static const struct of_device_id imx8mq_usb_phy_of_match[] = {
 	 .data = &imx8mq_usb_phy_ops,},
 	{.compatible = "fsl,imx8mp-usb-phy",
 	 .data = &imx8mp_usb_phy_ops,},
+	{.compatible = "fsl,imx95-usb-phy",
+	 .data = &imx8mp_usb_phy_ops,},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, imx8mq_usb_phy_of_match);
@@ -398,6 +628,11 @@  static int imx8mq_usb_phy_probe(struct platform_device *pdev)
 
 	phy_set_drvdata(imx_phy->phy, imx_phy);
 
+	imx_phy->tca = imx95_usb_phy_get_tca(pdev, imx_phy);
+	if (IS_ERR(imx_phy->tca))
+		return dev_err_probe(dev, PTR_ERR(imx_phy->tca),
+					"failed to get tca\n");
+
 	imx8m_get_phy_tuning_data(imx_phy);
 
 	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
@@ -405,8 +640,16 @@  static int imx8mq_usb_phy_probe(struct platform_device *pdev)
 	return PTR_ERR_OR_ZERO(phy_provider);
 }
 
+static void imx8mq_usb_phy_remove(struct platform_device *pdev)
+{
+	struct imx8mq_usb_phy *imx_phy = platform_get_drvdata(pdev);
+
+	imx95_usb_phy_put_tca(imx_phy);
+}
+
 static struct platform_driver imx8mq_usb_phy_driver = {
 	.probe	= imx8mq_usb_phy_probe,
+	.remove = imx8mq_usb_phy_remove,
 	.driver = {
 		.name	= "imx8mq-usb-phy",
 		.of_match_table	= imx8mq_usb_phy_of_match,