sunxi: initial 3.14 patchset

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 181-clk-sunxi-add-names-for-pll56.patch

diff --git a/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch b/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch
new file mode 100644 (file)
index 0000000..879462b
--- /dev/null
+++ b/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch
@@ -0,0 +1,83 @@
+From 8f3156f3f2b70128b2761526c208c8e3bfda694e Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:39 +0800
+Subject: [PATCH] clk: sunxi: add names for pll5, pll6 parent clocks to
+ factors_data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some factor clocks, such as the parent clock of pll5 and pll6, have
+multiple output names. Add the corresponding names to factors_data
+tied to compatible string.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Mike Turquette <mturquette@linaro.org>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
+index 0ed9794..7a2ed98 100644
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -389,6 +389,7 @@ struct factors_data {
+       int mux;
+       struct clk_factors_config *table;
+       void (*getter) (u32 *rate, u32 parent_rate, u8 *n, u8 *k, u8 *m, u8 *p);
++      const char *name;
+ };
+ 
+ static struct clk_factors_config sun4i_pll1_config = {
+@@ -457,6 +458,14 @@ static const struct factors_data sun4i_pll5_data __initconst = {
+       .enable = 31,
+       .table = &sun4i_pll5_config,
+       .getter = sun4i_get_pll5_factors,
++      .name = "pll5",
++};
++
++static const struct factors_data sun4i_pll6_data __initconst = {
++      .enable = 31,
++      .table = &sun4i_pll5_config,
++      .getter = sun4i_get_pll5_factors,
++      .name = "pll6",
+ };
+ 
+ static const struct factors_data sun4i_apb1_data __initconst = {
+@@ -499,14 +508,14 @@ static struct clk * __init sunxi_factors_clk_setup(struct device_node *node,
+              (parents[i] = of_clk_get_parent_name(node, i)) != NULL)
+               i++;
+ 
+-      /* Nodes should be providing the name via clock-output-names
+-       * but originally our dts didn't, and so we used node->name.
+-       * The new, better nodes look like clk@deadbeef, so we pull the
+-       * name just in this case */
+-      if (!strcmp("clk", clk_name)) {
+-              of_property_read_string_index(node, "clock-output-names",
+-                                            0, &clk_name);
+-      }
++      /*
++       * some factor clocks, such as pll5 and pll6, may have multiple
++       * outputs, and have their name designated in factors_data
++       */
++      if (data->name)
++              clk_name = data->name;
++      else
++              of_property_read_string(node, "clock-output-names", &clk_name);
+ 
+       factors = kzalloc(sizeof(struct clk_factors), GFP_KERNEL);
+       if (!factors)
+@@ -838,7 +847,7 @@ static const struct divs_data pll5_divs_data __initconst = {
+ };
+ 
+ static const struct divs_data pll6_divs_data __initconst = {
+-      .factors = &sun4i_pll5_data,
++      .factors = &sun4i_pll6_data,
+       .div = {
+               { .shift = 0, .table = pll6_sata_tbl, .gate = 14 }, /* M, SATA */
+               { .fixed = 2 }, /* P, other */
+-- 
+2.0.3
+