Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap

* 'for-linus' of git://opensource.wolfsonmicro.com/regmap: (62 commits)
  mfd: Enable rbtree cache for wm831x devices
  regmap: Support some block operations on cached devices
  regmap: Allow caches for devices with no defaults
  regmap: Ensure rbtree syncs registers set to zero properly
  regmap: Allow rbtree to cache zero default values
  regmap: Warn on raw I/O as well as bulk reads that bypass cache
  regmap: Return a sensible error code if we fail to read the cache
  regmap: Use bsearch() to search the register defaults
  regmap: Fix doc comment
  regmap: Optimize the lookup path to use binary search
  regmap: Ensure we scream if we enable cache bypass/only at the same time
  regmap: Implement regcache_cache_bypass helper function
  regmap: Save/restore the bypass state upon syncing
  regmap: Lock the sync path, ensure we use the lockless _regmap_write()
  regmap: Fix apostrophe usage
  regmap: Make _regmap_write() global
  regmap: Fix lock used for regcache_cache_only()
  regmap: Grab the lock in regcache_cache_only()
  regmap: Modify map->cache_bypass directly
  regmap: Fix regcache_sync generic implementation
  ...

1 files changed, 136 insertions, 0 deletions

diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
new file mode 100644
index 000000000000..1e3193b8fcc8
--- /dev/null
+++ b/include/trace/events/regmap.h
@@ -0,0 +1,136 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM regmap
+
+#if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_REGMAP_H
+
+#include <linux/device.h>
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+struct regmap;
+
+/*
+ * Log register events
+ */
+DECLARE_EVENT_CLASS(regmap_reg,
+
+        TP_PROTO(struct device *dev, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(dev, reg, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   val             )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __entry->reg = reg;
+                __entry->val = val;
+        ),
+
+        TP_printk("%s reg=%x val=%x", __get_str(name),
+                  (unsigned int)__entry->reg,
+                  (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(regmap_reg, regmap_reg_write,
+
+        TP_PROTO(struct device *dev, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(dev, reg, val)
+
+);
+
+DEFINE_EVENT(regmap_reg, regmap_reg_read,
+
+        TP_PROTO(struct device *dev, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(dev, reg, val)
+
+);
+
+DECLARE_EVENT_CLASS(regmap_block,
+
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+        TP_ARGS(dev, reg, count),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+                __field(        unsigned int,   reg             )
+                __field(        int,            count           )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __entry->reg = reg;
+                __entry->count = count;
+        ),
+
+        TP_printk("%s reg=%x count=%d", __get_str(name),
+                  (unsigned int)__entry->reg,
+                  (int)__entry->count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_read_start,
+
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+        TP_ARGS(dev, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_read_done,
+
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+        TP_ARGS(dev, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_write_start,
+
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+        TP_ARGS(dev, reg, count)
+);
+
+DEFINE_EVENT(regmap_block, regmap_hw_write_done,
+
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+        TP_ARGS(dev, reg, count)
+);
+
+TRACE_EVENT(regcache_sync,
+
+        TP_PROTO(struct device *dev, const char *type,
+                 const char *status),
+
+        TP_ARGS(dev, type, status),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+                __string(       status,         status          )
+                __string(       type,           type            )
+                __field(        int,            type            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __assign_str(status, status);
+                __assign_str(type, type);
+        ),
+
+        TP_printk("%s type=%s status=%s", __get_str(name),
+                  __get_str(type), __get_str(status))
+);
+
+#endif /* _TRACE_REGMAP_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>