458b7c35a1749a2cfb98e33e9285fa572eb354e9
[openwrt/openwrt.git] / target / linux / generic / hack-4.14 / 259-regmap_dynamic.patch
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
5
6 lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998
7 Signed-off-by: Felix Fietkau <nbd@nbd.name>
8 ---
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(-)
14
15 --- a/drivers/base/regmap/Kconfig
16 +++ b/drivers/base/regmap/Kconfig
17 @@ -4,9 +4,8 @@
18 # subsystems should select the appropriate symbols.
19
20 config REGMAP
21 - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
22 select IRQ_DOMAIN if REGMAP_IRQ
23 - bool
24 + tristate "Regmap"
25
26 config REGCACHE_COMPRESSED
27 select LZO_COMPRESS
28 @@ -17,23 +16,30 @@ config REGMAP_AC97
29 tristate
30
31 config REGMAP_I2C
32 - tristate
33 + tristate "Regmap I2C"
34 + select REGMAP
35 depends on I2C
36
37 config REGMAP_SPI
38 - tristate
39 + tristate "Regmap SPI"
40 + select REGMAP
41 + depends on SPI_MASTER
42 depends on SPI
43
44 config REGMAP_SPMI
45 + select REGMAP
46 tristate
47 depends on SPMI
48
49 config REGMAP_W1
50 + select REGMAP
51 tristate
52 depends on W1
53
54 config REGMAP_MMIO
55 - tristate
56 + tristate "Regmap MMIO"
57 + select REGMAP
58
59 config REGMAP_IRQ
60 + select REGMAP
61 bool
62 --- a/drivers/base/regmap/Makefile
63 +++ b/drivers/base/regmap/Makefile
64 @@ -2,10 +2,14 @@
65 # For include/trace/define_trace.h to include trace.h
66 CFLAGS_regmap.o := -I$(src)
67
68 -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
69 -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o
70 -obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o
71 -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
72 +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o
73 +ifdef CONFIG_DEBUG_FS
74 +regmap-core-objs += regmap-debugfs.o
75 +endif
76 +ifdef CONFIG_REGCACHE_COMPRESSED
77 +regmap-core-objs += regcache-lzo.o
78 +endif
79 +obj-$(CONFIG_REGMAP) += regmap-core.o
80 obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o
81 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
82 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
83 --- a/drivers/base/regmap/regmap.c
84 +++ b/drivers/base/regmap/regmap.c
85 @@ -13,6 +13,7 @@
86 #include <linux/device.h>
87 #include <linux/slab.h>
88 #include <linux/export.h>
89 +#include <linux/module.h>
90 #include <linux/mutex.h>
91 #include <linux/err.h>
92 #include <linux/of.h>
93 @@ -2926,3 +2927,5 @@ static int __init regmap_initcall(void)
94 return 0;
95 }
96 postcore_initcall(regmap_initcall);
97 +
98 +MODULE_LICENSE("GPL");
99 --- a/include/linux/regmap.h
100 +++ b/include/linux/regmap.h
101 @@ -139,7 +139,7 @@ struct reg_sequence {
102 pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
103 })
104
105 -#ifdef CONFIG_REGMAP
106 +#if IS_REACHABLE(CONFIG_REGMAP)
107
108 enum regmap_endian {
109 /* Unspecified -> 0 -> Backwards compatible default */