diff mbox series

[v3] arm64: dts: imx8mp: correct usb clocks

Message ID 1663565197-3961-1-git-send-email-jun.li@nxp.com (mailing list archive)
State New, archived
Headers show
Series [v3] arm64: dts: imx8mp: correct usb clocks | expand

Commit Message

Jun Li Sept. 19, 2022, 5:26 a.m. UTC 
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.

Fixes: fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes")
Cc: stable@vger.kernel.org # v5.19+
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
---
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(-)

Comments

Shawn Guo Sept. 21, 2022, 2:21 p.m. UTC | #1 
Added Abel.

On Mon, Sep 19, 2022 at 01:26:37PM +0800, Li Jun wrote:
> 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.
> 
> Fixes: fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes")
> Cc: stable@vger.kernel.org # v5.19+
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
> Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> Signed-off-by: Li Jun <jun.li@nxp.com>

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 <shawnguo@kernel.org>

Shawn

> ---
> 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(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> index fe178b7d063c..2f18778a057f 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> @@ -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>;
> -- 
> 2.34.1
>
Jun Li Sept. 23, 2022, 11:06 a.m. UTC | #2 
> -----Original Message-----
> From: Shawn Guo <shawnguo@kernel.org>
> Sent: Wednesday, September 21, 2022 10:21 PM
> To: Jun Li <jun.li@nxp.com>; Abel Vesa <abelvesa@kernel.org>
> Cc: robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> s.hauer@pengutronix.de; kernel@pengutronix.de; festevam@gmail.com;
> dl-linux-imx <linux-imx@nxp.com>; laurent.pinchart@ideasonboard.com;
> l.stach@pengutronix.de; marex@denx.de; Peng Fan <peng.fan@nxp.com>;
> paul.elder@ideasonboard.com; Markus.Niebel@ew.tq-group.com;
> aford173@gmail.com; devicetree@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v3] arm64: dts: imx8mp: correct usb clocks
> 
> Added Abel.
> 
> On Mon, Sep 19, 2022 at 01:26:37PM +0800, Li Jun wrote:
> > 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.
> >
> > Fixes: fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes")
> > Cc: stable@vger.kernel.org # v5.19+
> > Reviewed-by: Peng Fan <peng.fan@nxp.com>
> > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > Signed-off-by: Li Jun <jun.li@nxp.com>
> 
> 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 <shawnguo@kernel.org>

Thanks,

Hi Abel,

I just resend the whole patch set(clk+dts).
Will you or Stephen will take them?

Li Jun
> 
> Shawn
> 
> > ---
> > 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(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> > b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> > index fe178b7d063c..2f18778a057f 100644
> > --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> > @@ -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>;
> > --
> > 2.34.1
> >
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index fe178b7d063c..2f18778a057f 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -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>;