Commit 2a40f942 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and... 

Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next
parents 6f7da290 c13be1d9 a71411db f458e610

drivers/base/regmap/Kconfig

+9 −2
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 
# subsystems should select the appropriate symbols.



config REGMAP

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGCACHE_COMPRESSED

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGMAP_AC97
@@ -24,6 +27,10 @@ config REGMAP_SPMI 
	tristate

	depends on SPMI



config REGMAP_W1

	tristate

	depends on W1



config REGMAP_MMIO

	tristate

drivers/base/regmap/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
CFLAGS_regmap.o := -I$(src)



obj-$(CONFIG_REGMAP) += regmap.o regcache.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o

obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o

obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o

obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
@@ -10,3 +11,4 @@ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o 
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

drivers/base/regmap/regcache.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 


static const struct regcache_ops *cache_types[] = {

	&regcache_rbtree_ops,

#if IS_ENABLED(CONFIG_REGCACHE_COMPRESSED)

	&regcache_lzo_ops,

#endif

	&regcache_flat_ops,

};

drivers/base/regmap/regmap-irq.c

+26 −16
Original line number Diff line number Diff line
@@ -60,6 +60,16 @@ static void regmap_irq_lock(struct irq_data *data) 
	mutex_lock(&d->lock);

}



static int regmap_irq_update_bits(struct regmap_irq_chip_data *d,

				  unsigned int reg, unsigned int mask,

				  unsigned int val)

{

	if (d->chip->mask_writeonly)

		return regmap_write_bits(d->map, reg, mask, val);

	else

		return regmap_update_bits(d->map, reg, mask, val);

}



static void regmap_irq_sync_unlock(struct irq_data *data)

{

	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
@@ -84,11 +94,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
		reg = d->chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

		if (d->chip->mask_invert) {

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_irq_update_bits(d, reg,

					 d->mask_buf_def[i], ~d->mask_buf[i]);

		} else if (d->chip->unmask_base) {

			/* set mask with mask_base register */

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_irq_update_bits(d, reg,

					d->mask_buf_def[i], ~d->mask_buf[i]);

			if (ret < 0)

				dev_err(d->map->dev,
@@ -97,12 +107,12 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
			unmask_offset = d->chip->unmask_base -

							d->chip->mask_base;

			/* clear mask with unmask_base register */

			ret = regmap_update_bits(d->map,

			ret = regmap_irq_update_bits(d,

					reg + unmask_offset,

					d->mask_buf_def[i],

					d->mask_buf[i]);

		} else {

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_irq_update_bits(d, reg,

					 d->mask_buf_def[i], d->mask_buf[i]);

		}

		if (ret != 0)
@@ -113,11 +123,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
			(i * map->reg_stride * d->irq_reg_stride);

		if (d->wake_buf) {

			if (d->chip->wake_invert)

				ret = regmap_update_bits(d->map, reg,

				ret = regmap_irq_update_bits(d, reg,

							 d->mask_buf_def[i],

							 ~d->wake_buf[i]);

			else

				ret = regmap_update_bits(d->map, reg,

				ret = regmap_irq_update_bits(d, reg,

							 d->mask_buf_def[i],

							 d->wake_buf[i]);

			if (ret != 0)
@@ -153,10 +163,10 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
		reg = d->chip->type_base +

			(i * map->reg_stride * d->type_reg_stride);

		if (d->chip->type_invert)

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_irq_update_bits(d, reg,

				d->type_buf_def[i], ~d->type_buf[i]);

		else

			ret = regmap_update_bits(d->map, reg,

			ret = regmap_irq_update_bits(d, reg,

				d->type_buf_def[i], d->type_buf[i]);

		if (ret != 0)

			dev_err(d->map->dev, "Failed to sync type in %x\n",
@@ -394,7 +404,7 @@ static int regmap_irq_map(struct irq_domain *h, unsigned int virq, 


static const struct irq_domain_ops regmap_domain_ops = {

	.map	= regmap_irq_map,

	.xlate	= irq_domain_xlate_twocell,

	.xlate	= irq_domain_xlate_onetwocell,

};



/**
@@ -519,17 +529,17 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
		reg = chip->mask_base +

			(i * map->reg_stride * d->irq_reg_stride);

		if (chip->mask_invert)

			ret = regmap_update_bits(map, reg,

			ret = regmap_irq_update_bits(d, reg,

					 d->mask_buf[i], ~d->mask_buf[i]);

		else if (d->chip->unmask_base) {

			unmask_offset = d->chip->unmask_base -

					d->chip->mask_base;

			ret = regmap_update_bits(d->map,

			ret = regmap_irq_update_bits(d,

					reg + unmask_offset,

					d->mask_buf[i],

					d->mask_buf[i]);

		} else

			ret = regmap_update_bits(map, reg,

			ret = regmap_irq_update_bits(d, reg,

					 d->mask_buf[i], d->mask_buf[i]);

		if (ret != 0) {

			dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
@@ -575,11 +585,11 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
				(i * map->reg_stride * d->irq_reg_stride);



			if (chip->wake_invert)

				ret = regmap_update_bits(map, reg,

				ret = regmap_irq_update_bits(d, reg,

							 d->mask_buf_def[i],

							 0);

			else

				ret = regmap_update_bits(map, reg,

				ret = regmap_irq_update_bits(d, reg,

							 d->mask_buf_def[i],

							 d->wake_buf[i]);

			if (ret != 0) {
@@ -603,10 +613,10 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
			reg = chip->type_base +

				(i * map->reg_stride * d->type_reg_stride);

			if (chip->type_invert)

				ret = regmap_update_bits(map, reg,

				ret = regmap_irq_update_bits(d, reg,

					d->type_buf_def[i], 0xFF);

			else

				ret = regmap_update_bits(map, reg,

				ret = regmap_irq_update_bits(d, reg,

					d->type_buf_def[i], 0x0);

			if (ret != 0) {

				dev_err(map->dev,

drivers/base/regmap/regmap-w1.c

0 → 100644
+245 −0
Original line number Diff line number Diff line 
/*

 * Register map access API - W1 (1-Wire) support

 *

 * Copyright (C) 2017 OAO Radioavionica

 * Author: Alex A. Mihaylov <minimumlaw@rambler.ru>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation

 */



#include <linux/regmap.h>

#include <linux/module.h>

#include "../../w1/w1.h"



#include "internal.h"



#define W1_CMD_READ_DATA	0x69

#define W1_CMD_WRITE_DATA	0x6C



/*

 * 1-Wire slaves registers with addess 8 bit and data 8 bit

 */



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

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 255)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_READ_DATA);

		w1_write_8(sl->master, reg);

		*val = w1_read_8(sl->master);

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



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

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 255)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_WRITE_DATA);

		w1_write_8(sl->master, reg);

		w1_write_8(sl->master, val);

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



/*

 * 1-Wire slaves registers with addess 8 bit and data 16 bit

 */



static int w1_reg_a8_v16_read(void *context, unsigned int reg,

				unsigned int *val)

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 255)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_READ_DATA);

		w1_write_8(sl->master, reg);

		*val = w1_read_8(sl->master);

		*val |= w1_read_8(sl->master)<<8;

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



static int w1_reg_a8_v16_write(void *context, unsigned int reg,

				unsigned int val)

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 255)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_WRITE_DATA);

		w1_write_8(sl->master, reg);

		w1_write_8(sl->master, val & 0x00FF);

		w1_write_8(sl->master, val>>8 & 0x00FF);

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



/*

 * 1-Wire slaves registers with addess 16 bit and data 16 bit

 */



static int w1_reg_a16_v16_read(void *context, unsigned int reg,

				unsigned int *val)

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 65535)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_READ_DATA);

		w1_write_8(sl->master, reg & 0x00FF);

		w1_write_8(sl->master, reg>>8 & 0x00FF);

		*val = w1_read_8(sl->master);

		*val |= w1_read_8(sl->master)<<8;

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



static int w1_reg_a16_v16_write(void *context, unsigned int reg,

				unsigned int val)

{

	struct device *dev = context;

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);

	int ret = 0;



	if (reg > 65535)

		return -EINVAL;



	mutex_lock(&sl->master->bus_mutex);

	if (!w1_reset_select_slave(sl)) {

		w1_write_8(sl->master, W1_CMD_WRITE_DATA);

		w1_write_8(sl->master, reg & 0x00FF);

		w1_write_8(sl->master, reg>>8 & 0x00FF);

		w1_write_8(sl->master, val & 0x00FF);

		w1_write_8(sl->master, val>>8 & 0x00FF);

	} else {

		ret = -ENODEV;

	}

	mutex_unlock(&sl->master->bus_mutex);



	return ret;

}



/*

 * Various types of supported bus addressing

 */



static struct regmap_bus regmap_w1_bus_a8_v8 = {

	.reg_read = w1_reg_a8_v8_read,

	.reg_write = w1_reg_a8_v8_write,

};



static struct regmap_bus regmap_w1_bus_a8_v16 = {

	.reg_read = w1_reg_a8_v16_read,

	.reg_write = w1_reg_a8_v16_write,

};



static struct regmap_bus regmap_w1_bus_a16_v16 = {

	.reg_read = w1_reg_a16_v16_read,

	.reg_write = w1_reg_a16_v16_write,

};



static const struct regmap_bus *regmap_get_w1_bus(struct device *w1_dev,

					const struct regmap_config *config)

{

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

		return &regmap_w1_bus_a8_v8;



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

		return &regmap_w1_bus_a8_v16;



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

		return &regmap_w1_bus_a16_v16;



	return ERR_PTR(-ENOTSUPP);

}



struct regmap *__regmap_init_w1(struct device *w1_dev,

				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name)

{



	const struct regmap_bus *bus = regmap_get_w1_bus(w1_dev, config);



	if (IS_ERR(bus))

		return ERR_CAST(bus);



	return __regmap_init(w1_dev, bus, w1_dev, config,

			 lock_key, lock_name);



	return NULL;

}

EXPORT_SYMBOL_GPL(__regmap_init_w1);



struct regmap *__devm_regmap_init_w1(struct device *w1_dev,

				 const struct regmap_config *config,

				 struct lock_class_key *lock_key,

				 const char *lock_name)

{



	const struct regmap_bus *bus = regmap_get_w1_bus(w1_dev, config);



	if (IS_ERR(bus))

		return ERR_CAST(bus);



	return __devm_regmap_init(w1_dev, bus, w1_dev, config,

				 lock_key, lock_name);



	return NULL;

}

EXPORT_SYMBOL_GPL(__devm_regmap_init_w1);



MODULE_LICENSE("GPL");