From 4d8553a2e6406de1f6700ed9d6032a68d0158e7d Mon Sep 17 00:00:00 2001 From: moonman Date: Mon, 7 Apr 2014 23:16:34 -0600 Subject: [PATCH] core/linux-kirkwood to 3.14-1 --- ...tooth-allocate-static-minor-for-vhci.patch | 74 +++++++++++ core/linux-kirkwood/PKGBUILD | 21 +-- core/linux-kirkwood/archlinuxarm.patch | 104 +++++++-------- core/linux-kirkwood/config | 124 +++++++++++++----- 4 files changed, 230 insertions(+), 93 deletions(-) create mode 100644 core/linux-kirkwood/0001-Bluetooth-allocate-static-minor-for-vhci.patch diff --git a/core/linux-kirkwood/0001-Bluetooth-allocate-static-minor-for-vhci.patch b/core/linux-kirkwood/0001-Bluetooth-allocate-static-minor-for-vhci.patch new file mode 100644 index 000000000..26a271cf1 --- /dev/null +++ b/core/linux-kirkwood/0001-Bluetooth-allocate-static-minor-for-vhci.patch @@ -0,0 +1,74 @@ +From 5d77ba2d26110c678b40fd723866a17d4036de12 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi +Date: Tue, 18 Feb 2014 02:19:26 -0300 +Subject: [PATCH 1/6] Bluetooth: allocate static minor for vhci + +Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI +driver) added the module alias to hci_vhci module so it's possible to +create the /dev/vhci node. However creating an alias without +specifying the minor doesn't allow us to create the node ahead, +triggerring module auto-load when it's first accessed. + +Starting with depmod from kmod 16 we started to warn if there's a +devname alias without specifying the major and minor. + +Let's do the same done for uhid, kvm, fuse and others, specifying a +fixed minor. In systems with systemd as the init the following will +happen: on early boot systemd will call "kmod static-nodes" to read +/lib/modules/$(uname -r)/modules.devname and then create the nodes. When +first accessed these "dead" nodes will trigger the module loading. + +Signed-off-by: Lucas De Marchi +Acked-by: Greg Kroah-Hartman +Signed-off-by: Marcel Holtmann +--- + Documentation/devices.txt | 1 + + drivers/bluetooth/hci_vhci.c | 3 ++- + include/linux/miscdevice.h | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Documentation/devices.txt b/Documentation/devices.txt +index 10378cc..04356f5 100644 +--- a/Documentation/devices.txt ++++ b/Documentation/devices.txt +@@ -353,6 +353,7 @@ Your cooperation is appreciated. + 133 = /dev/exttrp External device trap + 134 = /dev/apm_bios Advanced Power Management BIOS + 135 = /dev/rtc Real Time Clock ++ 137 = /dev/vhci Bluetooth virtual HCI driver + 139 = /dev/openprom SPARC OpenBoot PROM + 140 = /dev/relay8 Berkshire Products Octal relay card + 141 = /dev/relay16 Berkshire Products ISO-16 relay card +diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c +index 1ef6990..add1c6a 100644 +--- a/drivers/bluetooth/hci_vhci.c ++++ b/drivers/bluetooth/hci_vhci.c +@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = { + static struct miscdevice vhci_miscdev= { + .name = "vhci", + .fops = &vhci_fops, +- .minor = MISC_DYNAMIC_MINOR, ++ .minor = VHCI_MINOR, + }; + + static int __init vhci_init(void) +@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); + MODULE_VERSION(VERSION); + MODULE_LICENSE("GPL"); + MODULE_ALIAS("devname:vhci"); ++MODULE_ALIAS_MISCDEV(VHCI_MINOR); +diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h +index 3737f72..7bb6148 100644 +--- a/include/linux/miscdevice.h ++++ b/include/linux/miscdevice.h +@@ -23,6 +23,7 @@ + #define TEMP_MINOR 131 /* Temperature Sensor */ + #define RTC_MINOR 135 + #define EFI_RTC_MINOR 136 /* EFI Time services */ ++#define VHCI_MINOR 137 + #define SUN_OPENPROM_MINOR 139 + #define DMAPI_MINOR 140 /* DMAPI */ + #define NVRAM_MINOR 144 +-- +1.9.1 + diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index 58a9db28d..0a62aa2d4 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,8 +7,8 @@ buildarch=2 pkgbase=linux-kirkwood _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood" -pkgver=3.13.9 -pkgrel=2 +pkgver=3.14 +pkgrel=1 cryptodev_commit=57b5544de80db85c8955499831fdaa30829db77a bfqver=v7r2 @@ -21,6 +21,7 @@ options=('!strip') source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" 'archlinuxarm.patch' 'config' + '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' 'change-default-console-loglevel.patch' 'usb-add-reset-resume-quirk-for-several-webcams.patch' @@ -30,17 +31,18 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch") -md5sums=('91e81eb5acc67671ba5372835f594417' - 'adf8b4afb532b04cbd027a768ca2970f' - '5c387f920b901dc15cc6fea9e6363620' +md5sums=('b621207b3f6ecbb67db18b13258f8ea8' + '2875cc4e92aa84ad28f24da0a3dabae0' + 'a493742fdd9bab5efaeec7b1352d2205' + '1b276abe16d14e133f3f28d9c9e6bd68' 'SKIP' '65d5a4f313310bb2a732d022d51ea7e7' '9b5a265440abf57d2052838f31486a3a' 'SKIP' 'a59f78f0a34cfe321921265246a7b725' - 'af879e680d2b723284bed9c660d9bba8' - '64b67eb8d84c94fc3929cceaf8d37895' - '5c6962340e5617086f4bb9513918bd08') + '42aec4f3943140e8346a778f8967b8e5' + 'f1eea13a89f4dbcb5cb1ae3d097ef6a0' + '0bccf1a2c80875e70287e20b8c2a8b19') prepare() { cd "${srcdir}/linux-${pkgver}" @@ -58,6 +60,9 @@ msg2 "Applying aufs3 patches" patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch +msg2 "Fix vhci warning in kmod" + patch -p1 -i "${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch" + msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams" # FS#26528 patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" diff --git a/core/linux-kirkwood/archlinuxarm.patch b/core/linux-kirkwood/archlinuxarm.patch index eec910165..557212ef8 100644 --- a/core/linux-kirkwood/archlinuxarm.patch +++ b/core/linux-kirkwood/archlinuxarm.patch @@ -1,6 +1,6 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c --- a/arch/arm/mach-kirkwood/bubba3-gpio.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-11-08 01:39:48.648006378 -0700 ++++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2014-04-07 23:06:39.808195142 -0600 @@ -0,0 +1,392 @@ +/* + * Excito BUBBA|3 led driver. @@ -396,7 +396,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3 +module_exit(bubba3_cleanup); diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c --- a/arch/arm/mach-kirkwood/bubba3-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-11-08 01:39:48.648006378 -0700 ++++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2014-04-07 23:06:39.808195142 -0600 @@ -0,0 +1,234 @@ +/* + * arch/arm/mach-kirkwood/bubba3-setup.c @@ -633,11 +633,11 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h ---- a/arch/arm/mach-kirkwood/common.h 2013-11-03 16:41:51.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/common.h 2013-11-08 01:41:40.952365272 -0700 -@@ -58,13 +58,6 @@ - void kirkwood_restart(enum reboot_mode, const char *); - void kirkwood_clk_init(void); +--- a/arch/arm/mach-kirkwood/common.h 2014-03-30 21:40:15.000000000 -0600 ++++ b/arch/arm/mach-kirkwood/common.h 2014-04-07 23:06:39.828195297 -0600 +@@ -64,13 +64,6 @@ + static inline void kirkwood_pm_init(void) {}; + #endif -/* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT @@ -651,7 +651,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h void kirkwood_l2_init(void); diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c --- a/arch/arm/mach-kirkwood/dockstar-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-11-08 01:39:48.648006378 -0700 ++++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2014-04-07 23:06:39.828195297 -0600 @@ -0,0 +1,115 @@ +/* + * arch/arm/mach-kirkwood/dockstar-setup.c @@ -770,7 +770,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c --- a/arch/arm/mach-kirkwood/goflexhome-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-11-08 01:39:48.648006378 -0700 ++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2014-04-07 23:06:39.838195667 -0600 @@ -0,0 +1,124 @@ +/* + * arch/arm/mach-kirkwood/goflexhome-setup.c @@ -898,7 +898,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g + diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c --- a/arch/arm/mach-kirkwood/goflexnet-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-11-08 01:39:48.658006766 -0700 ++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2014-04-07 23:06:39.838195667 -0600 @@ -0,0 +1,177 @@ +/* + * arch/arm/mach-kirkwood/goflexnet-setup.c @@ -1079,7 +1079,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go + diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c --- a/arch/arm/mach-kirkwood/guruplug-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-11-08 01:39:48.658006766 -0700 ++++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2014-04-07 23:06:39.838195667 -0600 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-kirkwood/guruplug-setup.c @@ -1311,7 +1311,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur +#endif diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c --- a/arch/arm/mach-kirkwood/iconnect-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-11-08 01:39:48.658006766 -0700 ++++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2014-04-07 23:06:39.838195667 -0600 @@ -0,0 +1,204 @@ +/* + * arch/arm/mach-kirkwood/iconnect-setup.c @@ -1519,7 +1519,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-11-08 01:39:48.658006766 -0700 ++++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2014-04-07 23:06:39.848196352 -0600 @@ -0,0 +1,137 @@ +/* + * arch/arm/mach-kirkwood/ionics-stratus-setup.c @@ -1659,8 +1659,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig ---- a/arch/arm/mach-kirkwood/Kconfig 2013-11-03 16:41:51.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/Kconfig 2013-11-08 01:39:48.688007930 -0700 +--- a/arch/arm/mach-kirkwood/Kconfig 2014-03-30 21:40:15.000000000 -0600 ++++ b/arch/arm/mach-kirkwood/Kconfig 2014-04-07 23:06:39.848196352 -0600 @@ -12,6 +12,48 @@ Say 'Y' here if you want your kernel to support the LaCie d2 Network v2 NAS. @@ -1844,11 +1844,11 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig config ARCH_KIRKWOOD_DT diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile ---- a/arch/arm/mach-kirkwood/Makefile 2013-11-03 16:41:51.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/Makefile 2013-11-08 01:39:48.698008319 -0700 -@@ -1,14 +1,35 @@ - obj-y += common.o pcie.o - obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o +--- a/arch/arm/mach-kirkwood/Makefile 2014-03-30 21:40:15.000000000 -0600 ++++ b/arch/arm/mach-kirkwood/Makefile 2014-04-07 23:06:39.858196866 -0600 +@@ -3,14 +3,35 @@ + obj-$(CONFIG_PM) += pm.o + obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o +obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o +obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o @@ -1884,7 +1884,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c --- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 2013-11-08 01:39:48.698008319 -0700 ++++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 2014-04-07 23:06:39.858196866 -0600 @@ -0,0 +1,172 @@ +/* + * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c @@ -2060,7 +2060,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkw +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c --- a/arch/arm/mach-kirkwood/nas6210-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-11-08 01:39:48.708008707 -0700 ++++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2014-04-07 23:06:39.858196866 -0600 @@ -0,0 +1,186 @@ +/* + * arch/arm/mach-kirkwood/nas6210-setup.c @@ -2250,7 +2250,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6 +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c 2013-11-08 01:39:48.708008707 -0700 ++++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c 2014-04-07 23:06:39.858196866 -0600 @@ -0,0 +1,293 @@ +/* + * arch/arm/mach-kirkwood/netspace_v2-setup.c @@ -2547,7 +2547,7 @@ diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/ +#endif diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c --- a/arch/arm/mach-kirkwood/nsa310-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-11-08 01:39:48.708008707 -0700 ++++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2014-04-07 23:06:39.868197319 -0600 @@ -0,0 +1,359 @@ +/* + * arch/arm/mach-kirkwood/nsa310-setup.c @@ -2910,7 +2910,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31 +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c --- a/arch/arm/mach-kirkwood/nsa320-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-11-08 01:39:48.718009095 -0700 ++++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2014-04-07 23:06:39.868197319 -0600 @@ -0,0 +1,305 @@ +/* + * arch/arm/mach-kirkwood/nsa320-setup.c @@ -3219,7 +3219,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32 +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa325-setup.c --- a/arch/arm/mach-kirkwood/nsa325-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2013-11-08 01:39:48.718009095 -0700 ++++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2014-04-07 23:06:39.878197687 -0600 @@ -0,0 +1,359 @@ +/* + * arch/arm/mach-kirkwood/nsa325-setup.c @@ -3582,7 +3582,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa32 +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-11-08 01:39:48.718009095 -0700 ++++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2014-04-07 23:06:39.878197687 -0600 @@ -0,0 +1,115 @@ +/* + * arch/arm/mach-kirkwood/pogo_e02-setup.c @@ -3701,7 +3701,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-11-08 01:39:48.718009095 -0700 ++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2014-04-07 23:06:39.878197687 -0600 @@ -0,0 +1,195 @@ +/* + * arch/arm/mach-kirkwood/pogoplugv4-setup.c @@ -3900,7 +3900,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-11-08 01:39:48.728009483 -0700 ++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2014-04-07 23:06:39.878197687 -0600 @@ -0,0 +1,170 @@ +/* + * arch/arm/mach-kirkwood/sheevaplug-setup.c @@ -4074,7 +4074,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s +#endif diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c --- a/arch/arm/mach-kirkwood/topkick-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-11-08 01:39:48.728009483 -0700 ++++ b/arch/arm/mach-kirkwood/topkick-setup.c 2014-04-07 23:06:39.878197687 -0600 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-kirkwood/topkick-setup.c @@ -4242,9 +4242,9 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c ---- a/drivers/ata/sata_mv.c 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/ata/sata_mv.c 2013-11-08 01:39:48.868014917 -0700 -@@ -71,6 +71,7 @@ +--- a/drivers/ata/sata_mv.c 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/ata/sata_mv.c 2014-04-07 23:06:39.918198937 -0600 +@@ -72,6 +72,7 @@ #include #include #include @@ -4252,7 +4252,7 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c #define DRV_NAME "sata_mv" #define DRV_VERSION "1.28" -@@ -1161,6 +1162,8 @@ +@@ -1170,6 +1171,8 @@ { int want_ncq = (protocol == ATA_PROT_NCQ); @@ -4262,9 +4262,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0); if (want_ncq != using_ncq) diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig ---- a/drivers/hwmon/Kconfig 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/hwmon/Kconfig 2013-11-08 01:39:48.928017246 -0700 -@@ -1553,6 +1553,19 @@ +--- a/drivers/hwmon/Kconfig 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/hwmon/Kconfig 2014-04-07 23:06:39.948200112 -0600 +@@ -1556,6 +1556,19 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -4285,8 +4285,8 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig comment "ACPI drivers" diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile ---- a/drivers/hwmon/Makefile 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/hwmon/Makefile 2013-11-08 01:39:48.928017246 -0700 +--- a/drivers/hwmon/Makefile 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/hwmon/Makefile 2014-04-07 23:06:39.958200474 -0600 @@ -109,6 +109,7 @@ obj-$(CONFIG_SENSORS_MAX6650) += max6650.o obj-$(CONFIG_SENSORS_MAX6697) += max6697.o @@ -4297,7 +4297,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c --- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-11-08 01:39:48.928017246 -0700 ++++ b/drivers/hwmon/nsa3xx-hwmon.c 2014-04-07 23:06:39.958200474 -0600 @@ -0,0 +1,251 @@ +/* + * drivers/hwmon/nsa3xx-hwmon.c @@ -4551,8 +4551,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:nsa3xx-hwmon"); diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig ---- a/drivers/leds/trigger/Kconfig 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/leds/trigger/Kconfig 2013-11-08 01:39:48.958018410 -0700 +--- a/drivers/leds/trigger/Kconfig 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/leds/trigger/Kconfig 2014-04-07 23:06:39.968200829 -0600 @@ -35,7 +35,6 @@ config LEDS_TRIGGER_IDE_DISK @@ -4562,9 +4562,9 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig help This allows LEDs to be controlled by IDE disk activity. diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c ---- a/drivers/mmc/core/core.c 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/mmc/core/core.c 2013-11-08 01:39:49.008020351 -0700 -@@ -805,7 +805,7 @@ +--- a/drivers/mmc/core/core.c 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/mmc/core/core.c 2014-04-07 23:06:39.998201895 -0600 +@@ -806,7 +806,7 @@ */ limit_us = 3000000; else @@ -4574,9 +4574,9 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c /* * SDHC cards always use these fixed values. diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c ---- a/drivers/mmc/core/sd.c 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/mmc/core/sd.c 2013-11-08 01:39:49.008020351 -0700 -@@ -358,6 +358,15 @@ +--- a/drivers/mmc/core/sd.c 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/mmc/core/sd.c 2014-04-07 23:06:40.028203009 -0600 +@@ -366,6 +366,15 @@ return -ENOMEM; } @@ -4593,8 +4593,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c if (err) goto out; diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c ---- a/drivers/mmc/host/mvsdio.c 2013-11-03 16:41:51.000000000 -0700 -+++ b/drivers/mmc/host/mvsdio.c 2013-11-08 01:39:49.028021127 -0700 +--- a/drivers/mmc/host/mvsdio.c 2014-03-30 21:40:15.000000000 -0600 ++++ b/drivers/mmc/host/mvsdio.c 2014-04-07 23:06:40.028203009 -0600 @@ -25,6 +25,7 @@ #include #include @@ -4613,7 +4613,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h --- a/include/linux/bubba3.h 1969-12-31 17:00:00.000000000 -0700 -+++ b/include/linux/bubba3.h 2013-11-08 01:39:49.028021127 -0700 ++++ b/include/linux/bubba3.h 2014-04-07 23:06:40.038203375 -0600 @@ -0,0 +1,41 @@ +/* + * (C) Copyright 2010 @@ -4658,7 +4658,7 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h +#endif diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h --- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700 -+++ b/include/linux/nsa3xx-hwmon.h 2013-11-08 01:39:49.028021127 -0700 ++++ b/include/linux/nsa3xx-hwmon.h 2014-04-07 23:06:40.038203375 -0600 @@ -0,0 +1,21 @@ +/* + * include/linux/nsa3xx.hwmon.h diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config index 466b0214c..9b6c8cc82 100644 --- a/core/linux-kirkwood/config +++ b/core/linux-kirkwood/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.13.9-1 Kernel Configuration +# Linux/arm 3.14.0-1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -126,7 +126,6 @@ CONFIG_IPC_NS=y # CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y -# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set @@ -180,6 +179,7 @@ CONFIG_HAVE_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y @@ -196,6 +196,11 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -225,7 +230,7 @@ CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_BLK_DEV_THROTTLING is not set # CONFIG_BLK_CMDLINE_PARSER is not set @@ -299,8 +304,8 @@ CONFIG_ARCH_KIRKWOOD=y # CONFIG_ARCH_W90X900 is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_MSM is not set -# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_MSM_NODT is not set +# CONFIG_ARCH_SHMOBILE_LEGACY is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C24XX is not set @@ -442,6 +447,7 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_NO_BOOTMEM=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 @@ -449,6 +455,7 @@ CONFIG_COMPACTION=y CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 +CONFIG_NEED_BOUNCE_POOL=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_CROSS_MEMORY_ATTACH=y @@ -457,11 +464,12 @@ CONFIG_NEED_PER_CPU_KM=y # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set # CONFIG_ZBUD is not set +CONFIG_ZSMALLOC=y +# CONFIG_PGTABLE_MAPPING is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y @@ -693,6 +701,7 @@ CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_CT=m @@ -702,6 +711,9 @@ CONFIG_NFT_COUNTER=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m CONFIG_NFT_NAT=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m @@ -744,6 +756,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -760,7 +773,9 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m @@ -808,9 +823,9 @@ CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NFT_REJECT_IPV4=m CONFIG_NF_TABLES_ARP=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m @@ -846,6 +861,7 @@ CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_REJECT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -926,6 +942,7 @@ CONFIG_IPDDP=m # CONFIG_LAPB is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set +CONFIG_6LOWPAN_IPHC=m CONFIG_NET_SCHED=y # @@ -951,6 +968,8 @@ CONFIG_NET_SCH_CHOKE=m # CONFIG_NET_SCH_CODEL is not set # CONFIG_NET_SCH_FQ_CODEL is not set CONFIG_NET_SCH_FQ=m +# CONFIG_NET_SCH_HHF is not set +CONFIG_NET_SCH_PIE=m # CONFIG_NET_SCH_INGRESS is not set # CONFIG_NET_SCH_PLUG is not set @@ -1000,7 +1019,8 @@ CONFIG_VSOCKETS=m # CONFIG_NETLINK_DIAG is not set # CONFIG_NET_MPLS_GSO is not set # CONFIG_HSR is not set -# CONFIG_NETPRIO_CGROUP is not set +CONFIG_CGROUP_NET_PRIO=m +CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y # CONFIG_BPF_JIT is not set @@ -1197,7 +1217,7 @@ CONFIG_MTD_CMDLINE_PARTS=y # # User Modules And Translation Layers # -CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set @@ -1297,6 +1317,8 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set @@ -1440,7 +1462,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_AIC94XX is not set # CONFIG_SCSI_MVSAS is not set @@ -1590,6 +1611,7 @@ CONFIG_BCACHE=m CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m # CONFIG_DM_THIN_PROVISIONING is not set @@ -1733,11 +1755,13 @@ CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_MV643XX_ETH=y CONFIG_MVMDIO=y +# CONFIG_MVNETA is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_MLX4_EN is not set # CONFIG_MLX4_CORE is not set +# CONFIG_MLX5_CORE is not set CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set @@ -1866,6 +1890,7 @@ CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -1918,6 +1943,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_WOW is not set # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m @@ -1953,6 +1979,7 @@ CONFIG_B43_LEDS=y # CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set CONFIG_BRCMUTIL=m +# CONFIG_BRCMSMAC is not set CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y @@ -2104,7 +2131,6 @@ CONFIG_KEYBOARD_TCA6416=m # CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_SH_KEYSC is not set # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m @@ -2274,7 +2300,15 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_MUX_GPIO is not set +# CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set +# CONFIG_I2C_MUX_PINCTRL is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=m @@ -2312,16 +2346,15 @@ CONFIG_I2C_MV64XXX=y # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PXA_PCI is not set -# CONFIG_I2C_SH_MOBILE is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_XILINX is not set -# CONFIG_I2C_RCAR is not set # # External I2C/SMBus adapter drivers # # CONFIG_I2C_DIOLAN_U2C is not set # CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_ROBOTFUZZ_OSIF=m # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_TINY_USB is not set @@ -2406,6 +2439,7 @@ CONFIG_GPIO_SYSFS=y # # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_RCAR is not set +# CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_TS5500 is not set # CONFIG_GPIO_VX855 is not set @@ -2430,9 +2464,7 @@ CONFIG_GPIO_SYSFS=y # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -2621,7 +2653,6 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_GOV_FAIR_SHARE is not set CONFIG_THERMAL_GOV_STEP_WISE=y # CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_CPU_THERMAL is not set # CONFIG_THERMAL_EMULATION is not set # @@ -2702,6 +2733,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77686 is not set # CONFIG_MFD_MAX77693 is not set # CONFIG_MFD_MAX8907 is not set @@ -2724,6 +2756,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_STMPE is not set # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_PALMAS is not set # CONFIG_TPS6105X is not set @@ -2782,7 +2815,6 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_V4L2_INT_DEVICE=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m @@ -2876,7 +2908,6 @@ CONFIG_VIDEO_CPIA2=m CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m -# CONFIG_USB_SN9C102 is not set CONFIG_VIDEO_USBTV=m # @@ -2959,6 +2990,7 @@ CONFIG_DVB_B2C2_FLEXCOP_USB=m # Webcam, TV (analog/digital) USB devices # CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=m @@ -3018,14 +3050,17 @@ CONFIG_SMS_SDIO_DRV=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_TEA575X=m # CONFIG_RADIO_SI470X is not set +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m @@ -3096,6 +3131,10 @@ CONFIG_VIDEO_MT9V011=m # Video improvement chips # +# +# Audio/Video compression chips +# + # # Miscellaneous helper chips # @@ -3148,6 +3187,7 @@ CONFIG_MEDIA_TUNER_FC0013=m CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_MEDIA_TUNER_E4000=m CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88TS2022=m CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_MEDIA_TUNER_IT913X=m CONFIG_MEDIA_TUNER_R820T=m @@ -3159,6 +3199,7 @@ CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends @@ -3299,6 +3340,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set @@ -3464,7 +3506,6 @@ CONFIG_HID_KENSINGTON=m # CONFIG_HID_LCPOWER is not set # CONFIG_HID_LENOVO_TPKBD is not set CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y @@ -3601,7 +3642,9 @@ CONFIG_USB_STORAGE_ONETOUCH=m # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +# CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set # CONFIG_USB_CHIPIDEA is not set # @@ -3649,6 +3692,7 @@ CONFIG_USB_SERIAL_MCT_U232=m # CONFIG_USB_SERIAL_METRO is not set CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7840=m +# CONFIG_USB_SERIAL_MXUPORT is not set CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m @@ -3705,6 +3749,7 @@ CONFIG_USB_HSIC_USB3503=m # USB Physical Layer drivers # # CONFIG_USB_PHY is not set +# CONFIG_USB_OTG_FSM is not set # CONFIG_NOP_USB_XCEIV is not set # CONFIG_AM335X_PHY_USB is not set # CONFIG_SAMSUNG_USB2PHY is not set @@ -3824,6 +3869,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF2127 is not set # CONFIG_RTC_DRV_PCF8523 is not set @@ -3930,7 +3976,9 @@ CONFIG_R8712U=y CONFIG_R8188EU=m # CONFIG_88EU_AP_MODE is not set # CONFIG_88EU_P2P is not set +# CONFIG_R8821AE is not set # CONFIG_RTS5139 is not set +# CONFIG_RTS5208 is not set # CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set # CONFIG_LINE6_USB is not set @@ -4031,9 +4079,6 @@ CONFIG_USB_SERIAL_QUATECH2=m # Triggers - standalone # # CONFIG_IIO_SIMPLE_DUMMY is not set -CONFIG_ZSMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set # CONFIG_FB_SM7XX is not set # CONFIG_CRYSTALHD is not set CONFIG_FB_XGI=m @@ -4062,9 +4107,7 @@ CONFIG_NET_VENDOR_SILICOM=y # CONFIG_CED1401 is not set # CONFIG_DGRP is not set # CONFIG_MTD_SPINAND_MT29F is not set -# CONFIG_USB_DWC2 is not set # CONFIG_LUSTRE_FS is not set -CONFIG_USB_BTMTK=m # CONFIG_XILLYBUS is not set # CONFIG_DGNC is not set # CONFIG_DGAP is not set @@ -4075,7 +4118,6 @@ CONFIG_COMMON_CLK=y # # Common Clock Framework # -# CONFIG_COMMON_CLK_DEBUG is not set # CONFIG_COMMON_CLK_SI5351 is not set # @@ -4084,7 +4126,6 @@ CONFIG_COMMON_CLK=y CONFIG_CLKSRC_MMIO=y # CONFIG_MAILBOX is not set CONFIG_IOMMU_SUPPORT=y -# CONFIG_SHMOBILE_IOMMU is not set # # Remoteproc drivers @@ -4181,6 +4222,11 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_IIO_ST_GYRO_3AXIS is not set # CONFIG_ITG3200 is not set +# +# Humidity sensors +# +CONFIG_DHT11=m + # # Inertial measurement units # @@ -4193,6 +4239,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # # CONFIG_ADJD_S311 is not set # CONFIG_APDS9300 is not set +CONFIG_CM32181=m # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set # CONFIG_HID_SENSOR_ALS is not set @@ -4209,9 +4256,15 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set # CONFIG_IIO_ST_MAGN_3AXIS is not set +# +# Inclinometer sensors +# +# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set + # # Pressure sensors # +# CONFIG_MPL3115 is not set # CONFIG_IIO_ST_PRESS is not set # @@ -4227,8 +4280,9 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # # PHY Subsystem # -# CONFIG_GENERIC_PHY is not set +CONFIG_GENERIC_PHY=y # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set +# CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set # @@ -4297,7 +4351,6 @@ CONFIG_QUOTACTL=y CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y # # Caches @@ -4569,6 +4622,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set CONFIG_TIMER_STATS=y @@ -4657,9 +4711,12 @@ CONFIG_PROBE_EVENTS=y # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_MODULE is not set +# CONFIG_TEST_USER_COPY is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set +# CONFIG_ARM_PTDUMP is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_ARM_UNWIND=y CONFIG_DEBUG_USER=y @@ -4680,6 +4737,7 @@ CONFIG_DEBUG_UART_8250_SHIFT=2 CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" CONFIG_EARLY_PRINTK=y # CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set # # Security options @@ -4778,7 +4836,7 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set -CONFIG_CRYPTO_CRCT10DIF=m +CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -4851,7 +4909,7 @@ CONFIG_GENERIC_IO=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y -# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set