]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
clk: OMAP: Remove _ck assumption for DT bindings
authorHemant Hariyani <hemanthariyani@ti.com>
Wed, 17 Jul 2013 18:58:24 +0000 (13:58 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Wed, 17 Jul 2013 18:59:53 +0000 (13:59 -0500)
Not all clocks have _ck suffix and this assumption was incorrect.
e.g: DRA7xx clocks: gpu_core_gclk_mux, hdmi_dpll_clk_mux, eve_clk

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
[cherry-pick and format for 3.8 sdk kernel]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
drivers/clk/omap/clk.c

index 5a3c6d9b5a99a26a3076a6c33c35ce13b3817bc9..fdeeeb3b23f7fbf23a1c1895adf6727222c82c61 100644 (file)
@@ -34,8 +34,7 @@ static const struct of_device_id omap_clk_of_match[] = {
  * @data:      unused
  *
  * REVISIT: We assume the following:
- * 1. omap clock names end with _ck
- * 2. omap clock names are under 32 characters in length
+ * 1. omap clock names are under 32 characters in length
  */
 static struct clk *omap_clk_src_get(struct of_phandle_args *clkspec, void *data)
 {
@@ -43,7 +42,7 @@ static struct clk *omap_clk_src_get(struct of_phandle_args *clkspec, void *data)
        char clk_name[32];
        struct device_node *np = clkspec->np;
 
-       snprintf(clk_name, 32, "%s_ck", np->name);
+       snprintf(clk_name, 32, "%s", np->name);
        clk = clk_get(NULL, clk_name);
        if (IS_ERR(clk))
                pr_err("%s: could not get clock %s(%ld)\n", __func__,