diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 14:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 14:40:58 -0400 |
commit | a6e6d863cf68bba886acfe47dbdc8f245cce588f (patch) | |
tree | cf6a408da597c5e39def6a28c38d117c5899eef8 /include/trace | |
parent | 60b5adffb4f3e4b4c1978959f24e8e531b2ef3cb (diff) | |
parent | 7bc8c4c37aea74332b16ffb5412a8ad355d508ce (diff) |
Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"A small but useful set of regmap updates this time around:
- An abstraction for bitfields within a register map contributed by
Srinivas Kandagatla, allowing drivers to cope more easily when
hardware designers randomly move things about (mainly when talking
to things like system controllers).
- Changes from Lars-Peter Clausen to allow the MMIO regmap to be used
from hard IRQ context.
- Small improvements to the cache infrastructure and performance,
including a default cache sync operation so now all regmaps can
sync easily.
There's also a pinctrl driver making use of the new bitfield API,
merged here for dependency reasons. There will be a simple add/add
conflict with the pinctrl tree as a result."
* tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
pinctrl: st: Remove unnecessary use of of_match_ptr macro
pinctrl: st: fix return value check
pinctrl: st: Add pinctrl and pinconf support.
regmap: debugfs: Suppress cache for partial register files
regmap: Add regmap_field APIs
regmap: core: Cache all registers by default when cache is enabled
regmap: Implemented default cache sync operation
regmap: Make regmap-mmio usable from atomic contexts
regmap: regcache: Fixup locking for custom lock callbacks
regmap: debugfs: Fix return from regmap_debugfs_get_dump_start
regmap: debugfs: Don't mark lockdep as broken due to debugfs write
regmap: rbtree: Use range information to allocate nodes
regmap: rbtree: Factor out node allocation
regmap: Make regmap_check_range_table() a public API
regmap: Add support for discarding parts of the register cache
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/regmap.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h index a43a2f67bd8e..23d561512f64 100644 --- a/include/trace/events/regmap.h +++ b/include/trace/events/regmap.h | |||
@@ -223,6 +223,29 @@ DEFINE_EVENT(regmap_async, regmap_async_complete_done, | |||
223 | 223 | ||
224 | ); | 224 | ); |
225 | 225 | ||
226 | TRACE_EVENT(regcache_drop_region, | ||
227 | |||
228 | TP_PROTO(struct device *dev, unsigned int from, | ||
229 | unsigned int to), | ||
230 | |||
231 | TP_ARGS(dev, from, to), | ||
232 | |||
233 | TP_STRUCT__entry( | ||
234 | __string( name, dev_name(dev) ) | ||
235 | __field( unsigned int, from ) | ||
236 | __field( unsigned int, to ) | ||
237 | ), | ||
238 | |||
239 | TP_fast_assign( | ||
240 | __assign_str(name, dev_name(dev)); | ||
241 | __entry->from = from; | ||
242 | __entry->to = to; | ||
243 | ), | ||
244 | |||
245 | TP_printk("%s %u-%u", __get_str(name), (unsigned int)__entry->from, | ||
246 | (unsigned int)__entry->to) | ||
247 | ); | ||
248 | |||
226 | #endif /* _TRACE_REGMAP_H */ | 249 | #endif /* _TRACE_REGMAP_H */ |
227 | 250 | ||
228 | /* This part must be outside protection */ | 251 | /* This part must be outside protection */ |