sunxi: initial 3.13 support

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 39471

1 files changed, 129 insertions, 0 deletions

diff --git a/target/linux/sunxi/patches-3.13/120-clk-sunxi-mod0.patch b/target/linux/sunxi/patches-3.13/120-clk-sunxi-mod0.patch
new file mode 100644
index 0000000000..34a2a2ac2b
--- /dev/null
+++ b/target/linux/sunxi/patches-3.13/120-clk-sunxi-mod0.patch
@@ -0,0 +1,129 @@
+From bdc913d1ef5143a8728ae414fcb90f9ed87a58da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
+Date: Mon, 23 Dec 2013 00:32:39 -0300
+Subject: [PATCH] clk: sunxi: mod0 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit implements support for the "module 0" type of clocks, as
+used by MMC, IR, NAND, SATA and other components.
+
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+Acked-by: Mike Turquette <mturquette@linaro.org>
+---
+ Documentation/devicetree/bindings/clock/sunxi.txt |  5 +-
+ drivers/clk/sunxi/clk-sunxi.c                     | 57 +++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
+index 80b2a39..46d8433 100644
+--- a/Documentation/devicetree/bindings/clock/sunxi.txt
++++ b/Documentation/devicetree/bindings/clock/sunxi.txt
+@@ -35,10 +35,13 @@ Required properties:
+ 	"allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20
+ 	"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
+ 
+ Required properties for all clocks:
+ - reg : shall be the control register address for the clock.
+-- clocks : shall be the input parent clock(s) phandle for the clock
++- clocks : shall be the input parent clock(s) phandle for the clock. For
++	multiplexed clocks, the list order must match the hardware
++	programming order.
+ - #clock-cells : from common clock binding; shall be set to 0 except for
+ 	"allwinner,*-gates-clk" where it shall be set to 1
+ 
+diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
+index 649d7c3..af99b57 100644
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -295,6 +295,47 @@ static void sun4i_get_apb1_factors(u32 *freq, u32 parent_rate,
+ 
+ 
+ /**
++ * sun4i_get_mod0_factors() - calculates m, n factors for MOD0-style clocks
++ * MMC rate is calculated as follows
++ * rate = (parent_rate >> p) / (m + 1);
++ */
++
++static void sun4i_get_mod0_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 < 16)
++		calcp = 0;
++	else if (div / 2 < 16)
++		calcp = 1;
++	else if (div / 4 < 16)
++		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
+  */
+ 
+@@ -341,6 +382,14 @@ struct factors_data {
+ 	.pwidth = 2,
+ };
+ 
++/* user manual says "n" but it's really "p" */
++static struct clk_factors_config sun4i_mod0_config = {
++	.mshift = 0,
++	.mwidth = 4,
++	.pshift = 16,
++	.pwidth = 2,
++};
++
+ static const struct factors_data sun4i_pll1_data __initconst = {
+ 	.enable = 31,
+ 	.table = &sun4i_pll1_config,
+@@ -364,6 +413,13 @@ struct factors_data {
+ 	.getter = sun4i_get_apb1_factors,
+ };
+ 
++static const struct factors_data sun4i_mod0_data __initconst = {
++	.enable = 31,
++	.mux = 24,
++	.table = &sun4i_mod0_config,
++	.getter = sun4i_get_mod0_factors,
++};
++
+ static struct clk * __init sunxi_factors_clk_setup(struct device_node *node,
+ 						const struct factors_data *data)
+ {
+@@ -852,6 +908,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node,
+ 	{.compatible = "allwinner,sun4i-pll1-clk", .data = &sun4i_pll1_data,},
+ 	{.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,},
+ 	{.compatible = "allwinner,sun4i-apb1-clk", .data = &sun4i_apb1_data,},
++	{.compatible = "allwinner,sun4i-mod0-clk", .data = &sun4i_mod0_data,},
+ 	{}
+ };
+ 
+-- 
+1.8.5.1
+