summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEmilio López <emilio@elopez.com.ar>2014-11-06 11:40:29 +0800
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-11-11 15:54:40 +0100
commit93746e70be83a3f113134a16065957b324af50f7 (patch)
tree8f8c26ba9d3a9bc335b30963a6cd6d7caecde7dd /drivers
parent0b0f08028e4e2d69edbe4bb073af26cd17505a04 (diff)
downloadlinux-stable-93746e70be83a3f113134a16065957b324af50f7.tar.gz
linux-stable-93746e70be83a3f113134a16065957b324af50f7.tar.bz2
linux-stable-93746e70be83a3f113134a16065957b324af50f7.zip
clk: sunxi: unify APB1 clock
This commit unifies the APB1 mux with the APB1 clock, using the new factors infrastructure. Signed-off-by: Emilio López <emilio@elopez.com.ar> [wens@csie.org: Add mux mask bits] Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 20f47c68a946..4133e278212b 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -507,6 +507,8 @@ static const struct factors_data sun6i_a31_pll6_data __initconst = {
};
static const struct factors_data sun4i_apb1_data __initconst = {
+ .mux = 24,
+ .muxmask = BIT(1) | BIT(0),
.table = &sun4i_apb1_config,
.getter = sun4i_get_apb1_factors,
};
@@ -545,10 +547,6 @@ static const struct mux_data sun6i_a31_ahb1_mux_data __initconst = {
.shift = 12,
};
-static const struct mux_data sun4i_apb1_mux_data __initconst = {
- .shift = 24,
-};
-
static void __init sunxi_mux_clk_setup(struct device_node *node,
struct mux_data *data)
{
@@ -1109,7 +1107,6 @@ static const struct of_device_id clk_divs_match[] __initconst = {
/* Matches for mux clocks */
static const struct of_device_id clk_mux_match[] __initconst = {
{.compatible = "allwinner,sun4i-a10-cpu-clk", .data = &sun4i_cpu_mux_data,},
- {.compatible = "allwinner,sun4i-a10-apb1-mux-clk", .data = &sun4i_apb1_mux_data,},
{.compatible = "allwinner,sun6i-a31-ahb1-mux-clk", .data = &sun6i_a31_ahb1_mux_data,},
{}
};