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