Merge remote-tracking branch 'regmap/topic/cache' into regmap-next

2 files changed, 35 insertions, 0 deletions

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 02d84e24b7c2..d6f3221e29d4 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -394,10 +394,15 @@ bool regmap_can_raw_write(struct regmap *map);
 int regcache_sync(struct regmap *map);
 int regcache_sync_region(struct regmap *map, unsigned int min,
                          unsigned int max);
+int regcache_drop_region(struct regmap *map, unsigned int min,
+                         unsigned int max);
 void regcache_cache_only(struct regmap *map, bool enable);
 void regcache_cache_bypass(struct regmap *map, bool enable);
 void regcache_mark_dirty(struct regmap *map);
 
+bool regmap_check_range_table(struct regmap *map, unsigned int reg,
+                              const struct regmap_access_table *table);
+
 int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
                           int num_regs);
 
@@ -562,6 +567,13 @@ static inline int regcache_sync_region(struct regmap *map, unsigned int min,
         return -EINVAL;
 }
 
+static inline int regcache_drop_region(struct regmap *map, unsigned int min,
+                                       unsigned int max)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
+
 static inline void regcache_cache_only(struct regmap *map, bool enable)
 {
         WARN_ONCE(1, "regmap API is disabled");
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,
 
 );
 
+TRACE_EVENT(regcache_drop_region,
+
+        TP_PROTO(struct device *dev, unsigned int from,
+                 unsigned int to),
+
+        TP_ARGS(dev, from, to),
+
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+                __field(        unsigned int,   from            )
+                __field(        unsigned int,   to              )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+                __entry->from = from;
+                __entry->to = to;
+        ),
+
+        TP_printk("%s %u-%u", __get_str(name), (unsigned int)__entry->from,
+                  (unsigned int)__entry->to)
+);
+
 #endif /* _TRACE_REGMAP_H */
 
 /* This part must be outside protection */