Merge branch 'regmap-5.3' into regmap-next

diff --combined include/linux/regmap.h
index d3dea823af8e5059b7ee6801de1b051005e70ce5,f65984d98b07929b947ba94d0f7dc51ae30cfffa..38e1369e8bd0960c929a5aa4ecb588168c7cfba9
--- 1/include/linux/regmap.h
--- 2/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0-only */
  #ifndef __LINUX_REGMAP_H
  #define __LINUX_REGMAP_H
  
@@@ -8,6 -7,10 +8,6 @@@
   * Copyright 2011 Wolfson Microelectronics plc
   *
   * Author: Mark Brown <[email protected]>
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
   */
  
  #include <linux/list.h>
@@@ -22,6 -25,7 +22,7 @@@ struct module
  struct clk;
  struct device;
  struct i2c_client;
+ struct i3c_device;
  struct irq_domain;
  struct slim_device;
  struct spi_device;
@@@ -621,6 -625,10 +622,10 @@@ struct regmap *__devm_regmap_init_slimb
                                 const struct regmap_config *config,
                                 struct lock_class_key *lock_key,
                                 const char *lock_name);
+ struct regmap *__devm_regmap_init_i3c(struct i3c_device *i3c,
+                                const struct regmap_config *config,
+                                struct lock_class_key *lock_key,
+                                const char *lock_name);
  /*
   * Wrapper for regmap_init macros to include a unique lockdep key and name
   * for each call. No-op if CONFIG_LOCKDEP is not set.
@@@ -979,6 -987,21 +984,21 @@@ bool regmap_ac97_default_volatile(struc
  #define devm_regmap_init_slimbus(slimbus, config)                     \
        __regmap_lockdep_wrapper(__devm_regmap_init_slimbus, #config,   \
                                slimbus, config)
+ 
+ /**
+  * devm_regmap_init_i3c() - Initialise managed register map
+  *
+  * @i3c: Device that will be interacted with
+  * @config: Configuration for register map
+  *
+  * The return value will be an ERR_PTR() on error or a valid pointer
+  * to a struct regmap.  The regmap will be automatically freed by the
+  * device management code.
+  */
+ #define devm_regmap_init_i3c(i3c, config)                             \
+       __regmap_lockdep_wrapper(__devm_regmap_init_i3c, #config,       \
+                               i3c, config)
+ 
  int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk);
  void regmap_mmio_detach_clk(struct regmap *map);
  void regmap_exit(struct regmap *map);