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

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

Merge branch 'topic/lzo' of... 

Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-1wire
parents cc5d0db3 34a730aa

drivers/base/regmap/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -4,9 +4,12 @@ 


config REGMAP

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

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGCACHE_COMPRESSED

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGMAP_AC97

drivers/base/regmap/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
CFLAGS_regmap.o := -I$(src)



obj-$(CONFIG_REGMAP) += regmap.o regcache.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o

obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o

obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o

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

drivers/base/regmap/regcache.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 


static const struct regcache_ops *cache_types[] = {

	&regcache_rbtree_ops,

#if IS_ENABLED(CONFIG_REGCHACHE_COMPRESSED)

	&regcache_lzo_ops,

#endif

	&regcache_flat_ops,

};