Browse Source

clk: hisi: use clk_register_mux_table in hisi_clk_register_mux

Platform hix5hd2 use mux table, so use clk_register_mux_table instead

Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Zhangfei Gao 11 years ago
parent
commit
156342a1e5
2 changed files with 9 additions and 5 deletions
  1. 8 5
      drivers/clk/hisilicon/clk.c
  2. 1 0
      drivers/clk/hisilicon/clk.h

+ 8 - 5
drivers/clk/hisilicon/clk.c

@@ -127,11 +127,14 @@ void __init hisi_clk_register_mux(struct hisi_mux_clock *clks,
 	int i;
 	int i;
 
 
 	for (i = 0; i < nums; i++) {
 	for (i = 0; i < nums; i++) {
-		clk = clk_register_mux(NULL, clks[i].name, clks[i].parent_names,
-				       clks[i].num_parents, clks[i].flags,
-				       base + clks[i].offset, clks[i].shift,
-				       clks[i].width, clks[i].mux_flags,
-				       &hisi_clk_lock);
+		u32 mask = BIT(clks[i].width) - 1;
+
+		clk = clk_register_mux_table(NULL, clks[i].name,
+					clks[i].parent_names,
+					clks[i].num_parents, clks[i].flags,
+					base + clks[i].offset, clks[i].shift,
+					mask, clks[i].mux_flags,
+					clks[i].table, &hisi_clk_lock);
 		if (IS_ERR(clk)) {
 		if (IS_ERR(clk)) {
 			pr_err("%s: failed to register clock %s\n",
 			pr_err("%s: failed to register clock %s\n",
 			       __func__, clks[i].name);
 			       __func__, clks[i].name);

+ 1 - 0
drivers/clk/hisilicon/clk.h

@@ -62,6 +62,7 @@ struct hisi_mux_clock {
 	u8			shift;
 	u8			shift;
 	u8			width;
 	u8			width;
 	u8			mux_flags;
 	u8			mux_flags;
+	u32			*table;
 	const char		*alias;
 	const char		*alias;
 };
 };