msm: clock-8610: Rename camera mux clocks temporarily
To allow the generic mux code to co-exist with the camera
mux code, rename the camera mux clocks temporarily. These
clocks will use the generic code soon allowing the camera
specific mux code to go away.
Change-Id: Ic7ddfd9809df3f98782dbfe8187b8b82fa95e91b
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-local2.h b/arch/arm/mach-msm/clock-local2.h
index f33cf9c..f307a2f 100644
--- a/arch/arm/mach-msm/clock-local2.h
+++ b/arch/arm/mach-msm/clock-local2.h
@@ -163,7 +163,7 @@
};
/**
- * struct mux_clk - branch clock
+ * struct cam_mux_clk - branch clock
* @c: clk
* @enable_reg: register that contains the enable bit(s) for the mux
* @select_reg: register that contains the source selection bits for the mux
@@ -172,7 +172,7 @@
* @sources: list of mux sources
* @base: pointer to base address of ioremapped registers.
*/
-struct mux_clk {
+struct cam_mux_clk {
struct clk c;
const u32 enable_reg;
const u32 select_reg;
@@ -184,9 +184,9 @@
void *const __iomem *base;
};
-static inline struct mux_clk *to_mux_clk(struct clk *clk)
+static inline struct cam_mux_clk *to_cam_mux_clk(struct clk *clk)
{
- return container_of(clk, struct mux_clk, c);
+ return container_of(clk, struct cam_mux_clk, c);
}
/*
@@ -200,7 +200,7 @@
*/
extern spinlock_t local_clock_reg_lock;
-extern struct clk_ops clk_ops_mux;
+extern struct clk_ops clk_ops_cam_mux;
extern struct clk_ops clk_ops_empty;
extern struct clk_ops clk_ops_rcg;
extern struct clk_ops clk_ops_rcg_mnd;