From cb5bddeee233e4d33857b5dd46cf2bc906e7fd19 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 8 Jan 2013 22:19:31 +0000 Subject: kernel: add support for 3.8-rc2 Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35055 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-3.8/259-regmap_dynamic.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 target/linux/generic/patches-3.8/259-regmap_dynamic.patch (limited to 'target/linux/generic/patches-3.8/259-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch new file mode 100644 index 000000000..a6b4df4fb --- /dev/null +++ b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch @@ -0,0 +1,55 @@ +--- a/drivers/base/regmap/Kconfig ++++ b/drivers/base/regmap/Kconfig +@@ -3,20 +3,23 @@ + # 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 ++ 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 +@@ -44,7 +44,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 +-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.8/259-regmap_dynamic.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'target/linux/generic/patches-3.8/259-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch index a6b4df4fb..53bfe3805 100644 --- a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch @@ -53,3 +53,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 +@@ -1530,3 +1531,5 @@ static int __init regmap_initcall(void) + return 0; + } + postcore_initcall(regmap_initcall); ++ ++MODULE_LICENSE("GPL"); -- cgit v1.2.3 From 021be7825deb2b4706f3c54299358ddce9500975 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 21 Mar 2013 14:50:59 +0000 Subject: 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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36101 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.8/259-regmap_dynamic.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux/generic/patches-3.8/259-regmap_dynamic.patch') diff --git a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch index 53bfe3805..87c03f1ad 100644 --- a/target/linux/generic/patches-3.8/259-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.8/259-regmap_dynamic.patch @@ -1,6 +1,6 @@ --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig -@@ -3,20 +3,23 @@ +@@ -3,20 +3,24 @@ # subsystems should select the appropriate symbols. config REGMAP @@ -19,6 +19,7 @@ config REGMAP_SPI - tristate + select REGMAP ++ depends on SPI_MASTER + tristate "Regmap SPI" config REGMAP_MMIO -- cgit v1.2.3