[PATCH] arm64: zynqmp: Move USB3 PHY properties from DWC3 node to USB node
Michal Simek
monstr at monstr.eu
Mon Jul 26 09:26:04 CEST 2021
po 19. 7. 2021 v 13:31 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> From: Manish Narani <manish.narani at xilinx.com>
>
> Move the PHY properties from DWC3 node to USB node in ZynqMP DTs as here
> the USB3 PHY used is PSGTR, which is connected to Xilinx USB core. This
> PHY initialization should be handled from Xilinx USB core as the
> prerequisite register configurations are done here only.
>
> Signed-off-by: Manish Narani <manish.narani at xilinx.com>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
> arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-sck-kv-g-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-sck-kv-g-revB.dts | 4 ++--
> arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 4 ++--
> arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 8 ++++----
> arch/arm/dts/zynqmp-zcu100-revC.dts | 8 ++++----
> arch/arm/dts/zynqmp-zcu102-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu104-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu104-revC.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu106-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu111-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu208-revA.dts | 4 ++--
> arch/arm/dts/zynqmp-zcu216-revA.dts | 4 ++--
> 13 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> index d50b335e674d..c893aaaafd8f 100644
> --- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> @@ -545,6 +545,8 @@
> status = "okay";
> xlnx,usb-polarity = <0>;
> xlnx,usb-reset-mode = <0>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 1 PHY_TYPE_USB3 0 1>;
> };
>
> &dwc3_0 {
> @@ -553,8 +555,6 @@
> snps,dis_u2_susphy_quirk;
> snps,dis_u3_susphy_quirk;
> maximum-speed = "super-speed";
> - phy-names = "usb3-phy";
> - phys = <&psgtr 1 PHY_TYPE_USB3 0 1>;
> };
>
> &usb1 {
> diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
> index 59d5751e0634..4e8086c82f23 100644
> --- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
> +++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
> @@ -125,6 +125,8 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
> usbhub: usb5744 { /* u43 */
> compatible = "microchip,usb5744";
> reset-gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
> @@ -135,8 +137,6 @@
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
> index b5443afff982..048d5665c57b 100644
> --- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
> +++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
> @@ -109,14 +109,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> index b92a2ee3e60a..4a87bd6a6aaf 100644
> --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
> @@ -424,14 +424,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
> index 344323ab7f93..13812470ae34 100644
> --- a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
> +++ b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
> @@ -221,27 +221,27 @@
>
> &usb0 {
> status = "okay";
> + phy-names = "usb3-phy";
> + phys = <&psgtr 0 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 0 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> /* ULPI SMSC USB3320 */
> &usb1 {
> status = "okay";
> + phy-names = "usb3-phy";
> + phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
> };
>
> &dwc3_1 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
> maximum-speed = "super-speed";
> };
> diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
> index 2d615774782f..ea630a43dc7f 100644
> --- a/arch/arm/dts/zynqmp-zcu100-revC.dts
> +++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
> @@ -561,13 +561,13 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "peripheral";
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
> maximum-speed = "super-speed";
> };
>
> @@ -576,13 +576,13 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb1_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
> };
>
> &dwc3_1 {
> status = "okay";
> dr_mode = "host";
> - phy-names = "usb3-phy";
> - phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
> index 1d4a9cdc69f0..175252d2def2 100644
> --- a/arch/arm/dts/zynqmp-zcu102-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
> @@ -1035,14 +1035,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
> index 7e5eca82fdaa..9cd30447eb3e 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
> @@ -502,14 +502,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
> index f4ebcbb318b4..45191569c101 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revC.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
> @@ -514,14 +514,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
> index ac6689c16730..50cc72eb9240 100644
> --- a/arch/arm/dts/zynqmp-zcu106-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
> @@ -1012,14 +1012,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
> index 8d57ca2b3bf3..2b15ce1ea847 100644
> --- a/arch/arm/dts/zynqmp-zcu111-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
> @@ -849,14 +849,14 @@
> status = "okay";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_usb0_default>;
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
>
> diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
> index d3e20ae85d7e..32a6e6fb55e2 100644
> --- a/arch/arm/dts/zynqmp-zcu208-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
> @@ -692,13 +692,13 @@
> /* ULPI SMSC USB3320 */
> &usb0 {
> status = "okay";
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
> diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
> index ae7c18196894..1e347036d0a7 100644
> --- a/arch/arm/dts/zynqmp-zcu216-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
> @@ -696,13 +696,13 @@
> /* ULPI SMSC USB3320 */
> &usb0 {
> status = "okay";
> + phy-names = "usb3-phy";
> + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> };
>
> &dwc3_0 {
> status = "okay";
> dr_mode = "host";
> snps,usb3_lpm_capable;
> - phy-names = "usb3-phy";
> - phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
> maximum-speed = "super-speed";
> };
> --
> 2.32.0
>
Applied.
M
--
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
More information about the U-Boot
mailing list