Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156342a1 authored by Zhangfei Gao's avatar Zhangfei Gao Committed by Haojian Zhuang
Browse files

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: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
parent c9eaa447

drivers/clk/hisilicon/clk.c

+8 −5
Original line number Diff line number Diff line
@@ -127,11 +127,14 @@ void __init hisi_clk_register_mux(struct hisi_mux_clock *clks, 
	int i;



	for (i = 0; i < nums; i++) {

		clk = clk_register_mux(NULL, clks[i].name, clks[i].parent_names,

		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,

				       clks[i].width, clks[i].mux_flags,

				       &hisi_clk_lock);

					mask, clks[i].mux_flags,

					clks[i].table, &hisi_clk_lock);

		if (IS_ERR(clk)) {

			pr_err("%s: failed to register clock %s\n",

			       __func__, clks[i].name);

drivers/clk/hisilicon/clk.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct hisi_mux_clock { 
	u8			shift;

	u8			width;

	u8			mux_flags;

	u32			*table;

	const char		*alias;

};