From a0acd43cbf34682b18b03d038e2b0a12660a3788 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 3 Jan 2013 18:39:50 +0000 Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34999 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-3.6/270-regmap_dynamic.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 target/linux/generic/patches-3.6/270-regmap_dynamic.patch (limited to 'target/linux/generic/patches-3.6/270-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch new file mode 100644 index 000000000..d0c1a82b5 --- /dev/null +++ b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch @@ -0,0 +1,37 @@ +--- a/drivers/base/regmap/Kconfig ++++ b/drivers/base/regmap/Kconfig +@@ -3,19 +3,21 @@ + # subsystems should select the appropriate symbols. + + config REGMAP +- default y if (REGMAP_I2C || REGMAP_SPI) + select LZO_COMPRESS + select LZO_DECOMPRESS + select IRQ_DOMAIN if REGMAP_IRQ +- bool ++ tristate + + config REGMAP_I2C ++ select REGMAP + tristate + + config REGMAP_SPI ++ select REGMAP + tristate + + config REGMAP_MMIO ++ select REGMAP + tristate + + config REGMAP_IRQ +--- a/include/linux/regmap.h ++++ b/include/linux/regmap.h +@@ -43,7 +43,7 @@ struct reg_default { + unsigned int def; + }; + +-#ifdef CONFIG_REGMAP ++#if IS_ENABLED(CONFIG_REGMAP) + + enum regmap_endian { + /* Unspecified -> 0 -> Backwards compatible default */ -- cgit v1.2.3 From 828bda360e91eb783ba5125ae3772a0455ad16e1 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 5 Jan 2013 13:33:44 +0000 Subject: kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35016 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.6/270-regmap_dynamic.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'target/linux/generic/patches-3.6/270-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch index d0c1a82b5..943e8706c 100644 --- a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch @@ -35,3 +35,17 @@ 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 +-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_MMIO) += regmap-mmio.o -- cgit v1.2.3 From c52af10778b92e8c772d6bfe5bb91d8379883ff1 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 17 Mar 2013 19:45:48 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36070 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/generic/patches-3.6/270-regmap_dynamic.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'target/linux/generic/patches-3.6/270-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch index 943e8706c..8986eea70 100644 --- a/target/linux/generic/patches-3.6/270-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.6/270-regmap_dynamic.patch @@ -49,3 +49,19 @@ 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 + #include + #include ++#include + #include + #include + #include +@@ -1418,3 +1419,5 @@ static int __init regmap_initcall(void) + return 0; + } + postcore_initcall(regmap_initcall); ++ ++MODULE_LICENSE("GPL"); -- cgit v1.2.3