diff options
author | Emilio López <emilio@elopez.com.ar> | 2014-03-19 14:19:30 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-03-19 15:34:39 -0400 |
commit | 5a8ddf26822dcf601a44d35efa8fe162cbc84e62 (patch) | |
tree | 0c77dedaf00ce88154de9320cc2a93e0ed44f195 | |
parent | df21f62bbb8d5e2e115cf331c2a74351e4e73153 (diff) |
clk: sunxi: fix A20 PLL4 calculation
Allwinner actually reworked the PLL4 on A20; now it's compatible with
the sun4i PLL5/6 design previous to any divisions, as well as to the new
PLL8 in sun7i.
Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r-- | drivers/clk/sunxi/clk-sunxi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 23baad9d934a..ef6ad52b7546 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c | |||
@@ -589,6 +589,12 @@ static const struct factors_data sun6i_a31_pll1_data __initconst = { | |||
589 | .getter = sun6i_a31_get_pll1_factors, | 589 | .getter = sun6i_a31_get_pll1_factors, |
590 | }; | 590 | }; |
591 | 591 | ||
592 | static const struct factors_data sun7i_a20_pll4_data __initconst = { | ||
593 | .enable = 31, | ||
594 | .table = &sun4i_pll5_config, | ||
595 | .getter = sun4i_get_pll5_factors, | ||
596 | }; | ||
597 | |||
592 | static const struct factors_data sun4i_pll5_data __initconst = { | 598 | static const struct factors_data sun4i_pll5_data __initconst = { |
593 | .enable = 31, | 599 | .enable = 31, |
594 | .table = &sun4i_pll5_config, | 600 | .table = &sun4i_pll5_config, |
@@ -1209,6 +1215,7 @@ free_clkdata: | |||
1209 | static const struct of_device_id clk_factors_match[] __initconst = { | 1215 | static const struct of_device_id clk_factors_match[] __initconst = { |
1210 | {.compatible = "allwinner,sun4i-a10-pll1-clk", .data = &sun4i_pll1_data,}, | 1216 | {.compatible = "allwinner,sun4i-a10-pll1-clk", .data = &sun4i_pll1_data,}, |
1211 | {.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,}, | 1217 | {.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,}, |
1218 | {.compatible = "allwinner,sun7i-a20-pll4-clk", .data = &sun7i_a20_pll4_data,}, | ||
1212 | {.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,}, | 1219 | {.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,}, |
1213 | {.compatible = "allwinner,sun4i-a10-apb1-clk", .data = &sun4i_apb1_data,}, | 1220 | {.compatible = "allwinner,sun4i-a10-apb1-clk", .data = &sun4i_apb1_data,}, |
1214 | {.compatible = "allwinner,sun4i-a10-mod0-clk", .data = &sun4i_mod0_data,}, | 1221 | {.compatible = "allwinner,sun4i-a10-mod0-clk", .data = &sun4i_mod0_data,}, |