| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283 |
- --- a/drivers/base/regmap/Kconfig
- +++ b/drivers/base/regmap/Kconfig
- @@ -3,9 +3,8 @@
- # subsystems should select the appropriate symbols.
-
- config REGMAP
- - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)
- select IRQ_DOMAIN if REGMAP_IRQ
- - bool
- + tristate
-
- config REGCACHE_COMPRESSED
- select LZO_COMPRESS
- @@ -14,18 +13,24 @@ config REGCACHE_COMPRESSED
-
- config REGMAP_I2C
- tristate
- + select REGMAP
- depends on I2C
-
- config REGMAP_SPI
- tristate
- + select REGMAP
- + depends on SPI_MASTER
- depends on SPI
-
- config REGMAP_SPMI
- + select REGMAP
- tristate
- depends on SPMI
-
- config REGMAP_MMIO
- tristate
- + select REGMAP
-
- config REGMAP_IRQ
- + select REGMAP
- bool
- --- a/include/linux/regmap.h
- +++ b/include/linux/regmap.h
- @@ -49,7 +49,7 @@ struct reg_default {
- unsigned int def;
- };
-
- -#ifdef CONFIG_REGMAP
- +#if IS_ENABLED(CONFIG_REGMAP)
-
- enum regmap_endian {
- /* Unspecified -> 0 -> Backwards compatible default */
- --- a/drivers/base/regmap/Makefile
- +++ b/drivers/base/regmap/Makefile
- @@ -1,7 +1,11 @@
- -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
- -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
- -obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
- -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
- +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o
- +ifdef CONFIG_DEBUG_FS
- +regmap-core-objs += regmap-debugfs.o
- +endif
- +ifdef CONFIG_REGCACHE_COMPRESSED
- +regmap-core-objs += regcache-lzo.o
- +endif
- +obj-$(CONFIG_REGMAP) += regmap-core.o
- obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
- obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
- obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o
- --- a/drivers/base/regmap/regmap.c
- +++ b/drivers/base/regmap/regmap.c
- @@ -13,6 +13,7 @@
- #include <linux/device.h>
- #include <linux/slab.h>
- #include <linux/export.h>
- +#include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/err.h>
- #include <linux/of.h>
- @@ -2630,3 +2631,5 @@ static int __init regmap_initcall(void)
- return 0;
- }
- postcore_initcall(regmap_initcall);
- +
- +MODULE_LICENSE("GPL");
|
