target/linux/generic/patches-3.18/259-regmap_dynamic.patch

   1 --- a/drivers/base/regmap/Kconfig
   2 +++ b/drivers/base/regmap/Kconfig
   3 @@ -3,26 +3,31 @@
   4  # subsystems should select the appropriate symbols.
   5
   6  config REGMAP
   7 -       default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)
   8         select LZO_COMPRESS
   9         select LZO_DECOMPRESS
  10         select IRQ_DOMAIN if REGMAP_IRQ
  11 -       bool
  12 +       tristate "Regmap"
  13
  14  config REGMAP_I2C
  15 -       tristate
  16 +       tristate "Regmap I2C"
  17 +       select REGMAP
  18         depends on I2C
  19
  20  config REGMAP_SPI
  21 -       tristate
  22 +       tristate "Regmap SPI"
  23 +       select REGMAP
  24 +       depends on SPI_MASTER
  25         depends on SPI
  26
  27  config REGMAP_SPMI
  28 +       select REGMAP
  29         tristate
  30         depends on SPMI
  31
  32  config REGMAP_MMIO
  33 +       select REGMAP
  34         tristate
  35
  36  config REGMAP_IRQ
  37 +       select REGMAP
  38         bool
  39 --- a/include/linux/regmap.h
  40 +++ b/include/linux/regmap.h
  41 @@ -49,7 +49,7 @@ struct reg_default {
  42         unsigned int def;
  43  };
  44
  45 -#ifdef CONFIG_REGMAP
  46 +#if IS_ENABLED(CONFIG_REGMAP)
  47
  48  enum regmap_endian {
  49         /* Unspecified -> 0 -> Backwards compatible default */
  50 --- a/drivers/base/regmap/Makefile
  51 +++ b/drivers/base/regmap/Makefile
  52 @@ -1,6 +1,8 @@
  53 -obj-$(CONFIG_REGMAP) += regmap.o regcache.o
  54 -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
  55 -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
  56 +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
  57 +ifdef CONFIG_DEBUG_FS
  58 +regmap-core-objs += regmap-debugfs.o
  59 +endif
  60 +obj-$(CONFIG_REGMAP) += regmap-core.o
  61  obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
  62  obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
  63  obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o
  64 --- a/drivers/base/regmap/regmap.c
  65 +++ b/drivers/base/regmap/regmap.c
  66 @@ -13,6 +13,7 @@
  67  #include <linux/device.h>
  68  #include <linux/slab.h>
  69  #include <linux/export.h>
  70 +#include <linux/module.h>
  71  #include <linux/mutex.h>
  72  #include <linux/err.h>
  73  #include <linux/of.h>
  74 @@ -2635,3 +2636,5 @@ static int __init regmap_initcall(void)
  75         return 0;
  76  }
  77  postcore_initcall(regmap_initcall);
  78 +
  79 +MODULE_LICENSE("GPL");