diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2015-01-19 21:05:31 -0500 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2015-01-27 14:49:09 -0500 |
commit | b3ee3eff57817ed5b4f6294b5a3407e4d9fc7014 (patch) | |
tree | d7397c60b385e1f3bfbfa21cef5170fa910277e0 | |
parent | 4116076e8cbfaacb5925c24a4d22e6b47a96eb42 (diff) |
clk: qcom: Add simple regmap based muxes
Add support for muxes that use regmap instead of readl/writel
directly. We don't support as many features as clk-mux.c, but
this is good enough to support getting and setting parents.
Adding a table based lookup can be added in the future if needed.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Tested-by: Kenneth Westfield <kwestfie@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
-rw-r--r-- | drivers/clk/qcom/Makefile | 1 | ||||
-rw-r--r-- | drivers/clk/qcom/clk-regmap-mux.c | 59 | ||||
-rw-r--r-- | drivers/clk/qcom/clk-regmap-mux.h | 29 |
3 files changed, 89 insertions, 0 deletions
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index ed8976e87c0b..f5e5607f3965 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile | |||
@@ -7,6 +7,7 @@ clk-qcom-y += clk-rcg.o | |||
7 | clk-qcom-y += clk-rcg2.o | 7 | clk-qcom-y += clk-rcg2.o |
8 | clk-qcom-y += clk-branch.o | 8 | clk-qcom-y += clk-branch.o |
9 | clk-qcom-y += clk-regmap-divider.o | 9 | clk-qcom-y += clk-regmap-divider.o |
10 | clk-qcom-y += clk-regmap-mux.o | ||
10 | clk-qcom-y += reset.o | 11 | clk-qcom-y += reset.o |
11 | 12 | ||
12 | obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o | 13 | obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o |
diff --git a/drivers/clk/qcom/clk-regmap-mux.c b/drivers/clk/qcom/clk-regmap-mux.c new file mode 100644 index 000000000000..cae3071f384c --- /dev/null +++ b/drivers/clk/qcom/clk-regmap-mux.c | |||
@@ -0,0 +1,59 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2014, The Linux Foundation. All rights reserved. | ||
3 | * | ||
4 | * This software is licensed under the terms of the GNU General Public | ||
5 | * License version 2, as published by the Free Software Foundation, and | ||
6 | * may be copied, distributed, and modified under those terms. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/bitops.h> | ||
16 | #include <linux/regmap.h> | ||
17 | #include <linux/export.h> | ||
18 | |||
19 | #include "clk-regmap-mux.h" | ||
20 | |||
21 | static inline struct clk_regmap_mux *to_clk_regmap_mux(struct clk_hw *hw) | ||
22 | { | ||
23 | return container_of(to_clk_regmap(hw), struct clk_regmap_mux, clkr); | ||
24 | } | ||
25 | |||
26 | static u8 mux_get_parent(struct clk_hw *hw) | ||
27 | { | ||
28 | struct clk_regmap_mux *mux = to_clk_regmap_mux(hw); | ||
29 | struct clk_regmap *clkr = to_clk_regmap(hw); | ||
30 | unsigned int mask = GENMASK(mux->width - 1, 0); | ||
31 | unsigned int val; | ||
32 | |||
33 | regmap_read(clkr->regmap, mux->reg, &val); | ||
34 | |||
35 | val >>= mux->shift; | ||
36 | val &= mask; | ||
37 | |||
38 | return val; | ||
39 | } | ||
40 | |||
41 | static int mux_set_parent(struct clk_hw *hw, u8 index) | ||
42 | { | ||
43 | struct clk_regmap_mux *mux = to_clk_regmap_mux(hw); | ||
44 | struct clk_regmap *clkr = to_clk_regmap(hw); | ||
45 | unsigned int mask = GENMASK(mux->width + mux->shift - 1, mux->shift); | ||
46 | unsigned int val; | ||
47 | |||
48 | val = index; | ||
49 | val <<= mux->shift; | ||
50 | |||
51 | return regmap_update_bits(clkr->regmap, mux->reg, mask, val); | ||
52 | } | ||
53 | |||
54 | const struct clk_ops clk_regmap_mux_closest_ops = { | ||
55 | .get_parent = mux_get_parent, | ||
56 | .set_parent = mux_set_parent, | ||
57 | .determine_rate = __clk_mux_determine_rate_closest, | ||
58 | }; | ||
59 | EXPORT_SYMBOL_GPL(clk_regmap_mux_closest_ops); | ||
diff --git a/drivers/clk/qcom/clk-regmap-mux.h b/drivers/clk/qcom/clk-regmap-mux.h new file mode 100644 index 000000000000..5cec76154fda --- /dev/null +++ b/drivers/clk/qcom/clk-regmap-mux.h | |||
@@ -0,0 +1,29 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2014, The Linux Foundation. All rights reserved. | ||
3 | * | ||
4 | * This software is licensed under the terms of the GNU General Public | ||
5 | * License version 2, as published by the Free Software Foundation, and | ||
6 | * may be copied, distributed, and modified under those terms. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | */ | ||
13 | |||
14 | #ifndef __QCOM_CLK_REGMAP_MUX_H__ | ||
15 | #define __QCOM_CLK_REGMAP_MUX_H__ | ||
16 | |||
17 | #include <linux/clk-provider.h> | ||
18 | #include "clk-regmap.h" | ||
19 | |||
20 | struct clk_regmap_mux { | ||
21 | u32 reg; | ||
22 | u32 shift; | ||
23 | u32 width; | ||
24 | struct clk_regmap clkr; | ||
25 | }; | ||
26 | |||
27 | extern const struct clk_ops clk_regmap_mux_closest_ops; | ||
28 | |||
29 | #endif | ||