| Message ID | 1661328612-3932-1-git-send-email-jun.li@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: imx8mp: correct usb clocks | expand |
Am Mittwoch, dem 24.08.2022 um 16:10 +0800 schrieb 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. > So who is keeping IMX8MP_CLK_USB_ROOT enabled after this change? What is clocked by this and is it safe to disable while the USB subsystem is in working state? I see that things may still work, due to the shared gate with the suspend clock, but we should really try to model the DT after the HW. Especially since this is a ABI breaking change it should be right this time, so a unused USB_ROOT clock looks very suspicious. Regards, Lucas > Signed-off-by: Li Jun <jun.li@nxp.com> > --- > 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>;
Hi Li, On 22-08-24, 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. Please don't send two seperate patchsets for this topic, since they can be applied delayed. So your v2 should contain the patches from [1] as well. [1] 1661328262-3867-1-git-send-email-jun.li@nxp.com Regards, Marco
> -----Original Message----- > From: Lucas Stach <l.stach@pengutronix.de> > Sent: Wednesday, August 24, 2022 4:56 PM > To: Jun Li <jun.li@nxp.com>; shawnguo@kernel.org; robh+dt@kernel.org; > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > kernel@pengutronix.de; festevam@gmail.com > Cc: marex@denx.de; devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > aford173@gmail.com; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > Am Mittwoch, dem 24.08.2022 um 16:10 +0800 schrieb 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. > > > So who is keeping IMX8MP_CLK_USB_ROOT enabled after this change? What is > clocked by this and is it safe to disable while the USB subsystem is in working > state? I see that things may still work, due to the shared gate with the > suspend clock, but we should really try to model the DT after the HW. Especially > since this is a ABI breaking change it should be right this time, so a unused > USB_ROOT clock looks very suspicious. The related clk driver change is [1]. I should put it in one patch set. Before my change this shared clock gate is defined only for USB bus, it will be off while system sleep even USB wakeup is enabled, this cause the suspend clock is gated too, so USB remote wakeup cannot work. In case system sleep without USB wakeup enabled, the shared gate will be really off. Shared clock gate is matching the real HW. You mean I should just simply define this gate only for suspend clock instead of define 2 clock gates(then share)? [1] https://patchwork.kernel.org/project/linux-clk/patch/1661328262-3867-2-git-send-email-jun.li@nxp.com/ Li Jun > > Regards, > Lucas > > > Signed-off-by: Li Jun <jun.li@nxp.com> > > --- > > 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>; >
> -----Original Message----- > From: Marco Felsch <m.felsch@pengutronix.de> > Sent: Wednesday, August 24, 2022 5:11 PM > To: Jun Li <jun.li@nxp.com> > Cc: shawnguo@kernel.org; robh+dt@kernel.org; > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > l.stach@pengutronix.de > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > Hi Li, > > On 22-08-24, 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. > > Please don't send two seperate patchsets for this topic, since they can be > applied delayed. So your v2 should contain the patches from [1] as well. Understood, I will put all in one patch set in v2. Thanks Li Jun > > [1] 1661328262-3867-1-git-send-email-jun.li@nxp.com > > Regards, > Marco
Hi Shawn, > -----Original Message----- > From: Jun Li <jun.li@nxp.com> > Sent: Wednesday, August 24, 2022 6:24 PM > To: Marco Felsch <m.felsch@pengutronix.de> > Cc: shawnguo@kernel.org; robh+dt@kernel.org; > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > l.stach@pengutronix.de > Subject: RE: [PATCH] arm64: dts: imx8mp: correct usb clocks > > > > > -----Original Message----- > > From: Marco Felsch <m.felsch@pengutronix.de> > > Sent: Wednesday, August 24, 2022 5:11 PM > > To: Jun Li <jun.li@nxp.com> > > Cc: shawnguo@kernel.org; robh+dt@kernel.org; > > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > > l.stach@pengutronix.de > > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > > > Hi Li, > > > > On 22-08-24, 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. > > > > Please don't send two seperate patchsets for this topic, since they > > can be applied delayed. So your v2 should contain the patches from [1] > as well. > > Understood, I will put all in one patch set in v2. Since the clock part patches[1] already were accepted, I think this corresponding dts fix patch should be okay as it is. [1] https://lore.kernel.org/linux-arm-kernel/1661328262-3867-2-git-send-email-jun.li@nxp.com/ Thanks Li Jun > > Thanks > Li Jun > > > > [1] 1661328262-3867-1-git-send-email-jun.li@nxp.com > > > > Regards, > > Marco
Hey Jun, On Tue, Sep 06, 2022 at 07:19:57AM +0000, Jun Li wrote: > Hi Shawn, > > > -----Original Message----- > > From: Jun Li <jun.li@nxp.com> > > Sent: Wednesday, August 24, 2022 6:24 PM > > To: Marco Felsch <m.felsch@pengutronix.de> > > Cc: shawnguo@kernel.org; robh+dt@kernel.org; > > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > > l.stach@pengutronix.de > > Subject: RE: [PATCH] arm64: dts: imx8mp: correct usb clocks > > > > > > > > > -----Original Message----- > > > From: Marco Felsch <m.felsch@pengutronix.de> > > > Sent: Wednesday, August 24, 2022 5:11 PM > > > To: Jun Li <jun.li@nxp.com> > > > Cc: shawnguo@kernel.org; robh+dt@kernel.org; > > > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > > > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > > > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > > > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > > > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > > > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > > > l.stach@pengutronix.de > > > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > > > > > Hi Li, > > > > > > On 22-08-24, 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. > > > > > > Please don't send two seperate patchsets for this topic, since they > > > can be applied delayed. So your v2 should contain the patches from [1] > > as well. > > > > Understood, I will put all in one patch set in v2. > > Since the clock part patches[1] already were accepted, I think this > corresponding dts fix patch should be okay as it is. Should I apply the DTS patch for v6.0-rc or v6.1? My understanding is that it needs to appear in the same release as clock patch[1], right? Shawn > > [1] https://lore.kernel.org/linux-arm-kernel/1661328262-3867-2-git-send-email-jun.li@nxp.com/
Hi Shawn, > > > > Hi Li, > > > > > > > > On 22-08-24, 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. > > > > > > > > Please don't send two seperate patchsets for this topic, since > > > > they can be applied delayed. So your v2 should contain the patches > > > > from [1] > > > as well. > > > > > > Understood, I will put all in one patch set in v2. > > > > Since the clock part patches[1] already were accepted, I think this > > corresponding dts fix patch should be okay as it is. > > Should I apply the DTS patch for v6.0-rc or v6.1? My understanding is that > it needs to appear in the same release as clock patch[1], right? Yes, it needs to appear in the same release as clock patch[1]. Thanks Li Jun
On Tue, Sep 06, 2022 at 09:49:28AM +0000, Jun Li wrote: > Hi Shawn, > > > > > > Hi Li, > > > > > > > > > > On 22-08-24, 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. > > > > > > > > > > Please don't send two seperate patchsets for this topic, since > > > > > they can be applied delayed. So your v2 should contain the patches > > > > > from [1] > > > > as well. > > > > > > > > Understood, I will put all in one patch set in v2. > > > > > > Since the clock part patches[1] already were accepted, I think this > > > corresponding dts fix patch should be okay as it is. > > > > Should I apply the DTS patch for v6.0-rc or v6.1? My understanding is that > > it needs to appear in the same release as clock patch[1], right? > > Yes, it needs to appear in the same release as clock patch[1]. So could you find out which release the clock patch is targeting? Shawn
+Abel > -----Original Message----- > From: Shawn Guo <shawnguo@kernel.org> > Sent: Tuesday, September 6, 2022 6:19 PM > To: Jun Li <jun.li@nxp.com> > Cc: Marco Felsch <m.felsch@pengutronix.de>; robh+dt@kernel.org; > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > l.stach@pengutronix.de > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > On Tue, Sep 06, 2022 at 09:49:28AM +0000, Jun Li wrote: > > Hi Shawn, > > > > > > > > Hi Li, > > > > > > > > > > > > On 22-08-24, 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. > > > > > > > > > > > > Please don't send two seperate patchsets for this topic, since > > > > > > they can be applied delayed. So your v2 should contain the > > > > > > patches from [1] > > > > > as well. > > > > > > > > > > Understood, I will put all in one patch set in v2. > > > > > > > > Since the clock part patches[1] already were accepted, I think > > > > this corresponding dts fix patch should be okay as it is. > > > > > > Should I apply the DTS patch for v6.0-rc or v6.1? My understanding > > > is that it needs to appear in the same release as clock patch[1], right? > > > > Yes, it needs to appear in the same release as clock patch[1]. > > So could you find out which release the clock patch is targeting? Seems the clock patches[1] are only at Abel's tree. Actually this dts patch and clk patches[1] should apply for the releases with below patch: commit cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 Author: Peng Fan <peng.fan@nxp.com> Date: Sat May 7 20:54:30 2022 +0800 clk: imx8mp: fix usb_root_clk parent According to reference mannual CCGR77(usb) sources from hsio_axi, fix it. Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Abel Vesa <abel.vesa@nxp.com> Link: https://lore.kernel.org/r/20220507125430.793287-1-peng.fan@oss.nxp.com Signed-off-by: Abel Vesa <abel.vesa@nxp.com> So it should target v5.19, v6.0rc and v6.1 Do I need resend the patch with stable tag applied? like Cc: stable@vger.kernel.org # v5.19+ [1] https://lore.kernel.org/linux-arm-kernel/1661328262-3867-2-git-send-email-jun.li@nxp.com/ Thanks Li Jun > > Shawn
On 22-09-06 11:30:14, Jun Li wrote: > +Abel > > > -----Original Message----- > > From: Shawn Guo <shawnguo@kernel.org> > > Sent: Tuesday, September 6, 2022 6:19 PM > > To: Jun Li <jun.li@nxp.com> > > Cc: Marco Felsch <m.felsch@pengutronix.de>; robh+dt@kernel.org; > > krzysztof.kozlowski+dt@linaro.org; s.hauer@pengutronix.de; > > kernel@pengutronix.de; festevam@gmail.com; marex@denx.de; > > devicetree@vger.kernel.org; Peng Fan <peng.fan@nxp.com>; > > Markus.Niebel@ew.tq-group.com; laurent.pinchart@ideasonboard.com; > > paul.elder@ideasonboard.com; dl-linux-imx <linux-imx@nxp.com>; > > aford173@gmail.com; linux-arm-kernel@lists.infradead.org; > > l.stach@pengutronix.de > > Subject: Re: [PATCH] arm64: dts: imx8mp: correct usb clocks > > > > On Tue, Sep 06, 2022 at 09:49:28AM +0000, Jun Li wrote: > > > Hi Shawn, > > > > > > > > > > Hi Li, > > > > > > > > > > > > > > On 22-08-24, 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. > > > > > > > > > > > > > > Please don't send two seperate patchsets for this topic, since > > > > > > > they can be applied delayed. So your v2 should contain the > > > > > > > patches from [1] > > > > > > as well. > > > > > > > > > > > > Understood, I will put all in one patch set in v2. > > > > > > > > > > Since the clock part patches[1] already were accepted, I think > > > > > this corresponding dts fix patch should be okay as it is. > > > > > > > > Should I apply the DTS patch for v6.0-rc or v6.1? My understanding > > > > is that it needs to appear in the same release as clock patch[1], right? > > > > > > Yes, it needs to appear in the same release as clock patch[1]. > > > > So could you find out which release the clock patch is targeting? > > Seems the clock patches[1] are only at Abel's tree. Right, but your patch didn't have any Fixes tag. So I think I need drop your patch from my tree for now and you need to resend a new version with Fixes tag, which probably will be going through Stephen's tree. > > Actually this dts patch and clk patches[1] should apply for the > releases with below patch: > > commit cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 > Author: Peng Fan <peng.fan@nxp.com> > Date: Sat May 7 20:54:30 2022 +0800 > > clk: imx8mp: fix usb_root_clk parent > > According to reference mannual CCGR77(usb) sources from hsio_axi, fix > it. > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Reviewed-by: Abel Vesa <abel.vesa@nxp.com> > Link: https://lore.kernel.org/r/20220507125430.793287-1-peng.fan@oss.nxp.com > Signed-off-by: Abel Vesa <abel.vesa@nxp.com> > > So it should target v5.19, v6.0rc and v6.1 > > Do I need resend the patch with stable tag applied? like > Cc: stable@vger.kernel.org # v5.19+ And yes, cc stable too. > > [1] https://lore.kernel.org/linux-arm-kernel/1661328262-3867-2-git-send-email-jun.li@nxp.com/ > > Thanks > Li Jun > > > > > Shawn
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>;
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. Signed-off-by: Li Jun <jun.li@nxp.com> --- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)