diff options
| author | Sumit Semwal <sumit.semwal@ti.com> | 2011-10-14 11:29:38 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@ti.com> | 2011-10-28 16:40:44 +0530 |
| commit | 09a590b8c0ebcb4be2c9c8b6ab47800e1277237c (patch) | |
| tree | 04264925b580536e646694898e96b0f57a7de5dc | |
| parent | c9029b6da6cd3efd9910e2f58283c6968fb9ca91 (diff) | |
arm: omap4: camera: clk name change for 3.1 rebase3.1-cmav16-dmav3-omap4-cam
In 3.1-rc, aux clock names to be used for clk_set_parent have changed from
auxclk'X'_ck to auxclk'X'_src_ck.
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 4eb0065f809b..a29fcbedc517 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -134,12 +134,12 @@ static struct clk *dpll_per_m3x2_ck; static struct clk *aux_clk; static char *aux_clk_name[] = { - "auxclk0_ck", - "auxclk1_ck", - "auxclk2_ck", - "auxclk3_ck", - "auxclk4_ck", - "auxclk5_ck", + "auxclk0_src_ck", + "auxclk1_src_ck", + "auxclk2_src_ck", + "auxclk3_src_ck", + "auxclk4_src_ck", + "auxclk5_src_ck", }; static int omap4_fref_clk_init(struct device *dev, diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index f3011061b46c..8e6c76e2aade 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -137,12 +137,12 @@ static struct clk *dpll_per_m3x2_ck; static struct clk *aux_clk; static char *aux_clk_name[] = { - "auxclk0_ck", - "auxclk1_ck", - "auxclk2_ck", - "auxclk3_ck", - "auxclk4_ck", - "auxclk5_ck", + "auxclk0_src_ck", + "auxclk1_src_ck", + "auxclk2_src_ck", + "auxclk3_src_ck", + "auxclk4_src_ck", + "auxclk5_src_ck", }; static int omap4_fref_clk_init(struct device *dev, |