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

Commit a676f083 authored by Mark Brown's avatar Mark Brown
Browse files

regmap: Add SPI bus support 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 9943fa30

drivers/base/regmap/Kconfig

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



config REGMAP

	default y if REGMAP_I2C

	default y if (REGMAP_I2C || REGMAP_SPI)

	bool



config REGMAP_I2C

	tristate



config REGMAP_SPI

	tristate

drivers/base/regmap/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_REGMAP) += regmap.o

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

obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o

drivers/base/regmap/regmap-spi.c

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

 * Register map access API - SPI support

 *

 * 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 as

 * published by the Free Software Foundation.

 */



#include <linux/regmap.h>

#include <linux/spi/spi.h>

#include <linux/init.h>



static int regmap_spi_write(struct device *dev, const void *data, size_t count)

{

	struct spi_device *spi = to_spi_device(dev);



	return spi_write(spi, data, count);

}



static int regmap_spi_gather_write(struct device *dev,

				   const void *reg, size_t reg_len,

				   const void *val, size_t val_len)

{

	struct spi_device *spi = to_spi_device(dev);

	struct spi_message m;

	struct spi_transfer t[2] = { { .tx_buf = reg, .len = reg_len, },

				     { .tx_buf = val, .len = val_len, }, };



	spi_message_init(&m);

	spi_message_add_tail(&t[0], &m);

	spi_message_add_tail(&t[1], &m);



	return spi_sync(spi, &m);

}



static int regmap_spi_read(struct device *dev,

			   const void *reg, size_t reg_size,

			   void *val, size_t val_size)

{

	struct spi_device *spi = to_spi_device(dev);



	return spi_write_then_read(spi, reg, reg_size, val, val_size);

}



static struct regmap_bus regmap_spi = {

	.type = &spi_bus_type,

	.write = regmap_spi_write,

	.gather_write = regmap_spi_gather_write,

	.read = regmap_spi_read,

	.owner = THIS_MODULE,

	.read_flag_mask = 0x80,

};



/**

 * regmap_init_spi(): Initialise register map

 *

 * @spi: 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_spi(struct spi_device *spi,

			       const struct regmap_config *config)

{

	return regmap_init(&spi->dev, &regmap_spi, config);

}

EXPORT_SYMBOL_GPL(regmap_init_spi);

include/linux/regmap.h

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>



struct i2c_client;

struct spi_device;



struct regmap_config {

	int reg_bits;
@@ -63,6 +64,9 @@ struct regmap *regmap_init(struct device *dev, 
			   const struct regmap_config *config);

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);



void regmap_exit(struct regmap *map);

int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);

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