diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
| commit | e72c7e17a475c00134c56f4392578ddc16a47a2e (patch) | |
| tree | 842835f958f9c9ed315cb853173d51e43f76bbf5 /target/linux/generic/patches-3.12/259-regmap_dynamic.patch | |
| parent | 4341ea40379ed24c103e37b75661c62bfc3270f6 (diff) | |
| download | upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.gz upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.bz2 upstream-e72c7e17a475c00134c56f4392578ddc16a47a2e.zip | |
preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38528
Diffstat (limited to 'target/linux/generic/patches-3.12/259-regmap_dynamic.patch')
| -rw-r--r-- | target/linux/generic/patches-3.12/259-regmap_dynamic.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/259-regmap_dynamic.patch b/target/linux/generic/patches-3.12/259-regmap_dynamic.patch new file mode 100644 index 0000000000..596f0de31d --- /dev/null +++ b/target/linux/generic/patches-3.12/259-regmap_dynamic.patch @@ -0,0 +1,72 @@ +--- a/drivers/base/regmap/Kconfig ++++ b/drivers/base/regmap/Kconfig +@@ -3,20 +3,24 @@ + # subsystems should select the appropriate symbols. + + config REGMAP +- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_MMIO || REGMAP_IRQ) + select LZO_COMPRESS + select LZO_DECOMPRESS + select IRQ_DOMAIN if REGMAP_IRQ +- bool ++ tristate "Regmap" + + config REGMAP_I2C +- tristate ++ select REGMAP ++ tristate "Regmap I2C" + + config REGMAP_SPI +- tristate ++ select REGMAP ++ depends on SPI_MASTER ++ tristate "Regmap SPI" + + config REGMAP_MMIO ++ select REGMAP + tristate + + config REGMAP_IRQ ++ select REGMAP + bool +--- a/include/linux/regmap.h ++++ b/include/linux/regmap.h +@@ -48,7 +48,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,6 +1,8 @@ +-obj-$(CONFIG_REGMAP) += regmap.o regcache.o +-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o +-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o ++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o ++ifdef CONFIG_DEBUG_FS ++regmap-core-objs += regmap-debugfs.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_MMIO) += regmap-mmio.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/rbtree.h> +@@ -1959,3 +1960,5 @@ static int __init regmap_initcall(void) + return 0; + } + postcore_initcall(regmap_initcall); ++ ++MODULE_LICENSE("GPL"); |