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

Commit 88507a2b authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 18a64d84 336fb81b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7596,6 +7596,7 @@ F: fs/reiserfs/ 


REGISTER MAP ABSTRACTION

M:	Mark Brown <broonie@kernel.org>

L:	linux-kernel@vger.kernel.org

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

S:	Supported

F:	drivers/base/regmap/

drivers/base/regmap/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -11,12 +11,15 @@ config REGMAP 


config REGMAP_I2C

	tristate

	depends on I2C



config REGMAP_SPI

	tristate

	depends on SPI



config REGMAP_SPMI

	tristate

	depends on SPMI



config REGMAP_MMIO

	tristate

drivers/base/regmap/internal.h

+4 −2
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ struct regmap_async { 
};



struct regmap {

	union {

		struct mutex mutex;

		spinlock_t spinlock;

	};

	unsigned long spinlock_flags;

	regmap_lock lock;

	regmap_unlock unlock;