msm: clock-8960: Don't disable QDSS roots
Disabling the roots of the QDSS clocks prevents an external
debugger from coming in and enabling the debug clocks it requires
to operate. Therefore never disable the roots of these clocks so
that debugging continues to work.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 77b3a6b..2a6eceb 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -1216,8 +1216,6 @@
udelay(1);
}
-#define QDSS_CLK_ROOT_ENA BIT(1)
-
static int qdss_clk_enable(struct clk *c)
{
struct rcg_clk *clk = to_rcg_clk(c);
@@ -1229,16 +1227,9 @@
reg = readl_relaxed(clk->ns_reg);
reg |= bank_sel_mask;
writel_relaxed(reg, clk->ns_reg);
- /* Enable root */
- reg |= QDSS_CLK_ROOT_ENA;
- writel_relaxed(reg, clk->ns_reg);
ret = rcg_clk_enable(c);
if (ret) {
- /* Disable root */
- reg = readl_relaxed(clk->ns_reg);
- reg &= ~QDSS_CLK_ROOT_ENA;
- writel_relaxed(reg, clk->ns_reg);
/* Switch to bank 0 */
reg &= ~bank_sel_mask;
writel_relaxed(reg, clk->ns_reg);
@@ -1253,11 +1244,8 @@
u32 reg, bank_sel_mask = bank->bank_sel_mask;
rcg_clk_disable(c);
- /* Disable root */
- reg = readl_relaxed(clk->ns_reg);
- reg &= ~QDSS_CLK_ROOT_ENA;
- writel_relaxed(reg, clk->ns_reg);
/* Switch to bank 0 */
+ reg = readl_relaxed(clk->ns_reg);
reg &= ~bank_sel_mask;
writel_relaxed(reg, clk->ns_reg);
}
@@ -1269,11 +1257,8 @@
u32 reg, bank_sel_mask = bank->bank_sel_mask;
rcg_clk_auto_off(c);
- /* Disable root */
- reg = readl_relaxed(clk->ns_reg);
- reg &= ~QDSS_CLK_ROOT_ENA;
- writel_relaxed(reg, clk->ns_reg);
/* Switch to bank 0 */
+ reg = readl_relaxed(clk->ns_reg);
reg &= ~bank_sel_mask;
writel_relaxed(reg, clk->ns_reg);
}