diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2014-02-05 08:42:28 +0000 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2014-02-05 08:42:28 +0000 |
commit | d1ca9d207acc1056bd460f7cba2f50af87004f58 (patch) | |
tree | 3ec56a328c48048eb595e971cf2f7f51e73404ed /target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch | |
parent | 1dd76f71e1aa7e8dae83aed641ac527ac4f8fadd (diff) | |
download | upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.tar.gz upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.tar.bz2 upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.zip |
sunxi: initial 3.13 support
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39471 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch b/target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch new file mode 100644 index 0000000000..5b46d8b127 --- /dev/null +++ b/target/linux/sunxi/patches-3.13/210-clk-sunxi-add-a20-output-clk.patch @@ -0,0 +1,119 @@ +From 5ca9eadcb5f5cd9af6f1650029ad64052a1a0b10 Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai <wens@csie.org> +Date: Tue, 24 Dec 2013 21:26:17 +0800 +Subject: [PATCH] clk: sunxi: Allwinner A20 output clock support + +This patch adds support for the external clock outputs on the +Allwinner A20 SoC. The clock outputs are similar to "module 0" +type clocks, with different offsets and widths for clock factors. + +Signed-off-by: Chen-Yu Tsai <wens@csie.org> +--- + Documentation/devicetree/bindings/clock/sunxi.txt | 1 + + drivers/clk/sunxi/clk-sunxi.c | 57 +++++++++++++++++++++++ + 2 files changed, 58 insertions(+) + +diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt +index 941bd93..79c7197 100644 +--- a/Documentation/devicetree/bindings/clock/sunxi.txt ++++ b/Documentation/devicetree/bindings/clock/sunxi.txt +@@ -36,6 +36,7 @@ Required properties: + "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 + "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 + "allwinner,sun4i-mod0-clk" - for the module 0 family of clocks ++ "allwinner,sun7i-a20-out-clk" - for the external output clocks + + Required properties for all clocks: + - reg : shall be the control register address for the clock. +diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c +index 8a07a68..df1f385 100644 +--- a/drivers/clk/sunxi/clk-sunxi.c ++++ b/drivers/clk/sunxi/clk-sunxi.c +@@ -396,6 +396,47 @@ void clk_sunxi_mmc_phase_control(struct clk_hw *hw, u8 sample, u8 output) + + + /** ++ * sun7i_a20_get_out_factors() - calculates m, p factors for CLK_OUT_A/B ++ * CLK_OUT rate is calculated as follows ++ * rate = (parent_rate >> p) / (m + 1); ++ */ ++ ++static void sun7i_a20_get_out_factors(u32 *freq, u32 parent_rate, ++ u8 *n, u8 *k, u8 *m, u8 *p) ++{ ++ u8 div, calcm, calcp; ++ ++ /* These clocks can only divide, so we will never be able to achieve ++ * frequencies higher than the parent frequency */ ++ if (*freq > parent_rate) ++ *freq = parent_rate; ++ ++ div = parent_rate / *freq; ++ ++ if (div < 32) ++ calcp = 0; ++ else if (div / 2 < 32) ++ calcp = 1; ++ else if (div / 4 < 32) ++ calcp = 2; ++ else ++ calcp = 3; ++ ++ calcm = DIV_ROUND_UP(div, 1 << calcp); ++ ++ *freq = (parent_rate >> calcp) / calcm; ++ ++ /* we were called to round the frequency, we can now return */ ++ if (n == NULL) ++ return; ++ ++ *m = calcm - 1; ++ *p = calcp; ++} ++ ++ ++ ++/** + * sunxi_factors_clk_setup() - Setup function for factor clocks + */ + +@@ -455,6 +496,14 @@ struct factors_data { + .pwidth = 2, + }; + ++/* user manual says "n" but it's really "p" */ ++static struct clk_factors_config sun7i_a20_out_config = { ++ .mshift = 8, ++ .mwidth = 5, ++ .pshift = 20, ++ .pwidth = 2, ++}; ++ + static const struct factors_data sun4i_pll1_data __initconst = { + .enable = 31, + .table = &sun4i_pll1_config, +@@ -492,6 +541,13 @@ struct factors_data { + .getter = sun4i_get_mod0_factors, + }; + ++static const struct factors_data sun7i_a20_out_data __initconst = { ++ .enable = 31, ++ .mux = 24, ++ .table = &sun7i_a20_out_config, ++ .getter = sun7i_a20_get_out_factors, ++}; ++ + static struct clk * __init sunxi_factors_clk_setup(struct device_node *node, + const struct factors_data *data) + { +@@ -995,6 +1051,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, + {.compatible = "allwinner,sun5i-a13-ahb-clk", .data = &sun5i_a13_ahb_data,}, + {.compatible = "allwinner,sun4i-apb1-clk", .data = &sun4i_apb1_data,}, + {.compatible = "allwinner,sun4i-mod0-clk", .data = &sun4i_mod0_data,}, ++ {.compatible = "allwinner,sun7i-a20-out-clk", .data = &sun7i_a20_out_data,}, + {} + }; + +-- +1.8.5.1 + |