Skip to contentSkip to conversation

arm64: dts: imx8mp: correct usb clocks

PATCH Superseded Li Jun 4 participants 4 messages Sep 13, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Li Jun

author
#0 lore raw

PATCH v2 1/1 arm64: dts: imx8mp: correct usb clocks

After commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), usb_root_clk is no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.

---
change for v2:
- Add stable tag to apply v5.19+

 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +6 -6
index fe178b7d063c..2f18778a057f 100644
@@ -1169,7 +1169,7 @@ usb3_0: usb@32f10100 {
 			reg = <0x32f10100 0x8>,
 			      <0x381f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
 			power-domains = <&hsio_blk_ctrl IMX8MP_HSIOBLK_PD_USB>;
@@ -1182,9 +1182,9 @@ usb3_0: usb@32f10100 {
 			usb_dwc3_0: usb@38100000 {
 				compatible = "snps,dwc3";
 				reg = <0x38100000 0x10000>;
-				clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+				clocks = <&clk IMX8MP_CLK_USB_ROOT>,
 					 <&clk IMX8MP_CLK_USB_CORE_REF>,
-					 <&clk IMX8MP_CLK_USB_ROOT>;
+					 <&clk IMX8MP_CLK_USB_SUSP>;
 				clock-names = "bus_early", "ref", "suspend";
 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
 				phys = <&usb3_phy0>, <&usb3_phy0>;
@@ -1211,7 +1211,7 @@ usb3_1: usb@32f10108 {
 			reg = <0x32f10108 0x8>,
 			      <0x382f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
 			power-domains = <&hsio_blk_ctrl IMX8MP_HSIOBLK_PD_USB>;
@@ -1224,9 +1224,9 @@ usb3_1: usb@32f10108 {
 			usb_dwc3_1: usb@38200000 {
 				compatible = "snps,dwc3";
 				reg = <0x38200000 0x10000>;
-				clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+				clocks = <&clk IMX8MP_CLK_USB_ROOT>,
 					 <&clk IMX8MP_CLK_USB_CORE_REF>,
-					 <&clk IMX8MP_CLK_USB_ROOT>;
+					 <&clk IMX8MP_CLK_USB_SUSP>;
 				clock-names = "bus_early", "ref", "suspend";
 				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
 				phys = <&usb3_phy1>, <&usb3_phy1>;
Signature · 1 line
2.34.1
reviewer
#1 lore raw
Quoted 7 lines · Li Jun

After commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), usb_root_clk is no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.

Please also add the Fixes tag.

Tested-by on v2 1/1
#2 lore raw
In reply to Li Jun

Hello,

Am Dienstag, 13. September 2022, 13:10:26 CEST schrieb Li Jun:

Quoted 19 lines

After commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), usb_root_clk is no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.

---
change for v2:
- Add stable tag to apply v5.19+

 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index
fe178b7d063c..2f18778a057f 100644

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1174

Quoted 7 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
@@ -1169,7 +1169,7 @@ usb3_0: usb@32f10100 {
 			reg = <0x32f10100 0x8>,
 			      <0x381f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 148 

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1175

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 			power-domains = <&hsio_blk_ctrl 

IMX8MP_HSIOBLK_PD_USB>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1185

Quoted 5 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
@@ -1182,9 +1182,9 @@ usb3_0: usb@32f10100 {
 			usb_dwc3_0: usb@38100000 {
 				compatible = "snps,dwc3";
 				reg = <0x38100000 0x10000>;
-				clocks = <&clk 

IMX8MP_CLK_HSIO_AXI>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1185

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+				clocks = <&clk 

IMX8MP_CLK_USB_ROOT>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1186

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 					 <&clk 

IMX8MP_CLK_USB_CORE_REF>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1187

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-					 <&clk 

IMX8MP_CLK_USB_ROOT>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1187

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+					 <&clk 

IMX8MP_CLK_USB_SUSP>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1188

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 				clock-names = "bus_early", "ref", 

"suspend";

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1189

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 				interrupts = <GIC_SPI 40 

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1216

Quoted 9 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
 				phys = <&usb3_phy0>, <&usb3_phy0>;
@@ -1211,7 +1211,7 @@ usb3_1: usb@32f10108 {
 			reg = <0x32f10108 0x8>,
 			      <0x382f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 149 

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1217

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 			power-domains = <&hsio_blk_ctrl 

IMX8MP_HSIOBLK_PD_USB>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1227

Quoted 5 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
@@ -1224,9 +1224,9 @@ usb3_1: usb@32f10108 {
 			usb_dwc3_1: usb@38200000 {
 				compatible = "snps,dwc3";
 				reg = <0x38200000 0x10000>;
-				clocks = <&clk 

IMX8MP_CLK_HSIO_AXI>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1227

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+				clocks = <&clk 

IMX8MP_CLK_USB_ROOT>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1228

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 					 <&clk 

IMX8MP_CLK_USB_CORE_REF>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1229

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -1
-					 <&clk 

IMX8MP_CLK_USB_ROOT>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1229

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+					 <&clk 

IMX8MP_CLK_USB_SUSP>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1230

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 				clock-names = "bus_early", "ref", 

"suspend";

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1231

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 				interrupts = <GIC_SPI 41 

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 { · line 1232

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 				phys = <&usb3_phy1>, <&usb3_phy1>;

Together with the series [1] & [2] this fixes devices detection when the onboard hub is in runtime suspend.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

Reviewed-by on v2 1/1
#3 lore raw
In reply to Li Jun
Quoted 8 lines

Subject: [PATCH v2] arm64: dts: imx8mp: correct usb clocks

After commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), usb_root_clk is no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.

Quoted 62 lines

---
change for v2:
- Add stable tag to apply v5.19+

 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
index fe178b7d063c..2f18778a057f 100644
@@ -1169,7 +1169,7 @@ usb3_0: usb@32f10100 {
 			reg = <0x32f10100 0x8>,
 			      <0x381f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
 			power-domains = <&hsio_blk_ctrl

IMX8MP_HSIOBLK_PD_USB>; @@ -1182,9 +1182,9 @@ usb3_0:
usb@32f10100 {

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
 			usb_dwc3_0: usb@38100000 {
 				compatible = "snps,dwc3";
 				reg = <0x38100000 0x10000>;
-				clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+				clocks = <&clk IMX8MP_CLK_USB_ROOT>,
 					 <&clk

IMX8MP_CLK_USB_CORE_REF>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
-					 <&clk IMX8MP_CLK_USB_ROOT>;
+					 <&clk IMX8MP_CLK_USB_SUSP>;
 				clock-names = "bus_early", "ref", "suspend";
 				interrupts = <GIC_SPI 40

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
 				phys = <&usb3_phy0>, <&usb3_phy0>;
@@ -1211,7 +1211,7 @@ usb3_1: usb@32f10108 {
 			reg = <0x32f10108 0x8>,
 			      <0x382f0000 0x20>;
 			clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
-				 <&clk IMX8MP_CLK_USB_ROOT>;
+				 <&clk IMX8MP_CLK_USB_SUSP>;
 			clock-names = "hsio", "suspend";
 			interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
 			power-domains = <&hsio_blk_ctrl

IMX8MP_HSIOBLK_PD_USB>; @@ -1224,9 +1224,9 @@ usb3_1:
usb@32f10108 {

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
 			usb_dwc3_1: usb@38200000 {
 				compatible = "snps,dwc3";
 				reg = <0x38200000 0x10000>;
-				clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
+				clocks = <&clk IMX8MP_CLK_USB_ROOT>,
 					 <&clk

IMX8MP_CLK_USB_CORE_REF>,

arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
-					 <&clk IMX8MP_CLK_USB_ROOT>;
+					 <&clk IMX8MP_CLK_USB_SUSP>;
 				clock-names = "bus_early", "ref", "suspend";
 				interrupts = <GIC_SPI 41

IRQ_TYPE_LEVEL_HIGH>;
phys = <&usb3_phy1>, <&usb3_phy1>;
--
2.34.1