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

Unverified Commit 7c22ce6e authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

regmap: Add SoundWire bus support 



SoundWire bus provides sdw_read() and sdw_write() APIs for Slave
devices to program the registers. Provide support in regmap for
SoundWire bus.

Signed-off-by: default avatarHardik T Shah <hardik.t.shah@intel.com>
Signed-off-by: default avatarSanyog Kale <sanyog.r.kale@intel.com>
Reviewed-by: default avatarPhilippe Ombredanne <pombredanne@nexb.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a4887813

drivers/base/regmap/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -37,3 +37,7 @@ config REGMAP_MMIO 


config REGMAP_IRQ

	bool



config REGMAP_SOUNDWIRE

	tristate

	depends on SOUNDWIRE_BUS

drivers/base/regmap/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o 
obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o

obj-$(CONFIG_REGMAP_IRQ) += regmap-irq.o

obj-$(CONFIG_REGMAP_W1) += regmap-w1.o

obj-$(CONFIG_REGMAP_SOUNDWIRE) += regmap-sdw.o

drivers/base/regmap/regmap-sdw.c

0 → 100644
+88 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright(c) 2015-17 Intel Corporation.



#include <linux/device.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/soundwire/sdw.h>

#include "internal.h"



static int regmap_sdw_write(void *context, unsigned int reg, unsigned int val)

{

	struct device *dev = context;

	struct sdw_slave *slave = dev_to_sdw_dev(dev);



	return sdw_write(slave, reg, val);

}



static int regmap_sdw_read(void *context, unsigned int reg, unsigned int *val)

{

	struct device *dev = context;

	struct sdw_slave *slave = dev_to_sdw_dev(dev);

	int read;



	read = sdw_read(slave, reg);

	if (read < 0)

		return read;



	*val = read;

	return 0;

}



static struct regmap_bus regmap_sdw = {

	.reg_read = regmap_sdw_read,

	.reg_write = regmap_sdw_write,

	.reg_format_endian_default = REGMAP_ENDIAN_LITTLE,

	.val_format_endian_default = REGMAP_ENDIAN_LITTLE,

};



static int regmap_sdw_config_check(const struct regmap_config *config)

{

	/* All register are 8-bits wide as per MIPI Soundwire 1.0 Spec */

	if (config->val_bits != 8)

		return -ENOTSUPP;



	/* Registers are 32 bits wide */

	if (config->reg_bits != 32)

		return -ENOTSUPP;



	if (config->pad_bits != 0)

		return -ENOTSUPP;



	return 0;

}



struct regmap *__regmap_init_sdw(struct sdw_slave *sdw,

				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name)

{

	int ret;



	ret = regmap_sdw_config_check(config);

	if (ret)

		return ERR_PTR(ret);



	return __regmap_init(&sdw->dev, &regmap_sdw,

			&sdw->dev, config, lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(__regmap_init_sdw);



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)

{

	int ret;



	ret = regmap_sdw_config_check(config);

	if (ret)

		return ERR_PTR(ret);



	return __devm_regmap_init(&sdw->dev, &regmap_sdw,

			&sdw->dev, config, lock_key, lock_name);

}

EXPORT_SYMBOL_GPL(__devm_regmap_init_sdw);



MODULE_DESCRIPTION("Regmap SoundWire Module");

MODULE_LICENSE("GPL v2");

include/linux/regmap.h

+37 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct regmap; 
struct regmap_range_cfg;

struct regmap_field;

struct snd_ac97;

struct sdw_slave;



/* An enum of all the supported cache types */

enum regcache_type {
@@ -526,6 +527,10 @@ struct regmap *__regmap_init_ac97(struct snd_ac97 *ac97, 
				  const struct regmap_config *config,

				  struct lock_class_key *lock_key,

				  const char *lock_name);

struct regmap *__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(struct device *dev,

				  const struct regmap_bus *bus,
@@ -563,6 +568,10 @@ struct regmap *__devm_regmap_init_ac97(struct snd_ac97 *ac97, 
				       const struct regmap_config *config,

				       struct lock_class_key *lock_key,

				       const char *lock_name);

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



/*

 * Wrapper for regmap_init macros to include a unique lockdep key and name
@@ -711,6 +720,20 @@ int regmap_attach_dev(struct device *dev, struct regmap *map, 
				ac97, config)

bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);



/**

 * regmap_init_sdw() - Initialise register map

 *

 * @sdw: 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.

 */

#define regmap_init_sdw(sdw, config)					\

	__regmap_lockdep_wrapper(__regmap_init_sdw, #config,		\

				sdw, config)





/**

 * devm_regmap_init() - Initialise managed register map

 *
@@ -841,6 +864,20 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg); 
	__regmap_lockdep_wrapper(__devm_regmap_init_ac97, #config,	\

				ac97, config)



/**

 * devm_regmap_init_sdw() - Initialise managed register map

 *

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

	__regmap_lockdep_wrapper(__devm_regmap_init_sdw, #config,	\

				sdw, config)



void regmap_exit(struct regmap *map);

int regmap_reinit_cache(struct regmap *map,

			const struct regmap_config *config);