arm64: dts: imx8mp: correct usb clocks
Subsystems (2)
PATCH v3 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 v3:
- Add fixes tag, Alexander's T-b and Peng's R-b tages.
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
@@ -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
Added Abel.
Quoted 9 lines · Li Jun
After commit
cf7f3f4fa9e5("clk: imx8mp: fixusb_root_clkparent"),usb_root_clkis no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.Fixes fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes")Cc [email protected] # v5.19+Reviewed-by Peng Fan <[email protected]>Tested-by Alexander Stein <[email protected]>Signed-off-by Li Jun <[email protected]>
I just realized this patch has a hard/build dependency on define IMX8MP_CLK_USB_SUSP. So the patch needs to go upstream via the same tree that the define is applied. I guess that's Abel's i.MX clk tree? In that case:
Shawn
Quoted 59 lines
---
change for v3:
- Add fixes tag, Alexander's T-b and Peng's R-b tages.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@@ -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
Quoted 28 lines
-----Original Message-----
From: Shawn Guo <[email protected]>
Sent: Wednesday, September 21, 2022 10:21 PM
To: Jun Li <[email protected]>; Abel Vesa <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; [email protected]; [email protected]; [email protected]; Peng Fan <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3] arm64: dts: imx8mp: correct usb clocksAdded Abel.
Quoted 9 lines · Li Jun
After commit
cf7f3f4fa9e5("clk: imx8mp: fixusb_root_clkparent"),usb_root_clkis no longer for suspend clock so update dts accordingly to use right bus clock and suspend clock.Fixes fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes")Cc [email protected] # v5.19+Reviewed-by Peng Fan <[email protected]>Tested-by Alexander Stein <[email protected]>Signed-off-by Li Jun <[email protected]>
Quoted 6 lines
I just realized this patch has a hard/build dependency on define
IMX8MP_CLK_USB_SUSP. So the patch needs to go upstream via the same tree that the define is applied. I guess that's Abel's i.MX clk tree? In that case:Acked-by Shawn Guo <[email protected]>
Thanks,
Hi Abel,
I just resend the whole patch set(clk+dts).
Will you or Stephen will take them?
Li Jun
Quoted 66 lines
Shawn
Quoted 16 lines
---
change for v3:
- Add fixes tag, Alexander's T-b and Peng's R-b tages.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 +0
-0arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 { · line 1175
Quoted 8 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>; power-domains = <&hsio_blk_ctrl IMX8MP_HSIOBLK_PD_USB>; @@-1182,9
arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_0: usb@32f10100 {
Quoted 12 lines
+1182,9 @@
usb3_0: usb@32f10100 {arch/arm64/boot/dts/freescale/imx8mp.dtsi +2
-2usb_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:arch/arm64/boot/dts/freescale/imx8mp.dtsi usb3_1: usb@32f10108 {
Quoted 9 lines
usb@32f10108 {
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1
-1reg = <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
Quoted 15 lines
+1224,9 @@
usb3_1: usb@32f10108 {arch/arm64/boot/dts/freescale/imx8mp.dtsi +2
-3usb_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>; --2.34.1