pá 6. 8. 2021 v 12:12 odesílatel Michal Simek <michal.simek@xxxxxxxxxx> napsal:
>
> The commit 84770f028fab ("usb: dwc3: Add driver for Xilinx platforms")
> finally add proper support for Xilinx dwc3 driver. This patch is adding DT
> description for it.
>
> Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
> ---
>
> Changes in v3:
> - usb node name fix, remove undocumented properties reported by Michael Tretter
> - Also remove status property from dwc3_0/1 nodes reported by Michael
> Tretter
> - Move USB3 PHY properties from DWC3 node to USB node - reported by Manish
> Narani
>
> Changes in v2:
> - New patch in the series
>
> .../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 8 ++-
> .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 7 +++
> .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 14 +++++
> .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 14 ++++-
> .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 ++-
> .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 8 ++-
> .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 8 ++-
> .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 8 ++-
> .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 8 ++-
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 60 +++++++++++++++----
> 10 files changed, 122 insertions(+), 21 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
> index d93fe2efa39d..b05be2552826 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
> @@ -27,6 +27,7 @@ aliases {
> rtc0 = &rtc;
> serial0 = &uart0;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -404,9 +405,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
> index cd61550c52e5..938b76bd0527 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
> @@ -26,6 +26,7 @@ aliases {
> serial1 = &uart1;
> spi0 = &spi0;
> spi1 = &spi1;
> + usb0 = &usb1;
> };
>
> chosen {
> @@ -479,7 +480,13 @@ &usb1 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb1_default>;
> +};
> +
> +&dwc3_1 {
> + status = "okay";
> dr_mode = "host";
> + snps,usb3_lpm_capable;
> + maximum-speed = "super-speed";
> };
>
> &uart0 {
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
> index ba7f1f21c579..4394ec3b6a23 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
> @@ -24,6 +24,8 @@ aliases {
> rtc0 = &rtc;
> serial0 = &uart0;
> serial1 = &uart1;
> + usb0 = &usb0;
> + usb1 = &usb1;
> };
>
> chosen {
> @@ -147,11 +149,23 @@ &uart1 {
>
> &usb0 {
> status = "okay";
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> dr_mode = "host";
> + snps,usb3_lpm_capable;
> + maximum-speed = "super-speed";
> };
>
> /* ULPI SMSC USB3320 */
> &usb1 {
> status = "okay";
> +};
> +
> +&dwc3_1 {
> + status = "okay";
> dr_mode = "host";
> + snps,usb3_lpm_capable;
> + maximum-speed = "super-speed";
> };
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
> index 80415e202814..f6aad4159ccd 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
> @@ -30,6 +30,8 @@ aliases {
> serial2 = &dcc;
> spi0 = &spi0;
> spi1 = &spi1;
> + usb0 = &usb0;
> + usb1 = &usb1;
> mmc0 = &sdhci0;
> mmc1 = &sdhci1;
> };
> @@ -537,9 +539,13 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "peripheral";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "peripheral";
> maximum-speed = "super-speed";
> };
>
> @@ -548,9 +554,13 @@ &usb1 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb1_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
> +};
> +
> +&dwc3_1 {
> + status = "okay";
> + dr_mode = "host";
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
> index 3d8d14ef1ede..7b9a88b125d1 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
> @@ -31,6 +31,7 @@ aliases {
> serial1 = &uart1;
> serial2 = &dcc;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -997,9 +998,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
> index 86fff3632c7d..bd8f20f3223d 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
> @@ -29,6 +29,7 @@ aliases {
> serial1 = &uart1;
> serial2 = &dcc;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -481,9 +482,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
> index 2a872d439804..96feaad30166 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
> @@ -29,6 +29,7 @@ aliases {
> serial1 = &uart1;
> serial2 = &dcc;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -493,9 +494,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
> index 057c04352591..20b7c75bb1d3 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
> @@ -31,6 +31,7 @@ aliases {
> serial1 = &uart1;
> serial2 = &dcc;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -990,9 +991,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
> index e1fff62a4cd5..e36df6adbeee 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
> @@ -30,6 +30,7 @@ aliases {
> serial0 = &uart0;
> serial1 = &dcc;
> spi0 = &qspi;
> + usb0 = &usb0;
> };
>
> chosen {
> @@ -827,9 +828,14 @@ &usb0 {
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> - dr_mode = "host";
> phy-names = "usb3-phy";
> phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> +};
> +
> +&dwc3_0 {
> + status = "okay";
> + dr_mode = "host";
> + snps,usb3_lpm_capable;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index b5fde9dddca5..74e66443e4ce 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -2,7 +2,7 @@
> /*
> * dts file for Xilinx ZynqMP
> *
> - * (C) Copyright 2014 - 2019, Xilinx, Inc.
> + * (C) Copyright 2014 - 2021, Xilinx, Inc.
> *
> * Michal Simek <michal.simek@xxxxxxxxxx>
> *
> @@ -805,24 +805,58 @@ uart1: serial@ff010000 {
> power-domains = <&zynqmp_firmware PD_UART_1>;
> };
>
> - usb0: usb@fe200000 {
> - compatible = "snps,dwc3";
> + usb0: usb@ff9d0000 {
> + #address-cells = <2>;
> + #size-cells = <2>;
> status = "disabled";
> - interrupt-parent = <&gic>;
> - interrupts = <0 65 4>;
> - reg = <0x0 0xfe200000 0x0 0x40000>;
> - clock-names = "clk_xin", "clk_ahb";
> + compatible = "xlnx,zynqmp-dwc3";
> + reg = <0x0 0xff9d0000 0x0 0x100>;
> + clock-names = "bus_clk", "ref_clk";
> power-domains = <&zynqmp_firmware PD_USB_0>;
> + resets = <&zynqmp_reset ZYNQMP_RESET_USB0_CORERESET>,
> + <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>,
> + <&zynqmp_reset ZYNQMP_RESET_USB0_APB>;
> + reset-names = "usb_crst", "usb_hibrst", "usb_apbrst";
> + ranges;
> +
> + dwc3_0: usb@fe200000 {
> + compatible = "snps,dwc3";
> + reg = <0x0 0xfe200000 0x0 0x40000>;
> + interrupt-parent = <&gic>;
> + interrupt-names = "dwc_usb3", "otg";
> + interrupts = <0 65 4>, <0 69 4>;
> + #stream-id-cells = <1>;
> + iommus = <&smmu 0x860>;
> + snps,quirk-frame-length-adjustment = <0x20>;
> + /* dma-coherent; */
> + };
> };
>
> - usb1: usb@fe300000 {
> - compatible = "snps,dwc3";
> + usb1: usb@ff9e0000 {
> + #address-cells = <2>;
> + #size-cells = <2>;
> status = "disabled";
> - interrupt-parent = <&gic>;
> - interrupts = <0 70 4>;
> - reg = <0x0 0xfe300000 0x0 0x40000>;
> - clock-names = "clk_xin", "clk_ahb";
> + compatible = "xlnx,zynqmp-dwc3";
> + reg = <0x0 0xff9e0000 0x0 0x100>;
> + clock-names = "bus_clk", "ref_clk";
> power-domains = <&zynqmp_firmware PD_USB_1>;
> + resets = <&zynqmp_reset ZYNQMP_RESET_USB1_CORERESET>,
> + <&zynqmp_reset ZYNQMP_RESET_USB1_HIBERRESET>,
> + <&zynqmp_reset ZYNQMP_RESET_USB1_APB>;
> + reset-names = "usb_crst", "usb_hibrst", "usb_apbrst";
> + ranges;
> +
> + dwc3_1: usb@fe300000 {
> + compatible = "snps,dwc3";
> + reg = <0x0 0xfe300000 0x0 0x40000>;
> + interrupt-parent = <&gic>;
> + interrupt-names = "dwc_usb3", "otg";
> + interrupts = <0 70 4>, <0 74 4>;
> + #stream-id-cells = <1>;
> + iommus = <&smmu 0x861>;
> + snps,quirk-frame-length-adjustment = <0x20>;
> + /* dma-coherent; */
> + };
> };
>
> watchdog0: watchdog@fd4d0000 {
> --
> 2.32.0
>
Applied but only this patch. For Kria still waiting for Rob's reaction.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
