Commit 237a1bbc authored by Michal Simek's avatar Michal Simek
Browse files

arm64: zynqmp: Align usb clock nodes with binding 

dwc3-xilinx.yaml defines 2 clocks which are not defined that's why define
them (bus_early clock is moved to bus_clk in glue logic).
With also describing kv260 assigned clock rates with assigned clocks.
Also add missing status property to standard dwc3 core.

Link: https://lore.kernel.org/r/aa4c65a8997c7a65f23da3a3088bb5eb64281307.1704728353.git.michal.simek@amd.com


Signed-off-by: default avatarMichal Simek <michal.simek@amd.com>
parent 672aa9ab

arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi

+12 −2
Original line number Diff line number Diff line
@@ -238,12 +238,22 @@ &uart1 { 
	assigned-clocks = <&zynqmp_clk UART1_REF>;

};



&dwc3_0 {

&usb0 {

	clocks = <&zynqmp_clk USB0_BUS_REF>, <&zynqmp_clk USB3_DUAL_REF>;

	assigned-clocks = <&zynqmp_clk USB0_BUS_REF>, <&zynqmp_clk USB3_DUAL_REF>;

};



&dwc3_1 {

&dwc3_0 {

	clocks = <&zynqmp_clk USB3_DUAL_REF>;

};



&usb1 {

	clocks = <&zynqmp_clk USB1_BUS_REF>, <&zynqmp_clk USB3_DUAL_REF>;

	assigned-clocks = <&zynqmp_clk USB1_BUS_REF>, <&zynqmp_clk USB3_DUAL_REF>;

};



&dwc3_1 {

	clocks = <&zynqmp_clk USB3_DUAL_REF>;

};



&watchdog0 {

arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ &usb0 { 
	pinctrl-0 = <&pinctrl_usb0_default>;

	phy-names = "usb3-phy";

	phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;

	assigned-clock-rates = <250000000>, <20000000>;

};



&dwc3_0 {

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ usb0: usb@ff9d0000 { 
			status = "disabled";

			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>,
@@ -935,13 +936,14 @@ usb0: usb@ff9d0000 { 


			dwc3_0: usb@fe200000 {

				compatible = "snps,dwc3";

				status = "disabled";

				reg = <0x0 0xfe200000 0x0 0x40000>;

				interrupt-parent = <&gic>;

				interrupt-names = "host", "peripheral", "otg";

				interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

				clock-names = "bus_early", "ref";

				clock-names = "ref";

				/* iommus = <&smmu 0x860>; */

				snps,quirk-frame-length-adjustment = <0x20>;

				snps,resume-hs-terminations;
@@ -955,6 +957,7 @@ usb1: usb@ff9e0000 { 
			status = "disabled";

			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>,
@@ -964,13 +967,14 @@ usb1: usb@ff9e0000 { 


			dwc3_1: usb@fe300000 {

				compatible = "snps,dwc3";

				status = "disabled";

				reg = <0x0 0xfe300000 0x0 0x40000>;

				interrupt-parent = <&gic>;

				interrupt-names = "host", "peripheral", "otg";

				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

				clock-names = "bus_early", "ref";

				clock-names = "ref";

				/* iommus = <&smmu 0x861>; */

				snps,quirk-frame-length-adjustment = <0x20>;

				snps,resume-hs-terminations;