openwrt-owl/target/linux/generic/patches-3.3/270-regmap_dynamic.patch

--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -3,16 +3,18 @@
 # subsystems should select the appropriate symbols.
 
 config REGMAP
-	default y if (REGMAP_I2C || REGMAP_SPI)
 	select LZO_COMPRESS
 	select LZO_DECOMPRESS
-	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_IRQ
 	bool
--- 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
-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.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_IRQ) += regmap-irq.o
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/err.h>
 
 #define CREATE_TRACE_POINTS
@@ -679,3 +680,5 @@ static int __init regmap_initcall(void)
 	return 0;
 }
 postcore_initcall(regmap_initcall);
+
+MODULE_LICENSE("GPL");
kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions SVN-Revision: 35016 2013-01-05 13:33:44 +00:00			`--- a/drivers/base/regmap/Kconfig`
			`+++ b/drivers/base/regmap/Kconfig`
kernel: REGMAP_SPI should only be selectable when SPI_MASTER is selected This was turned from a silent confg option without a text to a normal config option which could be selected without any other option depending on this. This could cause the situation where REGMAP_SPI was selected without SPI_MASTER being selected. SVN-Revision: 36101 2013-03-21 14:50:59 +00:00			`@@ -3,16 +3,18 @@`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00			`# subsystems should select the appropriate symbols.`

			`config REGMAP`
			`- default y if (REGMAP_I2C \|\| REGMAP_SPI)`
			`select LZO_COMPRESS`
			`select LZO_DECOMPRESS`
			`- bool`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`+ tristate "Regmap"`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00
			`config REGMAP_I2C`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`- tristate`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00			`+ select REGMAP`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`+ tristate "Regmap I2C"`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00
			`config REGMAP_SPI`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`- tristate`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00			`+ select REGMAP`
kernel: REGMAP_SPI should only be selectable when SPI_MASTER is selected This was turned from a silent confg option without a text to a normal config option which could be selected without any other option depending on this. This could cause the situation where REGMAP_SPI was selected without SPI_MASTER being selected. SVN-Revision: 36101 2013-03-21 14:50:59 +00:00			`+ depends on SPI_MASTER`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`+ tristate "Regmap SPI"`
kernel: move regmap bloat out of the kernel image if it is only being used in modules SVN-Revision: 34999 2013-01-03 18:39:50 +00:00
			`config REGMAP_IRQ`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`bool`
kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions SVN-Revision: 35016 2013-01-05 13:33:44 +00:00			`--- a/drivers/base/regmap/Makefile`
			`+++ b/drivers/base/regmap/Makefile`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`@@ -1,6 +1,8 @@`
			`-obj-$(CONFIG_REGMAP) += regmap.o regcache.o`
			`-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o`
			`-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o`
			`+regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o`
missing underscore in 3.3 regmap patch Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 35018 2013-01-06 10:01:53 +00:00			`+ifdef CONFIG_DEBUG_FS`
fix regmap debloat patch SVN-Revision: 35015 2013-01-05 00:20:05 +00:00			`+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_IRQ) += regmap-irq.o`
kernel: set regmap-core module license Fixes the following issues: [ 7.660000] regmap_core: module license 'unspecified' taints kernel [ 7.690000] Disabling lock debugging due to kernel [ 7.700000] regmap_core: Unknown symbol lzo1x_decompress_safe (err 0 [ 7.710000] regmap_core: Unknown symbol lzo1x_1_compress (err 0 [ 7.720000] regmap_core: Unknown symbol devres_add (err 0 [ 7.730000] regmap_core: Unknown symbol debugfs_create_bool (err 0 [ 7.750000] regmap_core: Unknown symbol devres_alloc (err 0 [ 7.760000] regmap_core: Unknown symbol debugfs_remove_recursive (err 0 [ 7.770000] regmap_core: Unknown symbol debugfs_create_file (err 0 [ 7.780000] regmap_core: Unknown symbol devres_free (err 0 [ 7.800000] regmap_core: Unknown symbol devres_find (err 0 [ 7.810000] regmap_core: Unknown symbol debugfs_create_dir (err 0) Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36070 2013-03-17 19:45:48 +00:00			`--- a/drivers/base/regmap/regmap.c`
			`+++ b/drivers/base/regmap/regmap.c`
			`@@ -13,6 +13,7 @@`
			`#include <linux/slab.h>`
			`#include <linux/module.h>`
			`#include <linux/mutex.h>`
			`+#include <linux/module.h>`
			`#include <linux/err.h>`

			`#define CREATE_TRACE_POINTS`
			`@@ -679,3 +680,5 @@ static int __init regmap_initcall(void)`
			`return 0;`
			`}`
			`postcore_initcall(regmap_initcall);`
			`+`
			`+MODULE_LICENSE("GPL");`