| Message ID | 1664549663-20364-1-git-send-email-jun.li@nxp.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v4,1/3] dt-bindings: clocks: imx8mp: Add ID for usb suspend clock | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 10 lines checked |
| robh/patch-applied | success |
Hi Stephen, > -----Original Message----- > From: Jun Li <jun.li@nxp.com> > Sent: Friday, September 30, 2022 10:54 PM > To: sboyd@kernel.org; abelvesa@kernel.org > Cc: robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; > shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de; > festevam@gmail.com; dl-linux-imx <linux-imx@nxp.com>; > mturquette@baylibre.com; l.stach@pengutronix.de; Peng Fan > <peng.fan@nxp.com>; alexander.stein@ew.tq-group.com; > gregkh@linuxfoundation.org; devicetree@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; linux-clk@vger.kernel.org > Subject: [PATCH v4 2/3] clk: imx: imx8mp: add shared clk gate for usb suspend > clk > > 32K usb suspend clock gate is shared with usb_root_clk, this shared clock > gate was initially defined only for usb suspend clock, usb suspend clk is > kept on while system is active or system sleep with usb wakeup enabled, so > usb root clock is fine with this situation; with the commit cf7f3f4fa9e5 > ("clk: imx8mp: fix usb_root_clk parent"), this clock gate is changed to be > for usb root clock, but usb root clock will be off while usb is suspended, > so usb suspend clock will be gated too, this cause some usb functionalities > will not work, so define this clock to be a shared clock gate to conform > with the real HW status. > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > Cc: stable@vger.kernel.org # v5.19+ > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > Signed-off-by: Li Jun <jun.li@nxp.com> Is this version okay for you? Thanks Li Jun > --- > change for v4: > - improve the commit log to explain why this is stable stuff. > > drivers/clk/imx/clk-imx8mp.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c > index e89db568f5a8..5b66514bdd0c 100644 > --- a/drivers/clk/imx/clk-imx8mp.c > +++ b/drivers/clk/imx/clk-imx8mp.c > @@ -17,6 +17,7 @@ > > static u32 share_count_nand; > static u32 share_count_media; > +static u32 share_count_usb; > > static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", > "dummy", }; static const char * const audio_pll1_bypass_sels[] = > {"audio_pll1", "audio_pll1_ref_sel", }; @@ -673,7 +674,8 @@ static int > imx8mp_clocks_probe(struct platform_device *pdev) > hws[IMX8MP_CLK_UART2_ROOT] = imx_clk_hw_gate4("uart2_root_clk", > "uart2", ccm_base + 0x44a0, 0); > hws[IMX8MP_CLK_UART3_ROOT] = imx_clk_hw_gate4("uart3_root_clk", > "uart3", ccm_base + 0x44b0, 0); > hws[IMX8MP_CLK_UART4_ROOT] = imx_clk_hw_gate4("uart4_root_clk", > "uart4", ccm_base + 0x44c0, 0); > - hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate4("usb_root_clk", > "hsio_axi", ccm_base + 0x44d0, 0); > + hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate2_shared2("usb_root_clk", > "hsio_axi", ccm_base + 0x44d0, 0, &share_count_usb); > + hws[IMX8MP_CLK_USB_SUSP] = > imx_clk_hw_gate2_shared2("usb_suspend_clk", > +"osc_32k", ccm_base + 0x44d0, 0, &share_count_usb); > hws[IMX8MP_CLK_USB_PHY_ROOT] = imx_clk_hw_gate4("usb_phy_root_clk", > "usb_phy_ref", ccm_base + 0x44f0, 0); > hws[IMX8MP_CLK_USDHC1_ROOT] = imx_clk_hw_gate4("usdhc1_root_clk", > "usdhc1", ccm_base + 0x4510, 0); > hws[IMX8MP_CLK_USDHC2_ROOT] = imx_clk_hw_gate4("usdhc2_root_clk", > "usdhc2", ccm_base + 0x4520, 0); > -- > 2.34.1
On 22-09-30 22:54:21, Li Jun wrote: > usb suspend clock has a gate shared with usb_root_clk. > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > Cc: stable@vger.kernel.org # v5.19+ > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > Signed-off-by: Li Jun <jun.li@nxp.com> Applied all. Thanks. > --- > include/dt-bindings/clock/imx8mp-clock.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h > index 9d5cc2ddde89..1417b7b1b7df 100644 > --- a/include/dt-bindings/clock/imx8mp-clock.h > +++ b/include/dt-bindings/clock/imx8mp-clock.h > @@ -324,8 +324,9 @@ > #define IMX8MP_CLK_CLKOUT2_SEL 317 > #define IMX8MP_CLK_CLKOUT2_DIV 318 > #define IMX8MP_CLK_CLKOUT2 319 > +#define IMX8MP_CLK_USB_SUSP 320 > > -#define IMX8MP_CLK_END 320 > +#define IMX8MP_CLK_END 321 > > #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 > #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 > -- > 2.34.1 >
> -----Original Message----- > From: Abel Vesa <abel.vesa@linaro.org> > Sent: Monday, November 21, 2022 11:57 PM > To: Jun Li <jun.li@nxp.com> > Cc: sboyd@kernel.org; abelvesa@kernel.org; robh+dt@kernel.org; > krzysztof.kozlowski+dt@linaro.org; shawnguo@kernel.org; > s.hauer@pengutronix.de; kernel@pengutronix.de; festevam@gmail.com; > dl-linux-imx <linux-imx@nxp.com>; mturquette@baylibre.com; > l.stach@pengutronix.de; Peng Fan <peng.fan@nxp.com>; > alexander.stein@ew.tq-group.com; gregkh@linuxfoundation.org; > devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; > linux-clk@vger.kernel.org > Subject: Re: [PATCH v4 1/3] dt-bindings: clocks: imx8mp: Add ID for usb > suspend clock > > On 22-09-30 22:54:21, Li Jun wrote: > > usb suspend clock has a gate shared with usb_root_clk. > > > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > > Cc: stable@vger.kernel.org # v5.19+ > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > Signed-off-by: Li Jun <jun.li@nxp.com> > > Applied all. Thanks. Hi Abel, Could you please also take the dts patch[1] in this series? As the dts patch has a build dependency on the clk patches, So Shawn suggested you take the dts patch too [2]. [1] https://www.spinics.net/lists/linux-clk/msg75904.html [2] https://www.spinics.net/lists/arm-kernel/msg1013220.html Thanks Li Jun > > > --- > > include/dt-bindings/clock/imx8mp-clock.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/include/dt-bindings/clock/imx8mp-clock.h > b/include/dt-bindings/clock/imx8mp-clock.h > > index 9d5cc2ddde89..1417b7b1b7df 100644 > > --- a/include/dt-bindings/clock/imx8mp-clock.h > > +++ b/include/dt-bindings/clock/imx8mp-clock.h > > @@ -324,8 +324,9 @@ > > #define IMX8MP_CLK_CLKOUT2_SEL 317 > > #define IMX8MP_CLK_CLKOUT2_DIV 318 > > #define IMX8MP_CLK_CLKOUT2 319 > > +#define IMX8MP_CLK_USB_SUSP 320 > > > > -#define IMX8MP_CLK_END 320 > > +#define IMX8MP_CLK_END 321 > > > > #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 > > #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 > > -- > > 2.34.1 > >
On 25/11/2022 11:55, Jun Li wrote: > > >> -----Original Message----- >> From: Abel Vesa <abel.vesa@linaro.org> >> Sent: Monday, November 21, 2022 11:57 PM >> To: Jun Li <jun.li@nxp.com> >> Cc: sboyd@kernel.org; abelvesa@kernel.org; robh+dt@kernel.org; >> krzysztof.kozlowski+dt@linaro.org; shawnguo@kernel.org; >> s.hauer@pengutronix.de; kernel@pengutronix.de; festevam@gmail.com; >> dl-linux-imx <linux-imx@nxp.com>; mturquette@baylibre.com; >> l.stach@pengutronix.de; Peng Fan <peng.fan@nxp.com>; >> alexander.stein@ew.tq-group.com; gregkh@linuxfoundation.org; >> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; >> linux-clk@vger.kernel.org >> Subject: Re: [PATCH v4 1/3] dt-bindings: clocks: imx8mp: Add ID for usb >> suspend clock >> >> On 22-09-30 22:54:21, Li Jun wrote: >>> usb suspend clock has a gate shared with usb_root_clk. >>> >>> Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") >>> Cc: stable@vger.kernel.org # v5.19+ >>> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> >>> Signed-off-by: Li Jun <jun.li@nxp.com> >> >> Applied all. Thanks. > > Hi Abel, > > Could you please also take the dts patch[1] in this series? > As the dts patch has a build dependency on the clk patches, > So Shawn suggested you take the dts patch too [2]. > > [1] https://www.spinics.net/lists/linux-clk/msg75904.html > [2] https://www.spinics.net/lists/arm-kernel/msg1013220.html DTS cannot go via driver tree. Share the header from DTS tree to driver to solve it... or add defines to your DTS. Best regards, Krzysztof
On Fri, Sep 30, 2022 at 10:54:23PM +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> > Acked-by: Shawn Guo <shawnguo@kernel.org> > Signed-off-by: Li Jun <jun.li@nxp.com> Applied, thanks!
On 22-10-27 10:39:16, Stephen Boyd wrote: > Quoting Jun Li (2022-10-19 02:26:00) > > Hi Stephen, > > > > > -----Original Message----- > > > From: Jun Li <jun.li@nxp.com> > > > Sent: Friday, September 30, 2022 10:54 PM > > > To: sboyd@kernel.org; abelvesa@kernel.org > > > Cc: robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; > > > shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de; > > > festevam@gmail.com; dl-linux-imx <linux-imx@nxp.com>; > > > mturquette@baylibre.com; l.stach@pengutronix.de; Peng Fan > > > <peng.fan@nxp.com>; alexander.stein@ew.tq-group.com; > > > gregkh@linuxfoundation.org; devicetree@vger.kernel.org; > > > linux-arm-kernel@lists.infradead.org; linux-clk@vger.kernel.org > > > Subject: [PATCH v4 2/3] clk: imx: imx8mp: add shared clk gate for usb suspend > > > clk > > > > > > 32K usb suspend clock gate is shared with usb_root_clk, this shared clock > > > gate was initially defined only for usb suspend clock, usb suspend clk is > > > kept on while system is active or system sleep with usb wakeup enabled, so > > > usb root clock is fine with this situation; with the commit cf7f3f4fa9e5 > > > ("clk: imx8mp: fix usb_root_clk parent"), this clock gate is changed to be > > > for usb root clock, but usb root clock will be off while usb is suspended, > > > so usb suspend clock will be gated too, this cause some usb functionalities > > > will not work, so define this clock to be a shared clock gate to conform > > > with the real HW status. > > > > > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > > > Cc: stable@vger.kernel.org # v5.19+ > > > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > > Signed-off-by: Li Jun <jun.li@nxp.com> > > > > Is this version okay for you? > > > > I thought that Abel was going to pick these up. Oh, sorry, I thought the fixes will be picked up by you. I'll apply it to my tree then.
On 22-09-30 22:54:21, Li Jun wrote: > usb suspend clock has a gate shared with usb_root_clk. > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > Cc: stable@vger.kernel.org # v5.19+ > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > Signed-off-by: Li Jun <jun.li@nxp.com> Reviewed-by: Abel Vesa <abel.vesa@linaro.org> > --- > include/dt-bindings/clock/imx8mp-clock.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h > index 9d5cc2ddde89..1417b7b1b7df 100644 > --- a/include/dt-bindings/clock/imx8mp-clock.h > +++ b/include/dt-bindings/clock/imx8mp-clock.h > @@ -324,8 +324,9 @@ > #define IMX8MP_CLK_CLKOUT2_SEL 317 > #define IMX8MP_CLK_CLKOUT2_DIV 318 > #define IMX8MP_CLK_CLKOUT2 319 > +#define IMX8MP_CLK_USB_SUSP 320 > > -#define IMX8MP_CLK_END 320 > +#define IMX8MP_CLK_END 321 > > #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 > #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 > -- > 2.34.1 >
On 22-09-30 22:54:22, Li Jun wrote: > 32K usb suspend clock gate is shared with usb_root_clk, this > shared clock gate was initially defined only for usb suspend > clock, usb suspend clk is kept on while system is active or > system sleep with usb wakeup enabled, so usb root clock is > fine with this situation; with the commit cf7f3f4fa9e5 > ("clk: imx8mp: fix usb_root_clk parent"), this clock gate is > changed to be for usb root clock, but usb root clock will > be off while usb is suspended, so usb suspend clock will be > gated too, this cause some usb functionalities will not work, > so define this clock to be a shared clock gate to conform with > the real HW status. > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > Cc: stable@vger.kernel.org # v5.19+ > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > Signed-off-by: Li Jun <jun.li@nxp.com> Reviewed-by: Abel Vesa <abel.vesa@linaro.org> > --- > change for v4: > - improve the commit log to explain why this is stable stuff. > > drivers/clk/imx/clk-imx8mp.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c > index e89db568f5a8..5b66514bdd0c 100644 > --- a/drivers/clk/imx/clk-imx8mp.c > +++ b/drivers/clk/imx/clk-imx8mp.c > @@ -17,6 +17,7 @@ > > static u32 share_count_nand; > static u32 share_count_media; > +static u32 share_count_usb; > > static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", }; > static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", }; > @@ -673,7 +674,8 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) > hws[IMX8MP_CLK_UART2_ROOT] = imx_clk_hw_gate4("uart2_root_clk", "uart2", ccm_base + 0x44a0, 0); > hws[IMX8MP_CLK_UART3_ROOT] = imx_clk_hw_gate4("uart3_root_clk", "uart3", ccm_base + 0x44b0, 0); > hws[IMX8MP_CLK_UART4_ROOT] = imx_clk_hw_gate4("uart4_root_clk", "uart4", ccm_base + 0x44c0, 0); > - hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate4("usb_root_clk", "hsio_axi", ccm_base + 0x44d0, 0); > + hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate2_shared2("usb_root_clk", "hsio_axi", ccm_base + 0x44d0, 0, &share_count_usb); > + hws[IMX8MP_CLK_USB_SUSP] = imx_clk_hw_gate2_shared2("usb_suspend_clk", "osc_32k", ccm_base + 0x44d0, 0, &share_count_usb); > hws[IMX8MP_CLK_USB_PHY_ROOT] = imx_clk_hw_gate4("usb_phy_root_clk", "usb_phy_ref", ccm_base + 0x44f0, 0); > hws[IMX8MP_CLK_USDHC1_ROOT] = imx_clk_hw_gate4("usdhc1_root_clk", "usdhc1", ccm_base + 0x4510, 0); > hws[IMX8MP_CLK_USDHC2_ROOT] = imx_clk_hw_gate4("usdhc2_root_clk", "usdhc2", ccm_base + 0x4520, 0); > -- > 2.34.1 >
On 23-01-09 12:52:17, Abel Vesa wrote: > On 22-10-27 10:39:16, Stephen Boyd wrote: > > Quoting Jun Li (2022-10-19 02:26:00) > > > Hi Stephen, > > > > > > > -----Original Message----- > > > > From: Jun Li <jun.li@nxp.com> > > > > Sent: Friday, September 30, 2022 10:54 PM > > > > To: sboyd@kernel.org; abelvesa@kernel.org > > > > Cc: robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; > > > > shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de; > > > > festevam@gmail.com; dl-linux-imx <linux-imx@nxp.com>; > > > > mturquette@baylibre.com; l.stach@pengutronix.de; Peng Fan > > > > <peng.fan@nxp.com>; alexander.stein@ew.tq-group.com; > > > > gregkh@linuxfoundation.org; devicetree@vger.kernel.org; > > > > linux-arm-kernel@lists.infradead.org; linux-clk@vger.kernel.org > > > > Subject: [PATCH v4 2/3] clk: imx: imx8mp: add shared clk gate for usb suspend > > > > clk > > > > > > > > 32K usb suspend clock gate is shared with usb_root_clk, this shared clock > > > > gate was initially defined only for usb suspend clock, usb suspend clk is > > > > kept on while system is active or system sleep with usb wakeup enabled, so > > > > usb root clock is fine with this situation; with the commit cf7f3f4fa9e5 > > > > ("clk: imx8mp: fix usb_root_clk parent"), this clock gate is changed to be > > > > for usb root clock, but usb root clock will be off while usb is suspended, > > > > so usb suspend clock will be gated too, this cause some usb functionalities > > > > will not work, so define this clock to be a shared clock gate to conform > > > > with the real HW status. > > > > > > > > Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") > > > > Cc: stable@vger.kernel.org # v5.19+ > > > > Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > > > Signed-off-by: Li Jun <jun.li@nxp.com> > > > > > > Is this version okay for you? > > > > > > > I thought that Abel was going to pick these up. > > Oh, sorry, I thought the fixes will be picked up by you. > > I'll apply it to my tree then. Ugrh, ignore this. Already applied. My inbox is messed up a bit right now. Sorry about that.
diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 9d5cc2ddde89..1417b7b1b7df 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -324,8 +324,9 @@ #define IMX8MP_CLK_CLKOUT2_SEL 317 #define IMX8MP_CLK_CLKOUT2_DIV 318 #define IMX8MP_CLK_CLKOUT2 319 +#define IMX8MP_CLK_USB_SUSP 320 -#define IMX8MP_CLK_END 320 +#define IMX8MP_CLK_END 321 #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1
usb suspend clock has a gate shared with usb_root_clk. Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver") Cc: stable@vger.kernel.org # v5.19+ Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> Signed-off-by: Li Jun <jun.li@nxp.com> --- include/dt-bindings/clock/imx8mp-clock.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)