mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 09:56:00 +00:00
regmap: Updates for v3.20
A very quiet release for regmap this time around: - Fix an endianness issue for I2C devices connected via SMBus where we were getting two layers both trying to do endianness handling. - Use a union to reduce the size of the regmap struct. - A couple of smaller fixes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJU2GDZAAoJECTWi3JdVIfQId0H/3dsylUYN0uYzDA1fKy0At5E 7dmKbWkp1Ab62wQYC59a5KH1OgdZe/mWf3x9kxEZlqcmS15OPEuqs7g+BNoAi3Fj ysmIbKRpJIoZs+XrgBGPCunchLq6rOmtcVaQEUQZZnKg31kQCBhMoPip1QCT5Qn7 UGoYgwP3O7TPVxJDZXA3gCGZER/Jr4Bhrkb3qJKzofpoRvzqSeqKuDJdwOTy7dzx w1xMQWUlrPuCKHe3HA5uD4ZPHtNsN23APd7spmu/HhqXtN1nCIxh5/0z4qKVGvLO h3xSCTtOTJZI2kYEFDn3/6DFWQokp90fwBKaG8EtixtD/8M9OQA7tuW1mtsUgOE= =nPfp -----END PGP SIGNATURE----- Merge tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap Pull regmap updates from Mark Brown: "A very quiet release for regmap this time around: - Fix an endianness issue for I2C devices connected via SMBus where we were getting two layers both trying to do endianness handling. - Use a union to reduce the size of the regmap struct. - A couple of smaller fixes" * tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Fix i2c word access when using SMBus access functions regmap: Export regmap_get_val_endian regmap: ac97: Clean up indentation regmap: correct the description of structure element in reg_field regmap: Move spinlock_flags into the union
This commit is contained in:
commit
f381f90695
@ -51,9 +51,11 @@ struct regmap_async {
|
||||
struct regmap {
|
||||
union {
|
||||
struct mutex mutex;
|
||||
spinlock_t spinlock;
|
||||
struct {
|
||||
spinlock_t spinlock;
|
||||
unsigned long spinlock_flags;
|
||||
};
|
||||
};
|
||||
unsigned long spinlock_flags;
|
||||
regmap_lock lock;
|
||||
regmap_unlock unlock;
|
||||
void *lock_arg; /* This is passed to lock/unlock functions */
|
||||
@ -233,6 +235,10 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
|
||||
|
||||
void regmap_async_complete_cb(struct regmap_async *async, int ret);
|
||||
|
||||
enum regmap_endian regmap_get_val_endian(struct device *dev,
|
||||
const struct regmap_bus *bus,
|
||||
const struct regmap_config *config);
|
||||
|
||||
extern struct regcache_ops regcache_rbtree_ops;
|
||||
extern struct regcache_ops regcache_lzo_ops;
|
||||
extern struct regcache_ops regcache_flat_ops;
|
||||
|
@ -74,8 +74,8 @@ static int regmap_ac97_reg_write(void *context, unsigned int reg,
|
||||
}
|
||||
|
||||
static const struct regmap_bus ac97_regmap_bus = {
|
||||
.reg_write = regmap_ac97_reg_write,
|
||||
.reg_read = regmap_ac97_reg_read,
|
||||
.reg_write = regmap_ac97_reg_write,
|
||||
.reg_read = regmap_ac97_reg_read,
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
static int regmap_smbus_byte_reg_read(void *context, unsigned int reg,
|
||||
unsigned int *val)
|
||||
@ -87,6 +88,42 @@ static struct regmap_bus regmap_smbus_word = {
|
||||
.reg_read = regmap_smbus_word_reg_read,
|
||||
};
|
||||
|
||||
static int regmap_smbus_word_read_swapped(void *context, unsigned int reg,
|
||||
unsigned int *val)
|
||||
{
|
||||
struct device *dev = context;
|
||||
struct i2c_client *i2c = to_i2c_client(dev);
|
||||
int ret;
|
||||
|
||||
if (reg > 0xff)
|
||||
return -EINVAL;
|
||||
|
||||
ret = i2c_smbus_read_word_swapped(i2c, reg);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
*val = ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int regmap_smbus_word_write_swapped(void *context, unsigned int reg,
|
||||
unsigned int val)
|
||||
{
|
||||
struct device *dev = context;
|
||||
struct i2c_client *i2c = to_i2c_client(dev);
|
||||
|
||||
if (val > 0xffff || reg > 0xff)
|
||||
return -EINVAL;
|
||||
|
||||
return i2c_smbus_write_word_swapped(i2c, reg, val);
|
||||
}
|
||||
|
||||
static struct regmap_bus regmap_smbus_word_swapped = {
|
||||
.reg_write = regmap_smbus_word_write_swapped,
|
||||
.reg_read = regmap_smbus_word_read_swapped,
|
||||
};
|
||||
|
||||
static int regmap_i2c_write(void *context, const void *data, size_t count)
|
||||
{
|
||||
struct device *dev = context;
|
||||
@ -180,7 +217,14 @@ static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c,
|
||||
else if (config->val_bits == 16 && config->reg_bits == 8 &&
|
||||
i2c_check_functionality(i2c->adapter,
|
||||
I2C_FUNC_SMBUS_WORD_DATA))
|
||||
return ®map_smbus_word;
|
||||
switch (regmap_get_val_endian(&i2c->dev, NULL, config)) {
|
||||
case REGMAP_ENDIAN_LITTLE:
|
||||
return ®map_smbus_word;
|
||||
case REGMAP_ENDIAN_BIG:
|
||||
return ®map_smbus_word_swapped;
|
||||
default: /* everything else is not supported */
|
||||
break;
|
||||
}
|
||||
else if (config->val_bits == 8 && config->reg_bits == 8 &&
|
||||
i2c_check_functionality(i2c->adapter,
|
||||
I2C_FUNC_SMBUS_BYTE_DATA))
|
||||
|
@ -473,9 +473,9 @@ static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
|
||||
return REGMAP_ENDIAN_BIG;
|
||||
}
|
||||
|
||||
static enum regmap_endian regmap_get_val_endian(struct device *dev,
|
||||
const struct regmap_bus *bus,
|
||||
const struct regmap_config *config)
|
||||
enum regmap_endian regmap_get_val_endian(struct device *dev,
|
||||
const struct regmap_bus *bus,
|
||||
const struct regmap_config *config)
|
||||
{
|
||||
struct device_node *np;
|
||||
enum regmap_endian endian;
|
||||
@ -513,6 +513,7 @@ static enum regmap_endian regmap_get_val_endian(struct device *dev,
|
||||
/* Use this if no other value was found */
|
||||
return REGMAP_ENDIAN_BIG;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(regmap_get_val_endian);
|
||||
|
||||
/**
|
||||
* regmap_init(): Initialise register map
|
||||
|
@ -468,7 +468,7 @@ bool regmap_reg_in_ranges(unsigned int reg,
|
||||
*
|
||||
* @reg: Offset of the register within the regmap bank
|
||||
* @lsb: lsb of the register field.
|
||||
* @reg: msb of the register field.
|
||||
* @msb: msb of the register field.
|
||||
* @id_size: port size if it has some ports
|
||||
* @id_offset: address offset for each ports
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user