1 From 811d9e2268a62b830cfe93cd8bc929afcb8b198b Mon Sep 17 00:00:00 2001
2 From: Felix Fietkau <nbd@nbd.name>
3 Date: Sat, 15 Jul 2017 21:12:38 +0200
4 Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules
6 lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998
7 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 drivers/base/regmap/Kconfig | 15 ++++++++++-----
10 drivers/base/regmap/Makefile | 12 ++++++++----
11 drivers/base/regmap/regmap.c | 3 +++
12 include/linux/regmap.h | 2 +-
13 4 files changed, 22 insertions(+), 10 deletions(-)
15 --- a/drivers/base/regmap/Kconfig
16 +++ b/drivers/base/regmap/Kconfig
18 # subsystems should select the appropriate symbols.
21 - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ || REGMAP_SOUNDWIRE || REGMAP_SOUNDWIRE_MBQ || REGMAP_SCCB || REGMAP_I3C || REGMAP_SPI_AVMM || REGMAP_MDIO)
22 select IRQ_DOMAIN if REGMAP_IRQ
23 select MDIO_BUS if REGMAP_MDIO
27 config REGCACHE_COMPRESSED
29 @@ -15,53 +14,67 @@ config REGCACHE_COMPRESSED
73 config REGMAP_SOUNDWIRE
78 config REGMAP_SOUNDWIRE_MBQ
93 config REGMAP_SPI_AVMM
97 --- a/drivers/base/regmap/Makefile
98 +++ b/drivers/base/regmap/Makefile
100 # For include/trace/define_trace.h to include trace.h
101 CFLAGS_regmap.o := -I$(src)
103 -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
104 -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
105 -obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
106 -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
107 +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o
108 +ifdef CONFIG_DEBUG_FS
109 +regmap-core-objs += regmap-debugfs.o
111 +ifdef CONFIG_REGCACHE_COMPRESSED
112 +regmap-core-objs += regcache-lzo.o
114 +obj-$(CONFIG_REGMAP) += regmap-core.o
115 obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
116 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
117 obj-$(CONFIG_REGMAP_SLIMBUS) += regmap-slimbus.o
118 --- a/drivers/base/regmap/regmap.c
119 +++ b/drivers/base/regmap/regmap.c
121 #include <linux/device.h>
122 #include <linux/slab.h>
123 #include <linux/export.h>
124 +#include <linux/module.h>
125 #include <linux/mutex.h>
126 #include <linux/err.h>
127 #include <linux/property.h>
128 @@ -3364,3 +3365,5 @@ static int __init regmap_initcall(void)
131 postcore_initcall(regmap_initcall);
133 +MODULE_LICENSE("GPL");
134 --- a/include/linux/regmap.h
135 +++ b/include/linux/regmap.h
136 @@ -180,7 +180,7 @@ struct reg_sequence {
140 -#ifdef CONFIG_REGMAP
141 +#if IS_REACHABLE(CONFIG_REGMAP)
144 /* Unspecified -> 0 -> Backwards compatible default */