target/linux/sunxi/patches-3.13/180-9-clk-sunxi-add-usb-clockreg-reset.patch

   1 From edb7ebba49b6946e80dfac0d13ac15028952aa29 Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Thu, 9 Jan 2014 19:33:04 +0100
   4 Subject: [PATCH] clk: sunxi: Add support for USB clock-register reset bits
   5
   6 The usb-clk register is special in that it not only contains clk gate bits,
   7 but also has a few reset bits. This commit adds support for this by allowing
   8 gates type sunxi clks to also register a reset controller.
   9
  10 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  11 ---
  12  drivers/clk/sunxi/clk-sunxi.c | 71 +++++++++++++++++++++++++++++++++++++++++++
  13  1 file changed, 71 insertions(+)
  14
  15 diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
  16 index 46a38b4..2dbaee7 100644
  17 --- a/drivers/clk/sunxi/clk-sunxi.c
  18 +++ b/drivers/clk/sunxi/clk-sunxi.c
  19 @@ -18,6 +18,7 @@
  20  #include <linux/clkdev.h>
  21  #include <linux/of.h>
  22  #include <linux/of_address.h>
  23 +#include <linux/reset-controller.h>
  24
  25  #include "clk-factors.h"
  26
  27 @@ -852,6 +853,59 @@ static void __init sunxi_divider_clk_setup(struct device_node *node,
  28
  29
  30  /**
  31 + * sunxi_gates_reset... - reset bits in leaf gate clk registers handling
  32 + */
  33 +
  34 +struct gates_reset_data {
  35 +       void __iomem                    *reg;
  36 +       spinlock_t                      *lock;
  37 +       struct reset_controller_dev     rcdev;
  38 +};
  39 +
  40 +static int sunxi_gates_reset_assert(struct reset_controller_dev *rcdev,
  41 +                             unsigned long id)
  42 +{
  43 +       struct gates_reset_data *data = container_of(rcdev,
  44 +                                                    struct gates_reset_data,
  45 +                                                    rcdev);
  46 +       unsigned long flags;
  47 +       u32 reg;
  48 +
  49 +       spin_lock_irqsave(data->lock, flags);
  50 +
  51 +       reg = readl(data->reg);
  52 +       writel(reg & ~BIT(id), data->reg);
  53 +
  54 +       spin_unlock_irqrestore(data->lock, flags);
  55 +
  56 +       return 0;
  57 +}
  58 +
  59 +static int sunxi_gates_reset_deassert(struct reset_controller_dev *rcdev,
  60 +                               unsigned long id)
  61 +{
  62 +       struct gates_reset_data *data = container_of(rcdev,
  63 +                                                    struct gates_reset_data,
  64 +                                                    rcdev);
  65 +       unsigned long flags;
  66 +       u32 reg;
  67 +
  68 +       spin_lock_irqsave(data->lock, flags);
  69 +
  70 +       reg = readl(data->reg);
  71 +       writel(reg | BIT(id), data->reg);
  72 +
  73 +       spin_unlock_irqrestore(data->lock, flags);
  74 +
  75 +       return 0;
  76 +}
  77 +
  78 +static struct reset_control_ops sunxi_gates_reset_ops = {
  79 +       .assert         = sunxi_gates_reset_assert,
  80 +       .deassert       = sunxi_gates_reset_deassert,
  81 +};
  82 +
  83 +/**
  84   * sunxi_gates_clk_setup() - Setup function for leaf gates on clocks
  85   */
  86
  87 @@ -859,6 +913,7 @@ static void __init sunxi_divider_clk_setup(struct device_node *node,
  88
  89  struct gates_data {
  90         DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE);
  91 +       u32 reset_mask;
  92  };
  93
  94  static const struct gates_data sun4i_axi_gates_data __initconst = {
  95 @@ -929,6 +984,7 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
  96                                          struct gates_data *data)
  97  {
  98         struct clk_onecell_data *clk_data;
  99 +       struct gates_reset_data *reset_data;
 100         const char *clk_parent;
 101         const char *clk_name;
 102         void *reg;
 103 @@ -972,6 +1028,21 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
 104         clk_data->clk_num = i;
 105
 106         of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 107 +
 108 +       /* Register a reset controler for gates with reset bits */
 109 +       if (data->reset_mask == 0)
 110 +               return;
 111 +
 112 +       reset_data = kzalloc(sizeof(*reset_data), GFP_KERNEL);
 113 +       if (!reset_data)
 114 +               return;
 115 +
 116 +       reset_data->reg = reg;
 117 +       reset_data->lock = &clk_lock;
 118 +       reset_data->rcdev.nr_resets = __fls(data->reset_mask) + 1;
 119 +       reset_data->rcdev.ops = &sunxi_gates_reset_ops;
 120 +       reset_data->rcdev.of_node = node;
 121 +       reset_controller_register(&reset_data->rcdev);
 122  }
 123
 124
 125 --
 126 1.8.5.5
 127