* [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
@ 2014-11-12 21:38 Dmitry Torokhov
2014-11-12 21:49 ` Doug Anderson
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2014-11-12 21:38 UTC (permalink / raw)
To: Heiko Stuebner, Mike Turquette
Cc: Doug Anderson, Jianqun, Kever Yang, Mark yao, linux-arm-kernel,
linux-rockchip, linux-kernel
Currently there is no driver owning these clocks and they have to stay
up for the system to function properly, so let's mark them as
CLK_IGNORE_UNUSED.
Without this patch we have trouble with suspend/resume and we have
trouble turning the eDP back on if it ever idles off.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---
drivers/clk/rockchip/clk-rk3288.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 2327829..d79d52f 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -724,14 +724,14 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
GATE(HCLK_VIP, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS),
GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3, GFLAGS),
GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 1, GFLAGS),
- GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 10, GFLAGS),
+ GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 10, GFLAGS),
GATE(PCLK_MIPI_DSI0, "pclk_mipi_dsi0", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 4, GFLAGS),
GATE(PCLK_MIPI_DSI1, "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
GATE(PCLK_MIPI_CSI, "pclk_mipi_csi", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 6, GFLAGS),
GATE(PCLK_LVDS_PHY, "pclk_lvds_phy", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 7, GFLAGS),
GATE(PCLK_EDP_CTRL, "pclk_edp_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 8, GFLAGS),
GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 9, GFLAGS),
- GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS),
+ GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 11, GFLAGS),
/* aclk_vio0 gates */
GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5, GFLAGS),
--
2.1.0.rc2.206.gedb03e5
--
Dmitry
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
2014-11-12 21:38 [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled Dmitry Torokhov
@ 2014-11-12 21:49 ` Doug Anderson
2014-11-13 0:40 ` Mike Turquette
2014-11-13 2:52 ` Kever Yang
2014-11-13 23:45 ` Heiko Stübner
2 siblings, 1 reply; 6+ messages in thread
From: Doug Anderson @ 2014-11-12 21:49 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Heiko Stuebner, Mike Turquette, Jianqun, Kever Yang, Mark yao,
linux-arm-kernel, open list:ARM/Rockchip SoC...,
linux-kernel
Hi,
On Wed, Nov 12, 2014 at 1:38 PM, Dmitry Torokhov <dtor@chromium.org> wrote:
> Currently there is no driver owning these clocks and they have to stay
> up for the system to function properly, so let's mark them as
> CLK_IGNORE_UNUSED.
>
> Without this patch we have trouble with suspend/resume and we have
> trouble turning the eDP back on if it ever idles off.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
> drivers/clk/rockchip/clk-rk3288.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
I'm already on the signed-off-by (mostly because I tweaked the commit
message and tested this), but in case anyone cares I have reviewed
this and tested it. ;)
...obviously we want to get to the bottom of the right way to handle
all of these clocks, but since we _just_ removed the blanket "leave
all clocks enabled" adding a few clocks back into the fold seems sane
until we get all our ducks in a row.
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
2014-11-12 21:49 ` Doug Anderson
@ 2014-11-13 0:40 ` Mike Turquette
2014-11-13 8:44 ` Heiko Stübner
0 siblings, 1 reply; 6+ messages in thread
From: Mike Turquette @ 2014-11-13 0:40 UTC (permalink / raw)
To: Doug Anderson, Dmitry Torokhov
Cc: Heiko Stuebner, Jianqun, Kever Yang, Mark yao, linux-arm-kernel,
open list:ARM/Rockchip SoC...,
linux-kernel
Quoting Doug Anderson (2014-11-12 13:49:18)
> Hi,
>
> On Wed, Nov 12, 2014 at 1:38 PM, Dmitry Torokhov <dtor@chromium.org> wrote:
> > Currently there is no driver owning these clocks and they have to stay
> > up for the system to function properly, so let's mark them as
> > CLK_IGNORE_UNUSED.
> >
> > Without this patch we have trouble with suspend/resume and we have
> > trouble turning the eDP back on if it ever idles off.
> >
> > Signed-off-by: Doug Anderson <dianders@chromium.org>
> > Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> > ---
> > drivers/clk/rockchip/clk-rk3288.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
>
> I'm already on the signed-off-by (mostly because I tweaked the commit
> message and tested this), but in case anyone cares I have reviewed
> this and tested it. ;)
>
> ...obviously we want to get to the bottom of the right way to handle
> all of these clocks, but since we _just_ removed the blanket "leave
> all clocks enabled" adding a few clocks back into the fold seems sane
> until we get all our ducks in a row.
>
> Reviewed-by: Doug Anderson <dianders@chromium.org>
> Tested-by: Doug Anderson <dianders@chromium.org>
Seems fine to me. Just to be clear, Heiko will be picking up the
Rockchip clock patches and submitting a PR, correct? I believe last
merge window was the first time we did that for Rockchip and it went
well.
Regards,
Mike
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
2014-11-13 0:40 ` Mike Turquette
@ 2014-11-13 8:44 ` Heiko Stübner
0 siblings, 0 replies; 6+ messages in thread
From: Heiko Stübner @ 2014-11-13 8:44 UTC (permalink / raw)
To: Mike Turquette
Cc: Doug Anderson, Dmitry Torokhov, Jianqun, Kever Yang, Mark yao,
linux-arm-kernel, open list:ARM/Rockchip SoC...,
linux-kernel
Hi Mike,
Am Mittwoch, 12. November 2014, 16:40:46 schrieb Mike Turquette:
> Seems fine to me. Just to be clear, Heiko will be picking up the
> Rockchip clock patches and submitting a PR, correct? I believe last
> merge window was the first time we did that for Rockchip and it went
> well.
yep, I'm picking up the clock patches.
Heiko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
2014-11-12 21:38 [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled Dmitry Torokhov
2014-11-12 21:49 ` Doug Anderson
@ 2014-11-13 2:52 ` Kever Yang
2014-11-13 23:45 ` Heiko Stübner
2 siblings, 0 replies; 6+ messages in thread
From: Kever Yang @ 2014-11-13 2:52 UTC (permalink / raw)
To: Dmitry Torokhov, Heiko Stuebner, Mike Turquette
Cc: Doug Anderson, Jianqun, Mark yao, linux-arm-kernel,
linux-rockchip, linux-kernel
Hi Dmitry,
On 11/13/2014 05:38 AM, Dmitry Torokhov wrote:
> Currently there is no driver owning these clocks and they have to stay
> up for the system to function properly, so let's mark them as
> CLK_IGNORE_UNUSED.
>
> Without this patch we have trouble with suspend/resume and we have
> trouble turning the eDP back on if it ever idles off.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
> drivers/clk/rockchip/clk-rk3288.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
> index 2327829..d79d52f 100644
> --- a/drivers/clk/rockchip/clk-rk3288.c
> +++ b/drivers/clk/rockchip/clk-rk3288.c
> @@ -724,14 +724,14 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
> GATE(HCLK_VIP, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS),
> GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3, GFLAGS),
> GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 1, GFLAGS),
> - GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 10, GFLAGS),
> + GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 10, GFLAGS),
> GATE(PCLK_MIPI_DSI0, "pclk_mipi_dsi0", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 4, GFLAGS),
> GATE(PCLK_MIPI_DSI1, "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
> GATE(PCLK_MIPI_CSI, "pclk_mipi_csi", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 6, GFLAGS),
> GATE(PCLK_LVDS_PHY, "pclk_lvds_phy", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 7, GFLAGS),
> GATE(PCLK_EDP_CTRL, "pclk_edp_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 8, GFLAGS),
> GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 9, GFLAGS),
> - GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS),
> + GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 11, GFLAGS),
>
> /* aclk_vio0 gates */
> GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5, GFLAGS),
The H/PCLK_VIO2_H2P is some kind of bus clock for a ahb2apb bridge
inside the VIO,
it should be on when some of VIO logic is working, but it is not easy to
assign these
two clocks to module driver. I think it is reasonable to mark with
CLK_IGNORE_UNUSED
tag so far.
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled
2014-11-12 21:38 [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled Dmitry Torokhov
2014-11-12 21:49 ` Doug Anderson
2014-11-13 2:52 ` Kever Yang
@ 2014-11-13 23:45 ` Heiko Stübner
2 siblings, 0 replies; 6+ messages in thread
From: Heiko Stübner @ 2014-11-13 23:45 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Mike Turquette, Doug Anderson, Jianqun, Kever Yang, Mark yao,
linux-arm-kernel, linux-rockchip, linux-kernel
Am Mittwoch, 12. November 2014, 13:38:45 schrieb Dmitry Torokhov:
> Currently there is no driver owning these clocks and they have to stay
> up for the system to function properly, so let's mark them as
> CLK_IGNORE_UNUSED.
>
> Without this patch we have trouble with suspend/resume and we have
> trouble turning the eDP back on if it ever idles off.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
I've added this patch to my v3.19-clk/next branch.
After talking with Doug we agreed on replacing his Signed-Off with the Reviewed
and Tested tags, because his prior involvement was "mostly because I tweaked
the commit message and tested this" - making the new tags fit better.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-13 23:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-12 21:38 [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled Dmitry Torokhov
2014-11-12 21:49 ` Doug Anderson
2014-11-13 0:40 ` Mike Turquette
2014-11-13 8:44 ` Heiko Stübner
2014-11-13 2:52 ` Kever Yang
2014-11-13 23:45 ` 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;
as well as URLs for NNTP newsgroup(s).