clk: qcom: Add support for clk_set_flags for branch and dummy clock
Add support to allow setting various flags on the branch clocks
pertaining to PERIPH, RETAIN_PERIPH, RETAIN_MEM set and clear by
clients who require this support.
Change-Id: I59ddc1b3b677bd0d7fa838afc9a6cbfc10f98409
Signed-off-by: Taniya Das <tdas@codeaurora.org>
diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c
index 26f7af31..19e001e 100644
--- a/drivers/clk/qcom/clk-branch.c
+++ b/drivers/clk/qcom/clk-branch.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013, 2016, The Linux Foundation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -122,15 +122,62 @@
return clk_branch_toggle(hw, true, clk_branch_check_halt);
}
+static int clk_cbcr_set_flags(struct regmap *regmap, unsigned int reg,
+ unsigned long flags)
+{
+ u32 cbcr_val;
+
+ regmap_read(regmap, reg, &cbcr_val);
+
+ switch (flags) {
+ case CLKFLAG_PERIPH_OFF_SET:
+ cbcr_val |= BIT(12);
+ break;
+ case CLKFLAG_PERIPH_OFF_CLEAR:
+ cbcr_val &= ~BIT(12);
+ break;
+ case CLKFLAG_RETAIN_PERIPH:
+ cbcr_val |= BIT(13);
+ break;
+ case CLKFLAG_NORETAIN_PERIPH:
+ cbcr_val &= ~BIT(13);
+ break;
+ case CLKFLAG_RETAIN_MEM:
+ cbcr_val |= BIT(14);
+ break;
+ case CLKFLAG_NORETAIN_MEM:
+ cbcr_val &= ~BIT(14);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ regmap_write(regmap, reg, cbcr_val);
+
+ /* Make sure power is enabled/disabled before returning. */
+ mb();
+ udelay(1);
+
+ return 0;
+}
+
static void clk_branch_disable(struct clk_hw *hw)
{
clk_branch_toggle(hw, false, clk_branch_check_halt);
}
+static int clk_branch_set_flags(struct clk_hw *hw, unsigned int flags)
+{
+ struct clk_branch *br = to_clk_branch(hw);
+
+ return clk_cbcr_set_flags(br->clkr.regmap, br->halt_reg, flags);
+}
+
const struct clk_ops clk_branch_ops = {
.enable = clk_branch_enable,
.disable = clk_branch_disable,
.is_enabled = clk_is_enabled_regmap,
+ .set_flags = clk_branch_set_flags,
};
EXPORT_SYMBOL_GPL(clk_branch_ops);
@@ -148,6 +195,7 @@
.enable = clk_branch2_enable,
.disable = clk_branch2_disable,
.is_enabled = clk_is_enabled_regmap,
+ .set_flags = clk_branch_set_flags,
};
EXPORT_SYMBOL_GPL(clk_branch2_ops);