From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020Ab1GPCtU (ORCPT ); Fri, 15 Jul 2011 22:49:20 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:41612 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753481Ab1GPCsz (ORCPT ); Fri, 15 Jul 2011 22:48:55 -0400 From: Mark Brown To: Greg KH , Grant Likely , Jean Delvare , Ben Dooks Cc: Dimitris Papastamos , Liam Girdwood , Samuel Oritz , linux-kernel@vger.kernel.org, Mark Brown Subject: [PATCH 3/4] regmap: Add SPI bus support Date: Sat, 16 Jul 2011 11:48:39 +0900 Message-Id: <1310784520-8961-3-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1310784520-8961-1-git-send-email-broonie@opensource.wolfsonmicro.com> References: <20110716024817.GC17883@opensource.wolfsonmicro.com> <1310784520-8961-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Mark Brown Acked-by: Liam Girdwood Acked-by: Wolfram Sang --- MAINTAINERS | 1 + drivers/spi/Kconfig | 4 ++ drivers/spi/Makefile | 1 + drivers/spi/spi-regmap.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/regmap.h | 3 ++ 5 files changed, 82 insertions(+), 0 deletions(-) create mode 100644 drivers/spi/spi-regmap.c diff --git a/MAINTAINERS b/MAINTAINERS index 21d7698..dbe1d4f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5319,6 +5319,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git S: Supported F: drivers/base/regmap/ F: drivers/i2c/i2c-regmap.c +F: drivers/spi/spi-regmap.c F: include/linux/regmap.h RFKILL diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index de35c3a..1c689a8 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -43,12 +43,16 @@ config SPI_MASTER # boolean "SPI Master Support" boolean default SPI + select SPI_REGMAP if REGMAP help If your system has an master-capable SPI controller (which provides the clock and chipselect), you can enable that controller and the protocol drivers for the SPI slave chips that are connected. +config SPI_REGMAP + boolean + if SPI_MASTER comment "SPI Master Controller Drivers" diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 0f8c69b..52dcf27 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -7,6 +7,7 @@ ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG # small core, mostly translating board-specific # config declarations into driver model code obj-$(CONFIG_SPI_MASTER) += spi.o +obj-$(CONFIG_SPI_REGMAP) += spi-regmap.o # SPI master controller drivers (bus) obj-$(CONFIG_SPI_ALTERA) += spi_altera.o diff --git a/drivers/spi/spi-regmap.c b/drivers/spi/spi-regmap.c new file mode 100644 index 0000000..b994218 --- /dev/null +++ b/drivers/spi/spi-regmap.c @@ -0,0 +1,73 @@ +/* + * Register map access API - SPI support + * + * Copyright 2011 Wolfson Microelectronics plc + * + * Author: Mark Brown + * + * 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 +#include +#include + +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 + * + * @dev: 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 device *dev, + const struct regmap_config *config) +{ + return regmap_init(dev, ®map_spi, config); +} +EXPORT_SYMBOL_GPL(regmap_init_spi); + diff --git a/include/linux/regmap.h b/include/linux/regmap.h index e509bac..c549632 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -61,6 +61,9 @@ struct regmap *regmap_init(struct device *dev, const struct regmap_config *config); struct regmap *regmap_init_i2c(struct device *dev, const struct regmap_config *config); +struct regmap *regmap_init_spi(struct 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, -- 1.7.5.4