diff options
| author | Mark Brown <broonie@kernel.org> | 2017-06-06 20:10:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-06 20:10:47 +0100 |
| commit | c13be1d942c1e9c2250370f4dfc46031ade0802a (patch) | |
| tree | 14b133ac083f5b4f6015c28615553cd78dd4f6fa /drivers/base/regmap | |
| parent | cc5d0db390b0ff0f5da95b643a2b070da15a9c3e (diff) | |
| parent | 34a730aa74c7c743f4ca9635e0d0b2479d6ed53c (diff) | |
| download | linux-c13be1d942c1e9c2250370f4dfc46031ade0802a.tar.gz | |
Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-1wire
Diffstat (limited to 'drivers/base/regmap')
| -rw-r--r-- | drivers/base/regmap/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/base/regmap/Makefile | 3 | ||||
| -rw-r--r-- | drivers/base/regmap/regcache.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index 413af5f94058..073c0b77e5b3 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -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 diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile index 17741ae14ef4..0cf4abc8fbf1 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -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 diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index b0a0dcf32fb7..f3a435ee5fe8 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -21,7 +21,9 @@ static const struct regcache_ops *cache_types[] = { ®cache_rbtree_ops, +#if IS_ENABLED(CONFIG_REGCHACHE_COMPRESSED) ®cache_lzo_ops, +#endif ®cache_flat_ops, }; |