Merge tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Pull regmap update from Mark Brown:
 "Just one patch for regmap this time around, a change from Steven
  Rostedt to prettify the way we're making the regmap internal header
  available to the trace events (it turns out that the trace subsystem
  doesn't actually need to be in trace/events)"

* tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Move tracing header into drivers/base/regmap

diff --combined drivers/base/regmap/regcache.c
index 87db9893b463ba505acc3c28e253b5a08cf20c90,0deae4fdd762805f6402dc02ea9b85f2ca935cd3..7eb7b3b98794849c6718c068504c7ac1acf3a2c9
--- 1/drivers/base/regmap/regcache.c
--- 2/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@@ -15,8 -15,8 +15,8 @@@
  #include <linux/export.h>
  #include <linux/slab.h>
  #include <linux/sort.h>
- #include <trace/events/regmap.h>
  
+ #include "trace.h"
  #include "internal.h"
  
  static const struct regcache_ops *cache_types[] = {
@@@ -608,8 -608,7 +608,8 @@@ static int regcache_sync_block_single(s
        for (i = start; i < end; i++) {
                regtmp = block_base + (i * map->reg_stride);
  
 -              if (!regcache_reg_present(cache_present, i))
 +              if (!regcache_reg_present(cache_present, i) ||
 +                  !regmap_writeable(map, regtmp))
                        continue;
  
                val = regcache_get_val(map, block, i);
@@@ -678,8 -677,7 +678,8 @@@ static int regcache_sync_block_raw(stru
        for (i = start; i < end; i++) {
                regtmp = block_base + (i * map->reg_stride);
  
 -              if (!regcache_reg_present(cache_present, i)) {
 +              if (!regcache_reg_present(cache_present, i) ||
 +                  !regmap_writeable(map, regtmp)) {
                        ret = regcache_sync_block_raw_flush(map, &data,
                                                            base, regtmp);
                        if (ret != 0)