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

Commit 555fedac authored by Mark Brown's avatar Mark Brown
Browse files

Merge branches 'regmap-linus' and 'regmap-interface' into regmap-next

parents 2547e201 40c5cc26 18694886

drivers/base/regmap/regmap.c

+10 −1
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ struct regmap { 
	void *work_buf;     /* Scratch buffer used to format I/O */

	struct regmap_format format;  /* Buffer format */

	const struct regmap_bus *bus;



	unsigned int max_register;

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

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

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

};



static void regmap_format_4_12_write(struct regmap *map,
@@ -116,6 +121,10 @@ struct regmap *regmap_init(struct device *dev, 
	map->format.val_bytes = config->val_bits / 8;

	map->dev = dev;

	map->bus = bus;

	map->max_register = config->max_register;

	map->writeable_reg = config->writeable_reg;

	map->readable_reg = config->readable_reg;

	map->volatile_reg = config->volatile_reg;



	switch (config->reg_bits) {

	case 4:
@@ -323,7 +332,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val, 
		u8[0] |= map->bus->read_flag_mask;



	ret = map->bus->read(map->dev, map->work_buf, map->format.reg_bytes,

			     val, map->format.val_bytes);

			     val, val_len);

	if (ret != 0)

		return ret;

include/linux/regmap.h

+23 −0
Original line number Diff line number Diff line
@@ -20,9 +20,32 @@ 
struct i2c_client;

struct spi_device;



/**

 * Configuration for the register map of a device.

 *

 * @reg_bits: Number of bits in a register address, mandatory.

 * @val_bits: Number of bits in a register value, mandatory.

 *

 * @max_register: Optional, specifies the maximum valid register index.

 * @writeable_register: Optional callback returning true if the register

 *                      can be written to.

 * @readable_register: Optional callback returning true if the register

 *                     can be read from.

 * @volatile_register: Optional callback returning true if the register

 *                     value can't be cached.

 * @precious_register: Optional callback returning true if the rgister

 *                     should not be read outside of a call from the driver

 *                     (eg, a clear on read interrupt status register).

 */

struct regmap_config {

	int reg_bits;

	int val_bits;



	unsigned int max_register;

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

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

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

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

};



typedef int (*regmap_hw_write)(struct device *dev, const void *data,