From: Stephen Boyd <[email protected]> The 7x30 clock driver needs to perform clock resets and the only way that is possible is through proc_comm. Expose the reset functionality as a new function callable from the 7x30 clock driver.
Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: David Brown <[email protected]> --- arch/arm/mach-msm/clock-pcom.c | 13 +++++++++---- arch/arm/mach-msm/clock-pcom.h | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c index e11ef57..f441247 100644 --- a/arch/arm/mach-msm/clock-pcom.c +++ b/arch/arm/mach-msm/clock-pcom.c @@ -41,10 +41,9 @@ static void pc_clk_disable(struct clk *clk) msm_proc_comm(PCOM_CLKCTL_RPC_DISABLE, &id, NULL); } -int pc_clk_reset(struct clk *clk, enum clk_reset_action action) +int pc_clk_reset(unsigned id, enum clk_reset_action action) { int rc; - unsigned id = to_pcom_clk(clk)->id; if (action == CLK_RESET_ASSERT) rc = msm_proc_comm(PCOM_CLKCTL_RPC_RESET_ASSERT, &id, NULL); @@ -57,6 +56,12 @@ int pc_clk_reset(struct clk *clk, enum clk_reset_action action) return (int)id < 0 ? -EINVAL : 0; } +static int pc_reset(struct clk *clk, enum clk_reset_action action) +{ + unsigned id = to_pcom_clk(clk)->id; + return pc_clk_reset(id, action); +} + static int pc_clk_set_rate(struct clk *clk, unsigned rate) { /* The rate _might_ be rounded off to the nearest KHz value by the @@ -135,7 +140,7 @@ struct clk_ops clk_ops_pcom = { .enable = pc_clk_enable, .disable = pc_clk_disable, .auto_off = pc_clk_disable, - .reset = pc_clk_reset, + .reset = pc_reset, .set_rate = pc_clk_set_rate, .set_min_rate = pc_clk_set_min_rate, .set_max_rate = pc_clk_set_max_rate, @@ -165,7 +170,7 @@ struct clk_ops clk_ops_pcom_div2 = { .enable = pc_clk_enable, .disable = pc_clk_disable, .auto_off = pc_clk_disable, - .reset = pc_clk_reset, + .reset = pc_reset, .set_rate = pc_clk_set_rate2, .set_min_rate = pc_clk_set_min_rate2, .set_flags = pc_clk_set_flags, diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h index 23807ff..c3beb47 100644 --- a/arch/arm/mach-msm/clock-pcom.h +++ b/arch/arm/mach-msm/clock-pcom.h @@ -120,6 +120,8 @@ #define P_NR_CLKS 102 +extern int pc_clk_reset(unsigned id, enum clk_reset_action action); + struct clk_ops; extern struct clk_ops clk_ops_pcom; extern struct clk_ops clk_ops_pcom_div2; -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
