target/linux/sunxi/patches-3.12/113-clk-sunxi-unify-apb1.patch

   1 From 75d3fa72634a4943f0f03146916094b6f4908552 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
   3 Date: Sun, 8 Sep 2013 18:14:52 -0300
   4 Subject: [PATCH] clk: sunxi: unify APB1 clock
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This commit unifies the APB1 mux with the APB1 clock, using the new
  10 factors infrastructure.
  11
  12 Signed-off-by: Emilio López <emilio@elopez.com.ar>
  13 ---
  14  Documentation/devicetree/bindings/clock/sunxi.txt | 1 -
  15  drivers/clk/sunxi/clk-sunxi.c                     | 6 +-----
  16  2 files changed, 1 insertion(+), 6 deletions(-)
  17
  18 diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
  19 index 46d8433..e840cb2 100644
  20 --- a/Documentation/devicetree/bindings/clock/sunxi.txt
  21 +++ b/Documentation/devicetree/bindings/clock/sunxi.txt
  22 @@ -27,7 +27,6 @@ Required properties:
  23         "allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s
  24         "allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20
  25         "allwinner,sun4i-apb1-clk" - for the APB1 clock
  26 -       "allwinner,sun4i-apb1-mux-clk" - for the APB1 clock muxing
  27         "allwinner,sun4i-apb1-gates-clk" - for the APB1 gates on A10
  28         "allwinner,sun5i-a13-apb1-gates-clk" - for the APB1 gates on A13
  29         "allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s
  30 diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
  31 index 06c4f01..0ecaa18 100644
  32 --- a/drivers/clk/sunxi/clk-sunxi.c
  33 +++ b/drivers/clk/sunxi/clk-sunxi.c
  34 @@ -400,6 +400,7 @@ struct factors_data {
  35  };
  36
  37  static const struct factors_data sun4i_apb1_data __initconst = {
  38 +       .mux = 24,
  39         .table = &sun4i_apb1_config,
  40         .getter = sun4i_get_apb1_factors,
  41  };
  42 @@ -511,10 +512,6 @@ struct mux_data {
  43         .shift = 12,
  44  };
  45
  46 -static const struct mux_data sun4i_apb1_mux_data __initconst = {
  47 -       .shift = 24,
  48 -};
  49 -
  50  static void __init sunxi_mux_clk_setup(struct device_node *node,
  51                                        struct mux_data *data)
  52  {
  53 @@ -869,7 +866,6 @@ static void __init sunxi_divs_clk_setup(struct device_node *node,
  54  /* Matches for mux clocks */
  55  static const struct of_device_id clk_mux_match[] __initconst = {
  56         {.compatible = "allwinner,sun4i-cpu-clk", .data = &sun4i_cpu_mux_data,},
  57 -       {.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &sun4i_apb1_mux_data,},
  58         {.compatible = "allwinner,sun6i-a31-ahb1-mux-clk", .data = &sun6i_a31_ahb1_mux_data,},
  59         {}
  60  };
  61 --
  62 1.8.5.1
  63