Commit f5fc8790 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regulator: Convert tps65023 to use regmap API
  regmap: Add SPI bus support
  regmap: Add I2C bus support
  regmap: Add generic non-memory mapped register access API
parents d4e06701 90923351

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -5327,6 +5327,13 @@ L: reiserfs-devel@vger.kernel.org 
S:	Supported

F:	fs/reiserfs/



REGISTER MAP ABSTRACTION

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

S:	Supported

F:	drivers/base/regmap/

F:	include/linux/regmap.h



RFKILL

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

drivers/base/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -168,4 +168,6 @@ config SYS_HYPERVISOR 
	bool

	default n



source "drivers/base/regmap/Kconfig"



endmenu

drivers/base/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ ifeq ($(CONFIG_SYSFS),y) 
obj-$(CONFIG_MODULES)	+= module.o

endif

obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o

obj-$(CONFIG_REGMAP)	+= regmap/



ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG

drivers/base/regmap/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# Generic register map support.  There are no user servicable options here,

# this is an API intended to be used by other kernel subsystems.  These

# subsystems should select the appropriate symbols.



config REGMAP

	default y if (REGMAP_I2C || REGMAP_SPI)

	bool



config REGMAP_I2C

	tristate



config REGMAP_SPI

	tristate

drivers/base/regmap/Makefile

0 → 100644
+3 −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

CRA Git | Maintained and supported by SUSTech CRA and CCSE