Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a31895ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regmap updates from Mark Brown:
 "This is another quiet release for regmap, there's one minor feature
  improvement for the recently added slimbus support and a few minor
  fixes and cleanups"

* tag 'regmap-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: slimbus: allow register offsets up to 16 bits
  regmap: add missing prototype for devm_init_slimbus
  regmap: Skip clk_put for attached clocks when freeing context
  regmap: include <linux/ktime.h> from include/linux/regmap.h
parents cfd12db4 869619e6

drivers/base/regmap/regmap-mmio.c

+2 −1
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static void regmap_mmio_free_context(void *context) 


	if (!IS_ERR(ctx->clk)) {

		clk_unprepare(ctx->clk);

		if (!ctx->attached_clk)

			clk_put(ctx->clk);

	}

	kfree(context);

drivers/base/regmap/regmap-slimbus.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct regmap_bus regmap_slimbus_bus = { 
static const struct regmap_bus *regmap_get_slimbus(struct slim_device *slim,

					const struct regmap_config *config)

{

	if (config->val_bits == 8 && config->reg_bits == 8)

	if (config->val_bits == 8 && config->reg_bits == 16)

		return &regmap_slimbus_bus;



	return ERR_PTR(-ENOTSUPP);

include/linux/regmap.h

+18 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/list.h>

#include <linux/rbtree.h>

#include <linux/ktime.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/bug.h>
@@ -587,7 +588,10 @@ struct regmap *__devm_regmap_init_sdw(struct sdw_slave *sdw, 
				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name);



struct regmap *__devm_regmap_init_slimbus(struct slim_device *slimbus,

				 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.
@@ -906,6 +910,19 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg); 
	__regmap_lockdep_wrapper(__devm_regmap_init_sdw, #config,	\

				sdw, config)



/**

 * devm_regmap_init_slimbus() - Initialise managed register map

 *

 * @slimbus: 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_slimbus(slimbus, config)			\

	__regmap_lockdep_wrapper(__devm_regmap_init_slimbus, #config,	\

				slimbus, 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);