mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 00:59:06 +00:00
Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-1wire
This commit is contained in:
commit
c13be1d942
3 changed files with 8 additions and 2 deletions
|
@ -4,9 +4,12 @@
|
||||||
|
|
||||||
config REGMAP
|
config REGMAP
|
||||||
default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
|
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_COMPRESS
|
||||||
select LZO_DECOMPRESS
|
select LZO_DECOMPRESS
|
||||||
select IRQ_DOMAIN if REGMAP_IRQ
|
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config REGMAP_AC97
|
config REGMAP_AC97
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
CFLAGS_regmap.o := -I$(src)
|
CFLAGS_regmap.o := -I$(src)
|
||||||
|
|
||||||
obj-$(CONFIG_REGMAP) += regmap.o regcache.o
|
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_DEBUG_FS) += regmap-debugfs.o
|
||||||
obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
|
obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
|
||||||
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
||||||
|
|
|
@ -21,7 +21,9 @@
|
||||||
|
|
||||||
static const struct regcache_ops *cache_types[] = {
|
static const struct regcache_ops *cache_types[] = {
|
||||||
®cache_rbtree_ops,
|
®cache_rbtree_ops,
|
||||||
|
#if IS_ENABLED(CONFIG_REGCHACHE_COMPRESSED)
|
||||||
®cache_lzo_ops,
|
®cache_lzo_ops,
|
||||||
|
#endif
|
||||||
®cache_flat_ops,
|
®cache_flat_ops,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue