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

Commit 04bc9ac1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next

parents c435d5b9 a01779f8

drivers/base/regmap/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# subsystems should select the appropriate symbols.



config REGMAP

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

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

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select IRQ_DOMAIN if REGMAP_IRQ
@@ -15,6 +15,9 @@ config REGMAP_I2C 
config REGMAP_SPI

	tristate



config REGMAP_SPMI

	tristate



config REGMAP_MMIO

	tristate

drivers/base/regmap/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o 
obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o

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

drivers/base/regmap/regmap-spmi.c

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

 * Register map access API - SPMI support

 *

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * Based on regmap-i2c.c:

 * Copyright 2011 Wolfson Microelectronics plc

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

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

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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */

#include <linux/regmap.h>

#include <linux/spmi.h>

#include <linux/module.h>

#include <linux/init.h>



static int regmap_spmi_read(void *context,

			    const void *reg, size_t reg_size,

			    void *val, size_t val_size)

{

	BUG_ON(reg_size != 2);

	return spmi_ext_register_readl(context, *(u16 *)reg,

				       val, val_size);

}



static int regmap_spmi_gather_write(void *context,

				    const void *reg, size_t reg_size,

				    const void *val, size_t val_size)

{

	BUG_ON(reg_size != 2);

	return spmi_ext_register_writel(context, *(u16 *)reg, val, val_size);

}



static int regmap_spmi_write(void *context, const void *data,

			     size_t count)

{

	BUG_ON(count < 2);

	return regmap_spmi_gather_write(context, data, 2, data + 2, count - 2);

}



static struct regmap_bus regmap_spmi = {

	.read				= regmap_spmi_read,

	.write				= regmap_spmi_write,

	.gather_write			= regmap_spmi_gather_write,

	.reg_format_endian_default	= REGMAP_ENDIAN_NATIVE,

	.val_format_endian_default	= REGMAP_ENDIAN_NATIVE,

};



/**

 * regmap_init_spmi(): Initialize register map

 *

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

 */

struct regmap *regmap_init_spmi(struct spmi_device *sdev,

				const struct regmap_config *config)

{

	return regmap_init(&sdev->dev, &regmap_spmi, sdev, config);

}

EXPORT_SYMBOL_GPL(regmap_init_spmi);



/**

 * devm_regmap_init_spmi(): Initialise managed register map

 *

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

 */

struct regmap *devm_regmap_init_spmi(struct spmi_device *sdev,

				     const struct regmap_config *config)

{

	return devm_regmap_init(&sdev->dev, &regmap_spmi, sdev, config);

}

EXPORT_SYMBOL_GPL(devm_regmap_init_spmi);



MODULE_LICENSE("GPL");

include/linux/regmap.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct device; 
struct i2c_client;

struct irq_domain;

struct spi_device;

struct spmi_device;

struct regmap;

struct regmap_range_cfg;

struct regmap_field;
@@ -320,6 +321,8 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c, 
			       const struct regmap_config *config);

struct regmap *regmap_init_spi(struct spi_device *dev,

			       const struct regmap_config *config);

struct regmap *regmap_init_spmi(struct spmi_device *dev,

			       const struct regmap_config *config);

struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id,

				    void __iomem *regs,

				    const struct regmap_config *config);
@@ -332,6 +335,8 @@ struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c, 
				    const struct regmap_config *config);

struct regmap *devm_regmap_init_spi(struct spi_device *dev,

				    const struct regmap_config *config);

struct regmap *devm_regmap_init_spmi(struct spmi_device *dev,

				     const struct regmap_config *config);

struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id,

					 void __iomem *regs,

					 const struct regmap_config *config);