* [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host @ 2014-12-12 14:54 Julien CHAUVEAU 2014-12-12 15:44 ` Romain Perier 2014-12-12 21:05 ` [PATCH v2] " Julien CHAUVEAU 0 siblings, 2 replies; 7+ messages in thread From: Julien CHAUVEAU @ 2014-12-12 14:54 UTC (permalink / raw) To: Heiko Stuebner, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK Cc: Julien CHAUVEAU This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 and hclk_usbotg1 because these clocks must remain enabled to use the USB controllers in host mode. This fixes a regression introduced by patch "clk: rockchip: disable unused clocks" https://lkml.kernel.org/g/1415092270-24932-1-git-send-email-kever.yang@rock-chips.com Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr> --- drivers/clk/rockchip/clk-rk3188.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index c540789..25ddb09 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -430,8 +430,10 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(0, "hclk_emem_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 7, GFLAGS), GATE(HCLK_EMAC, "hclk_emac", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 0, GFLAGS), GATE(HCLK_NANDC0, "hclk_nandc0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 9, GFLAGS), - GATE(0, "hclk_usb_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 5, GFLAGS), - GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 13, GFLAGS), + GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(4), 5, GFLAGS), + GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(5), 13, GFLAGS), GATE(HCLK_HSADC, "hclk_hsadc", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 5, GFLAGS), GATE(HCLK_PIDF, "hclk_pidfilter", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 6, GFLAGS), GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 10, GFLAGS), @@ -592,7 +594,8 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { GATE(0, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS), GATE(0, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 14, GFLAGS), + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(5), 14, GFLAGS), GATE(0, "aclk_cif1", "aclk_vio1", 0, RK2928_CLKGATE_CON(6), 7, GFLAGS), @@ -680,7 +683,8 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS), - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(7), 3, GFLAGS), GATE(HCLK_HSIC, "hclk_hsic", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), GATE(PCLK_TIMER3, "pclk_timer3", "pclk_cpu", 0, RK2928_CLKGATE_CON(7), 9, GFLAGS), -- 2.1.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 14:54 [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host Julien CHAUVEAU @ 2014-12-12 15:44 ` Romain Perier 2014-12-12 18:01 ` NEO-Technologies / Julien CHAUVEAU 2014-12-12 18:02 ` Heiko Stübner 2014-12-12 21:05 ` [PATCH v2] " Julien CHAUVEAU 1 sibling, 2 replies; 7+ messages in thread From: Romain Perier @ 2014-12-12 15:44 UTC (permalink / raw) To: Julien CHAUVEAU Cc: Heiko Stuebner, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK Hi, 2014-12-12 15:54 GMT+01:00 Julien CHAUVEAU <julien.chauveau@neo-technologies.fr>: > This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 and hclk_usbotg1 > because these clocks must remain enabled to use the USB controllers in host mode. > > This fixes a regression introduced by patch "clk: rockchip: disable unused clocks" > https://lkml.kernel.org/g/1415092270-24932-1-git-send-email-kever.yang@rock-chips.com Could you refer the commit id instead ? something like "commit <ID> ("title of the corresponding commit") (and use scripts/checkpatch.pl on your patch to be sure that the commit form is okay). I confirm the regression. Romain ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 15:44 ` Romain Perier @ 2014-12-12 18:01 ` NEO-Technologies / Julien CHAUVEAU 2014-12-12 18:02 ` Heiko Stübner 1 sibling, 0 replies; 7+ messages in thread From: NEO-Technologies / Julien CHAUVEAU @ 2014-12-12 18:01 UTC (permalink / raw) To: Romain Perier Cc: Heiko Stuebner, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK > Le 12 déc. 2014 à 16:44, Romain Perier <romain.perier@gmail.com> a écrit : > > Hi, > > 2014-12-12 15:54 GMT+01:00 Julien CHAUVEAU > <julien.chauveau@neo-technologies.fr>: >> This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 and hclk_usbotg1 >> because these clocks must remain enabled to use the USB controllers in host mode. >> >> This fixes a regression introduced by patch "clk: rockchip: disable unused clocks" >> https://lkml.kernel.org/g/1415092270-24932-1-git-send-email-kever.yang@rock-chips.com > > Could you refer the commit id instead ? something like "commit <ID> > ("title of the corresponding commit ») OK, I'll resubmit with commit 78eaf6095cc7 ("clk: rockchip: disable unused clocks"). > (and use scripts/checkpatch.pl > on your patch to be sure that the commit form is okay). > That’s already done: scripts/checkpatch.pl 0001-clk-rockchip-add-CLK_IGNORE_UNUSED-flag-to-fix-USB-H.patch total: 0 errors, 0 warnings, 30 lines checked > > I confirm the regression. > > Romain ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 15:44 ` Romain Perier 2014-12-12 18:01 ` NEO-Technologies / Julien CHAUVEAU @ 2014-12-12 18:02 ` Heiko Stübner 1 sibling, 0 replies; 7+ messages in thread From: Heiko Stübner @ 2014-12-12 18:02 UTC (permalink / raw) To: Romain Perier Cc: Julien CHAUVEAU, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK Am Freitag, 12. Dezember 2014, 16:44:06 schrieb Romain Perier: > Hi, > > 2014-12-12 15:54 GMT+01:00 Julien CHAUVEAU > > <julien.chauveau@neo-technologies.fr>: > > This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 and > > hclk_usbotg1 because these clocks must remain enabled to use the USB > > controllers in host mode. > > > > This fixes a regression introduced by patch "clk: rockchip: disable unused > > clocks" > > https://lkml.kernel.org/g/1415092270-24932-1-git-send-email-kever.yang@ro > > ck-chips.com > Could you refer the commit id instead ? something like "commit <ID> > ("title of the corresponding commit") (and use scripts/checkpatch.pl > on your patch to be sure that the commit form is okay). I can also fix this up when applying the patch > > > I confirm the regression. instead of prose-confirmation please provide appropriate tags, like Reviewed-by: Romain Perier <romain.perier@gmail.com> Tested-by: Romain Perier <romain.perier@gmail.com> Tested-by when you have tested the fix on actual hardware and Reviewed-by when you have reviewed the actual change for correctnes Thanks Heiko ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 14:54 [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host Julien CHAUVEAU 2014-12-12 15:44 ` Romain Perier @ 2014-12-12 21:05 ` Julien CHAUVEAU 2014-12-12 21:42 ` Romain Perier 2014-12-21 14:08 ` Heiko Stübner 1 sibling, 2 replies; 7+ messages in thread From: Julien CHAUVEAU @ 2014-12-12 21:05 UTC (permalink / raw) To: Heiko Stuebner, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK Cc: Julien CHAUVEAU This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 and hclk_usbotg1 because these clocks must remain enabled to use the USB controllers in host mode. This fixes a regression introduced by commit 78eaf6095cc7 ("clk: rockchip: disable unused clocks"). Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr> --- Changes since v1: - update commit message: refer to commit ID instead of mailing list drivers/clk/rockchip/clk-rk3188.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index c540789..25ddb09 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -430,8 +430,10 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(0, "hclk_emem_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 7, GFLAGS), GATE(HCLK_EMAC, "hclk_emac", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 0, GFLAGS), GATE(HCLK_NANDC0, "hclk_nandc0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 9, GFLAGS), - GATE(0, "hclk_usb_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 5, GFLAGS), - GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 13, GFLAGS), + GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(4), 5, GFLAGS), + GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(5), 13, GFLAGS), GATE(HCLK_HSADC, "hclk_hsadc", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 5, GFLAGS), GATE(HCLK_PIDF, "hclk_pidfilter", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 6, GFLAGS), GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 10, GFLAGS), @@ -592,7 +594,8 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { GATE(0, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS), GATE(0, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 14, GFLAGS), + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(5), 14, GFLAGS), GATE(0, "aclk_cif1", "aclk_vio1", 0, RK2928_CLKGATE_CON(6), 7, GFLAGS), @@ -680,7 +683,8 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS), - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, + RK2928_CLKGATE_CON(7), 3, GFLAGS), GATE(HCLK_HSIC, "hclk_hsic", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), GATE(PCLK_TIMER3, "pclk_timer3", "pclk_cpu", 0, RK2928_CLKGATE_CON(7), 9, GFLAGS), -- 2.1.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 21:05 ` [PATCH v2] " Julien CHAUVEAU @ 2014-12-12 21:42 ` Romain Perier 2014-12-21 14:08 ` Heiko Stübner 1 sibling, 0 replies; 7+ messages in thread From: Romain Perier @ 2014-12-12 21:42 UTC (permalink / raw) To: Julien CHAUVEAU Cc: Heiko Stuebner, Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK 2014-12-12 22:05 GMT+01:00 Julien CHAUVEAU <julien.chauveau@neo-technologies.fr>: > This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 > and hclk_usbotg1 because these clocks must remain enabled to use the > USB controllers in host mode. > > This fixes a regression introduced by commit 78eaf6095cc7 > ("clk: rockchip: disable unused clocks"). > > Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr> > --- > Changes since v1: > - update commit message: refer to commit ID instead of mailing list > > drivers/clk/rockchip/clk-rk3188.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c > index c540789..25ddb09 100644 > --- a/drivers/clk/rockchip/clk-rk3188.c > +++ b/drivers/clk/rockchip/clk-rk3188.c > @@ -430,8 +430,10 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { > GATE(0, "hclk_emem_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 7, GFLAGS), > GATE(HCLK_EMAC, "hclk_emac", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 0, GFLAGS), > GATE(HCLK_NANDC0, "hclk_nandc0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 9, GFLAGS), > - GATE(0, "hclk_usb_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 5, GFLAGS), > - GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 13, GFLAGS), > + GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, > + RK2928_CLKGATE_CON(4), 5, GFLAGS), > + GATE(HCLK_OTG0, "hclk_usbotg0", "hclk_peri", CLK_IGNORE_UNUSED, > + RK2928_CLKGATE_CON(5), 13, GFLAGS), > GATE(HCLK_HSADC, "hclk_hsadc", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 5, GFLAGS), > GATE(HCLK_PIDF, "hclk_pidfilter", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 6, GFLAGS), > GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 10, GFLAGS), > @@ -592,7 +594,8 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { > GATE(0, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS), > GATE(0, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), > > - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 14, GFLAGS), > + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, > + RK2928_CLKGATE_CON(5), 14, GFLAGS), > > GATE(0, "aclk_cif1", "aclk_vio1", 0, RK2928_CLKGATE_CON(6), 7, GFLAGS), > > @@ -680,7 +683,8 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { > GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), > GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS), > > - GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), > + GATE(HCLK_OTG1, "hclk_usbotg1", "hclk_peri", CLK_IGNORE_UNUSED, > + RK2928_CLKGATE_CON(7), 3, GFLAGS), > GATE(HCLK_HSIC, "hclk_hsic", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), > > GATE(PCLK_TIMER3, "pclk_timer3", "pclk_cpu", 0, RK2928_CLKGATE_CON(7), 9, GFLAGS), > -- > 2.1.0 Reviewed-by: Romain Perier <romain.perier@gmail.com> Tested-by: Romain Perier <romain.perier@gmail.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host 2014-12-12 21:05 ` [PATCH v2] " Julien CHAUVEAU 2014-12-12 21:42 ` Romain Perier @ 2014-12-21 14:08 ` Heiko Stübner 1 sibling, 0 replies; 7+ messages in thread From: Heiko Stübner @ 2014-12-21 14:08 UTC (permalink / raw) To: Julien CHAUVEAU Cc: Mike Turquette, Stephen Boyd, moderated list:ARM/Rockchip SoC..., open list:ARM/Rockchip SoC..., open list:COMMON CLK FRAMEWORK Am Freitag, 12. Dezember 2014, 22:05:52 schrieb Julien CHAUVEAU: > This patch adds CLK_IGNORE_UNUSED flag to hclk_usb_peri, hclk_usbotg0 > and hclk_usbotg1 because these clocks must remain enabled to use the > USB controllers in host mode. > > This fixes a regression introduced by commit 78eaf6095cc7 > ("clk: rockchip: disable unused clocks"). > > Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr> applied to my clk/fixes branch with Romain's tags Heiko ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-12-21 14:08 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-12-12 14:54 [PATCH] clk: rockchip: add CLK_IGNORE_UNUSED flag to fix USB Host Julien CHAUVEAU 2014-12-12 15:44 ` Romain Perier 2014-12-12 18:01 ` NEO-Technologies / Julien CHAUVEAU 2014-12-12 18:02 ` Heiko Stübner 2014-12-12 21:05 ` [PATCH v2] " Julien CHAUVEAU 2014-12-12 21:42 ` Romain Perier 2014-12-21 14:08 ` Heiko Stübner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox