Unverified Commit ae2399c4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/topic/noinc' and 'regmap/topic/single-rw' into regmap-next

parents 9ef68841 cdf6b11d 1c96a2f6

drivers/base/regmap/internal.h

+4 −1
Original line number Diff line number Diff line
@@ -94,11 +94,13 @@ struct regmap { 
	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);

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

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

	const struct regmap_access_table *wr_table;

	const struct regmap_access_table *rd_table;

	const struct regmap_access_table *volatile_table;

	const struct regmap_access_table *precious_table;

	const struct regmap_access_table *wr_noinc_table;

	const struct regmap_access_table *rd_noinc_table;



	int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
@@ -149,7 +151,7 @@ struct regmap { 


	/* if set, converts bulk read to single read */

	bool use_single_read;

	/* if set, converts bulk read to single read */

	/* if set, converts bulk write to single write */

	bool use_single_write;

	/* if set, the device supports multi write mode */

	bool can_multi_write;
@@ -183,6 +185,7 @@ bool regmap_writeable(struct regmap *map, unsigned int reg); 
bool regmap_readable(struct regmap *map, unsigned int reg);

bool regmap_volatile(struct regmap *map, unsigned int reg);

bool regmap_precious(struct regmap *map, unsigned int reg);

bool regmap_writeable_noinc(struct regmap *map, unsigned int reg);

bool regmap_readable_noinc(struct regmap *map, unsigned int reg);



int _regmap_write(struct regmap *map, unsigned int reg,

drivers/base/regmap/regmap.c

+79 −2
Original line number Diff line number Diff line
@@ -178,6 +178,17 @@ bool regmap_precious(struct regmap *map, unsigned int reg) 
	return false;

}



bool regmap_writeable_noinc(struct regmap *map, unsigned int reg)

{

	if (map->writeable_noinc_reg)

		return map->writeable_noinc_reg(map->dev, reg);



	if (map->wr_noinc_table)

		return regmap_check_range_table(map, reg, map->wr_noinc_table);



	return true;

}



bool regmap_readable_noinc(struct regmap *map, unsigned int reg)

{

	if (map->readable_noinc_reg)
@@ -772,8 +783,8 @@ struct regmap *__regmap_init(struct device *dev, 
		map->reg_stride_order = ilog2(map->reg_stride);

	else

		map->reg_stride_order = -1;

	map->use_single_read = config->use_single_rw || !bus || !bus->read;

	map->use_single_write = config->use_single_rw || !bus || !bus->write;

	map->use_single_read = config->use_single_read || !bus || !bus->read;

	map->use_single_write = config->use_single_write || !bus || !bus->write;

	map->can_multi_write = config->can_multi_write && bus && bus->write;

	if (bus) {

		map->max_raw_read = bus->max_raw_read;
@@ -787,11 +798,13 @@ struct regmap *__regmap_init(struct device *dev, 
	map->rd_table = config->rd_table;

	map->volatile_table = config->volatile_table;

	map->precious_table = config->precious_table;

	map->wr_noinc_table = config->wr_noinc_table;

	map->rd_noinc_table = config->rd_noinc_table;

	map->writeable_reg = config->writeable_reg;

	map->readable_reg = config->readable_reg;

	map->volatile_reg = config->volatile_reg;

	map->precious_reg = config->precious_reg;

	map->writeable_noinc_reg = config->writeable_noinc_reg;

	map->readable_noinc_reg = config->readable_noinc_reg;

	map->cache_type = config->cache_type;
@@ -1308,6 +1321,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config) 
	map->readable_reg = config->readable_reg;

	map->volatile_reg = config->volatile_reg;

	map->precious_reg = config->precious_reg;

	map->writeable_noinc_reg = config->writeable_noinc_reg;

	map->readable_noinc_reg = config->readable_noinc_reg;

	map->cache_type = config->cache_type;
@@ -1905,6 +1919,69 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, 
}

EXPORT_SYMBOL_GPL(regmap_raw_write);



/**

 * regmap_noinc_write(): Write data from a register without incrementing the

 *			register number

 *

 * @map: Register map to write to

 * @reg: Register to write to

 * @val: Pointer to data buffer

 * @val_len: Length of output buffer in bytes.

 *

 * The regmap API usually assumes that bulk bus write operations will write a

 * range of registers. Some devices have certain registers for which a write

 * operation can write to an internal FIFO.

 *

 * The target register must be volatile but registers after it can be

 * completely unrelated cacheable registers.

 *

 * This will attempt multiple writes as required to write val_len bytes.

 *

 * A value of zero will be returned on success, a negative errno will be

 * returned in error cases.

 */

int regmap_noinc_write(struct regmap *map, unsigned int reg,

		      const void *val, size_t val_len)

{

	size_t write_len;

	int ret;



	if (!map->bus)

		return -EINVAL;

	if (!map->bus->write)

		return -ENOTSUPP;

	if (val_len % map->format.val_bytes)

		return -EINVAL;

	if (!IS_ALIGNED(reg, map->reg_stride))

		return -EINVAL;

	if (val_len == 0)

		return -EINVAL;



	map->lock(map->lock_arg);



	if (!regmap_volatile(map, reg) || !regmap_writeable_noinc(map, reg)) {

		ret = -EINVAL;

		goto out_unlock;

	}



	while (val_len) {

		if (map->max_raw_write && map->max_raw_write < val_len)

			write_len = map->max_raw_write;

		else

			write_len = val_len;

		ret = _regmap_raw_write(map, reg, val, write_len);

		if (ret)

			goto out_unlock;

		val = ((u8 *)val) + write_len;

		val_len -= write_len;

	}



out_unlock:

	map->unlock(map->lock_arg);

	return ret;

}

EXPORT_SYMBOL_GPL(regmap_noinc_write);



/**

 * regmap_field_update_bits_base() - Perform a read/modify/write cycle a

 *                                   register field.

drivers/edac/altera_edac.c

+2 −1
Original line number Diff line number Diff line
@@ -599,7 +599,8 @@ static const struct regmap_config s10_sdram_regmap_cfg = { 
	.volatile_reg = s10_sdram_volatile_reg,

	.reg_read = s10_protected_reg_read,

	.reg_write = s10_protected_reg_write,

	.use_single_rw = true,

	.use_single_read = true,

	.use_single_write = true,

};



static int altr_s10_sdram_probe(struct platform_device *pdev)

drivers/hwmon/lm75.c

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ static const struct regmap_config lm75_regmap_config = { 
	.volatile_reg = lm75_is_volatile_reg,

	.val_format_endian = REGMAP_ENDIAN_BIG,

	.cache_type = REGCACHE_RBTREE,

	.use_single_rw = true,

	.use_single_read = true,

	.use_single_write = true,

};



static void lm75_remove(void *data)

drivers/hwmon/lm95245.c

+2 −1
Original line number Diff line number Diff line
@@ -541,7 +541,8 @@ static const struct regmap_config lm95245_regmap_config = { 
	.writeable_reg = lm95245_is_writeable_reg,

	.volatile_reg = lm95245_is_volatile_reg,

	.cache_type = REGCACHE_RBTREE,

	.use_single_rw = true,

	.use_single_read = true,

	.use_single_write = true,

};



static const u32 lm95245_chip_config[] = {