* [PATCH] clk: zynq: Leave debug clocks in bootup state
@ 2014-04-17 18:40 Soren Brinkmann
2014-04-22 11:10 ` Michal Simek
0 siblings, 1 reply; 2+ messages in thread
From: Soren Brinkmann @ 2014-04-17 18:40 UTC (permalink / raw)
To: Mike Turquette, Michal Simek
Cc: Sören Brinkmann, linux-kernel, linux-arm-kernel, git,
Stephen Boyd, Stephen Warren, James Hogan, Felipe Pena
Make sure debug clocks stay enabled if the bootloader enabled them.
Otherwise debug HW may crash due to bus-hangs caused by stopped clocks.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
drivers/clk/zynq/clkc.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 52c09afdcfb7..246cf1226eaa 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -53,6 +53,9 @@ static void __iomem *zynq_clkc_base;
#define NUM_MIO_PINS 54
+#define DBG_CLK_CTRL_CLKACT_TRC BIT(0)
+#define DBG_CLK_CTRL_CPU_1XCLKACT BIT(1)
+
enum zynq_clk {
armpll, ddrpll, iopll,
cpu_6or4x, cpu_3or2x, cpu_2x, cpu_1x,
@@ -499,6 +502,15 @@ static void __init zynq_clk_setup(struct device_node *np)
clk_output_name[cpu_1x], 0, SLCR_DBG_CLK_CTRL, 1, 0,
&dbgclk_lock);
+ /* leave debug clocks in the state the bootloader set them up to */
+ tmp = clk_readl(SLCR_DBG_CLK_CTRL);
+ if (tmp & DBG_CLK_CTRL_CLKACT_TRC)
+ if (clk_prepare_enable(clks[dbg_trc]))
+ pr_warn("%s: trace clk enable failed\n", __func__);
+ if (tmp & DBG_CLK_CTRL_CPU_1XCLKACT)
+ if (clk_prepare_enable(clks[dbg_apb]))
+ pr_warn("%s: debug APB clk enable failed\n", __func__);
+
/* One gated clock for all APER clocks. */
clks[dma] = clk_register_gate(NULL, clk_output_name[dma],
clk_output_name[cpu_2x], 0, SLCR_APER_CLK_CTRL, 0, 0,
--
1.9.2.1.g06c4abd
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] clk: zynq: Leave debug clocks in bootup state
2014-04-17 18:40 [PATCH] clk: zynq: Leave debug clocks in bootup state Soren Brinkmann
@ 2014-04-22 11:10 ` Michal Simek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Simek @ 2014-04-22 11:10 UTC (permalink / raw)
To: Soren Brinkmann
Cc: Mike Turquette, Michal Simek, linux-kernel, linux-arm-kernel,
git, Stephen Boyd, Stephen Warren, James Hogan, Felipe Pena
On 04/17/2014 08:40 PM, Soren Brinkmann wrote:
> Make sure debug clocks stay enabled if the bootloader enabled them.
> Otherwise debug HW may crash due to bus-hangs caused by stopped clocks.
>
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> ---
> drivers/clk/zynq/clkc.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
> index 52c09afdcfb7..246cf1226eaa 100644
> --- a/drivers/clk/zynq/clkc.c
> +++ b/drivers/clk/zynq/clkc.c
> @@ -53,6 +53,9 @@ static void __iomem *zynq_clkc_base;
Applied to zynq/clk.
Thanks,
Michal
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-22 11:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-17 18:40 [PATCH] clk: zynq: Leave debug clocks in bootup state Soren Brinkmann
2014-04-22 11:10 ` Michal Simek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®