core/linux-armv7 to 4.7.0-1

2024-11-18 22:54:00 +00:00 · 2016-07-27 14:48:50 +00:00 · 2016-07-27 14:48:50 +00:00 · 4d5ed944ed
commit 4d5ed944ed
parent 45e72510ca
10 changed files with 455 additions and 153 deletions
--- a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@ -1,4 +1,4 @@
-From dccadc9e5eb4dc16815e27c286c16d235e4ff8e8 Mon Sep 17 00:00:00 2001
+From afbbc877305527e93d244824e0a3dca819973d94 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
 };
 
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@ -1,4 +1,4 @@
-From 2fe6588b6ca5cb817c78ee0b44ca9b2a6f6bdeb1 Mon Sep 17 00:00:00 2001
+From 14e8a69247c12df417aa4f2d5088f153d164d6a4 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
 	}
 
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch
+++ b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch
@ -1,4 +1,4 @@
-From 66047514f80a831be0461566faffa79113151783 Mon Sep 17 00:00:00 2001
+From 0371fbb17b99b7a34cd3620667fb4ec0dc13509f Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
 Subject: [PATCH 3/8] SMILE Plug device tree file
@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 95c1923..38c06e4 100644
+index 414b427..939686c 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -793,6 +793,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -844,6 +844,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 	armada-370-db.dtb \
 	armada-370-dlink-dns327l.dtb \
 	armada-370-mirabox.dtb \
@ -205,5 +205,5 @@ index 0000000..d01308a
 +	};
 +};
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch
+++ b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch
@ -1,4 +1,4 @@
-From 57abb5f14c98e72b246083465441ce75086304e0 Mon Sep 17 00:00:00 2001
+From 741fabedf4045b35dbebccfa80d89c24fad4f2bf Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 4/8] fix mvsdio eMMC timing
@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644
 		host->clock = ios->clock;
 		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@ -1,4 +1,4 @@
-From 573ed812140e4319d2333206679e55a2f03ae632 Mon Sep 17 00:00:00 2001
+From 5f270a18f5c0df790ab877d901f904f117d93c5d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
@ -8,7 +8,7 @@ Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
 1 file changed, 56 insertions(+)

 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 2edc2bc..2445b56 100644
+index dc989a8..912be75 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@ -17,9 +17,9 @@ index 2edc2bc..2445b56 100644
 					 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 +#define MAC_ADDR_LEN                    (6)
 
- struct smsc95xx_priv {
- 	u32 mac_cr;
-@@ -75,6 +76,10 @@ static bool turbo_mode = true;
+ #define CARRIER_CHECK_DELAY (2 * HZ)
+ 
+@@ -80,6 +81,10 @@ static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
@ -30,7 +30,7 @@ index 2edc2bc..2445b56 100644
 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
 					    u32 *data, int in_pm)
 {
-@@ -764,8 +769,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
 }
 
@ -91,5 +91,5 @@ index 2edc2bc..2445b56 100644
 
 	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@ -1,4 +1,4 @@
-From c211758069c908d9d76c31f16cccaf521c42e5f0 Mon Sep 17 00:00:00 2001
+From d5be5ef162a931a20c5084a1ba8b1ee7d2d4d9f0 Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
 Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644
 	/* input mux */
 	{"Capture Source", "Line", "Line Input"},
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch
+++ b/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch
@ -1,4 +1,4 @@
-From b5e99f293a21f1d27222c9e262831588e206bfc5 Mon Sep 17 00:00:00 2001
+From 87f2ae3fe4ac7b94d44c4cdcb3ea10a75ca7c447 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 7/8] set default cubietruck led triggers
@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 8da939a..9957d5f 100644
+index 83f39b0..15e9626 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -70,6 +70,7 @@
@ -29,5 +29,5 @@ index 8da939a..9957d5f 100644
 	};
 
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/0008-USB-armory-support.patch
+++ b/core/linux-armv7/0008-USB-armory-support.patch
@ -1,17 +1,17 @@
-From 4709ed524ab21c1578e96f837c77ce23bb25c108 Mon Sep 17 00:00:00 2001
+From e8cf8d92a715bb3432685197e1a5835b6fe9207f Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 7 Feb 2015 12:32:27 +0100
 Subject: [PATCH 8/8] USB armory support

 ---
 arch/arm/boot/dts/Makefile                    |   5 +
- arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 241 ++++++++++++++++++++++++++
- arch/arm/boot/dts/imx53-usbarmory-gpio.dts    |  26 +++
- arch/arm/boot/dts/imx53-usbarmory-host.dts    |  18 ++
- arch/arm/boot/dts/imx53-usbarmory-i2c.dts     |  32 ++++
- arch/arm/boot/dts/imx53-usbarmory-spi.dts     |  45 +++++
- arch/arm/boot/dts/imx53-usbarmory.dts         |  18 ++
- 7 files changed, 385 insertions(+)
+ arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 286 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx53-usbarmory-gpio.dts    |  62 ++++++
+ arch/arm/boot/dts/imx53-usbarmory-host.dts    |  54 +++++
+ arch/arm/boot/dts/imx53-usbarmory-i2c.dts     |  68 ++++++
+ arch/arm/boot/dts/imx53-usbarmory-spi.dts     |  81 ++++++++
+ arch/arm/boot/dts/imx53-usbarmory.dts         |  54 +++++
+ 7 files changed, 610 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx53-usbarmory-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx53-usbarmory-gpio.dts
 create mode 100644 arch/arm/boot/dts/imx53-usbarmory-host.dts
@ -20,10 +20,10 @@ Subject: [PATCH 8/8] USB armory support
 create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 38c06e4..ce5c9de 100644
+index 939686c..e5cc351 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -295,6 +295,11 @@ dtb-$(CONFIG_SOC_IMX53) += \
+@@ -303,6 +303,11 @@ dtb-$(CONFIG_SOC_IMX53) += \
 	imx53-smd.dtb \
 	imx53-tx53-x03x.dtb \
 	imx53-tx53-x13x.dtb \
@ -37,18 +37,54 @@ index 38c06e4..ce5c9de 100644
 	imx6dl-apf6dev.dtb \
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
 new file mode 100644
-index 0000000..6f9ca1d
+index 0000000..ab5d00a
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,286 @@
 +/*
 + * USB armory MkI device tree include file
-+ * http://inversepath.com/usbarmory
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +#include "imx53.dtsi"
@ -81,13 +117,11 @@ index 0000000..6f9ca1d
 +
 +	soc {
 +		aips@60000000 {
-+			sahara: crypto@63ff8000 {
-+				compatible = "fsl,imx53-sahara";
-+				reg = <0x63ff8000 0x4000>;
-+				interrupts = <19 20>;
-+				clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>,
-+					 <&clks IMX5_CLK_SAHARA_IPG_GATE>;
-+				clock-names = "ipg", "ahb";
+			scc2: scc2@63fb4000 {
+				compatible = "fsl,imx53-scc2";
+				reg = <0x63fb4000 0x4000>,
+				      <0x07000000 0x4000>;
+				interrupts = <21 23>;
 +			};
 +		};
 +	};
@ -120,7 +154,7 @@ index 0000000..6f9ca1d
 +	imx53-usbarmory {
 +		led_pin_gpio4_27: led_gpio4_27@0 {
 +			fsl,pins = <
-+				MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000
+				MX53_PAD_DISP0_DAT6__GPIO4_27 0x0
 +			>;
 +		};
 +
@ -137,8 +171,8 @@ index 0000000..6f9ca1d
 +
 +		pinctrl_i2c1_pmic: i2c1grp_pmic {
 +			fsl,pins = <
-+				MX53_PAD_EIM_D21__I2C1_SCL	0xc0000000
-+				MX53_PAD_EIM_D28__I2C1_SDA	0xc0000000
+				MX53_PAD_EIM_D21__I2C1_SCL	0x0
+				MX53_PAD_EIM_D28__I2C1_SDA	0x0
 +			>;
 +		};
 +
@ -176,11 +210,26 @@ index 0000000..6f9ca1d
 +		*/
 +		pinctrl_ecspi2: ecspi2grp {
 +			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x80000000
-+				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x80000000
-+				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x80000000
-+				MX53_PAD_CSI0_DAT11__GPIO5_29		0x80000000
-+				MX53_PAD_CSI0_DAT12__GPIO5_30		0x80000000
+				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x0
+				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x0
+				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x0
+				MX53_PAD_CSI0_DAT11__GPIO5_29		0x0
+				MX53_PAD_CSI0_DAT12__GPIO5_30		0x0
+			>;
+		};
+
+		/*
+		WILC1000 wifi module pin header configuration:
+		1     2     3      4      5      6      7
+		GND   5V    SCLK   MOSI   MISO   /SS0   GPIO_IRQ
+		*/
+		pinctrl_wilc1000: wilc1000grp {
+			fsl,pins = <
+				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x0
+				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x0
+				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x0
+				MX53_PAD_CSI0_DAT11__GPIO5_29		0x0
+				MX53_PAD_CSI0_DAT12__GPIO5_30		0xc0
 +			>;
 +		};
 +
@ -191,11 +240,11 @@ index 0000000..6f9ca1d
 +		*/
 +		pinctrl_i2c1_pinheader: i2c1grp_pinheader {
 +			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__I2C1_SDA	0xc0000000
-+				MX53_PAD_CSI0_DAT9__I2C1_SCL	0xc0000000
-+				MX53_PAD_CSI0_DAT10__GPIO5_28	0x80000000
-+				MX53_PAD_CSI0_DAT11__GPIO5_29	0x80000000
-+				MX53_PAD_CSI0_DAT12__GPIO5_30	0x80000000
+				MX53_PAD_CSI0_DAT8__I2C1_SDA	0x0
+				MX53_PAD_CSI0_DAT9__I2C1_SCL	0x0
+				MX53_PAD_CSI0_DAT10__GPIO5_28	0xc0
+				MX53_PAD_CSI0_DAT11__GPIO5_29	0xc0
+				MX53_PAD_CSI0_DAT12__GPIO5_30	0xc0
 +			>;
 +		};
 +	};
@ -207,10 +256,6 @@ index 0000000..6f9ca1d
 +	status = "okay";
 +};
 +
-+&vpu {
-+	status = "okay";
-+};
-+
 +&i2c1 {
 +	pinctrl-0 = <&pinctrl_i2c1_pmic>;
 +	status = "okay";
@ -284,18 +329,54 @@ index 0000000..6f9ca1d
 +};
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-gpio.dts b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
 new file mode 100644
-index 0000000..a27c759
+index 0000000..8d54dd2
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,62 @@
 +/*
-+ * USB armory MkI device mode device tree file
-+ * http://inversepath.com/usbarmory
+ * USB armory MkI device tree file
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +/dts-v1/;
@ -316,18 +397,54 @@ index 0000000..a27c759
 +};
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-host.dts b/arch/arm/boot/dts/imx53-usbarmory-host.dts
 new file mode 100644
-index 0000000..ea2ea45
+index 0000000..d4e3b4c
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-host.dts
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,54 @@
 +/*
-+ * USB armory MkI host mode device tree file
-+ * http://inversepath.com/usbarmory
+ * USB armory MkI device tree file
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +/dts-v1/;
@ -340,18 +457,54 @@ index 0000000..ea2ea45
 +};
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-i2c.dts b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
 new file mode 100644
-index 0000000..c66bbb5
+index 0000000..158fbac
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,68 @@
 +/*
-+ * USB armory MkI device mode device tree file
-+ * http://inversepath.com/usbarmory
+ * USB armory MkI device tree file
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +/dts-v1/;
@ -378,18 +531,54 @@ index 0000000..c66bbb5
 +};
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-spi.dts b/arch/arm/boot/dts/imx53-usbarmory-spi.dts
 new file mode 100644
-index 0000000..414d641
+index 0000000..f26f7ec
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-spi.dts
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,81 @@
 +/*
-+ * USB armory MkI device mode device tree file
-+ * http://inversepath.com/usbarmory
+ * USB armory MkI device tree file
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +/dts-v1/;
@ -429,18 +618,54 @@ index 0000000..414d641
 +};
 diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
 new file mode 100644
-index 0000000..902a73b
+index 0000000..33719f7
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory.dts
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,54 @@
 +/*
-+ * USB armory MkI device mode device tree file
-+ * http://inversepath.com/usbarmory
+ * USB armory MkI device tree file
+ * https://inversepath.com/usbarmory
 + *
 + * Copyright (C) 2015, Inverse Path
 + * Andrej Rosano <andrej@inversepath.com>
 + *
-+ * Licensed under GPLv2
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
 + */
 +
 +/dts-v1/;
@ -452,5 +677,5 @@ index 0000000..902a73b
 +	status = "okay";
 +};
 -- 
-2.8.2
+2.9.0

--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@ -4,20 +4,20 @@
 buildarch=4

 pkgbase=linux-armv7
-_srcname=linux-4.6
+_srcname=linux-4.7
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.6.4
+pkgver=4.7.0
 pkgrel=1
-rcnrel=armv7-x4
+rcnrel=armv7-x0
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
-        "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
+        #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+        "http://rcn-ee.com/deb/stretch-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
        '0003-SMILE-Plug-device-tree-file.patch'
@ -31,18 +31,17 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        'kernel.its'
        'kernel.keyblock'
        'kernel_data_key.vbprivk')
-md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
-         'c8ff415734155965ae7a2a85ef9c9e03'
-         'ddb632d646205bf5c5f8d2ad2a3469d2'
-         '1b4bb8c2a33606ede339e5661f0e7fb8'
-         '8e2d392b751e5cf1862f1472d0d7a992'
-         '56ce0f700dcee0584183452d15c96b58'
-         '3a66481fa1aabbff1ed8a947d5aadc99'
-         '4864a3dc1188c51d505034932adadf92'
-         '2f7506cf70805d688a880e19e2f3e20a'
-         '276e39a7d0ff9bac45607ef4d50e0ab9'
-         '1c76d22a3281e9539222ee242da5a7fb'
-         'a9addf71c437ac6affe488e2bdf701e1'
+md5sums=('5276563eb1f39a048e4a8a887408c031'
+         '6d284108ec8beccb58d68101b1a6ad17'
+         '3c7905e0ab610fb761e98b970e878936'
+         '365ad95a61dd208b73ca63ec9ae1b5ac'
+         '47f730f34a1869cac8e23ecb318c2160'
+         'ae965a26a9dfcfa5738bda5409f8176f'
+         '789334f7f20d3e324bbadaa3215baf6a'
+         '69ea845025d4a48a6a2acfcb16bbbc43'
+         '084263ed8f4ec6b142ba62464beca4cd'
+         'a726c43d5fee117ca95f123ec89f4a11'
+         '2e9aabd54f08410c415a2ad3336f4544'
         '1813b39074d01af6548951764a0f6444'
         '4f2379ed84258050edb858ee8d281678'
         '61c5ff73c136ed07a7aadbf58db3d96a'
@ -52,7 +51,7 @@ prepare() {
  cd "${srcdir}/${_srcname}"

  # add upstream patch
-  git apply --whitespace=nowarn ../patch-${pkgver}
+  #git apply --whitespace=nowarn ../patch-${pkgver}

  # RCN patch
  git apply ../patch-${pkgver%.0}-${rcnrel}.diff
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.6.1-1 Kernel Configuration
+# Linux/arm 4.7.0-rc7-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -120,6 +120,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_NMI_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@ -159,7 +160,8 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
@ -175,6 +177,7 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
@ -223,6 +226,7 @@ CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@ -249,12 +253,16 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_BITS=8
+# CONFIG_HAVE_ARCH_HASH is not set
+# CONFIG_ISA_BUS_API is not set
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
+# CONFIG_CPU_NO_EFFICIENT_FFS is not set

 #
 # GCOV-based kernel profiling
@ -496,6 +504,7 @@ CONFIG_SOC_TI81XX=y
 # CONFIG_MACH_OMAP3_PANDORA is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+CONFIG_OMAP5_ERRATA_801819=y
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALVIEW is not set
@ -653,11 +662,13 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
+CONFIG_PCI_ECAM=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
@ -679,6 +690,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCIE_ALTERA is not set
+# CONFIG_PCIE_ARMADA_8K is not set
 # CONFIG_PCCARD is not set

 #
@ -695,8 +707,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_MCPM=y
 CONFIG_BIG_LITTLE=y
-CONFIG_BL_SWITCHER=y
-# CONFIG_BL_SWITCHER_DUMMY_IF is not set
+# CONFIG_BL_SWITCHER is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
@ -706,12 +717,9 @@ CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
-CONFIG_HAVE_PREEMPT_LAZY=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT__LL is not set
-# CONFIG_PREEMPT_RTB is not set
-# CONFIG_PREEMPT_RT_FULL is not set
+# CONFIG_PREEMPT is not set
 CONFIG_HZ_FIXED=200
 CONFIG_HZ=200
 CONFIG_SCHED_HRTICK=y
@ -741,7 +749,6 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
 CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@ -755,6 +762,7 @@ CONFIG_CMA_AREAS=7
 CONFIG_ZSWAP=y
 CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
@ -798,6 +806,7 @@ CONFIG_AUTO_ZRELADDR=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
@ -806,16 +815,19 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

 #
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_DT_BL_CPUFREQ=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y
@ -825,6 +837,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
 # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=y
+CONFIG_ARM_TI_CPUFREQ=y
 CONFIG_QORIQ_CPUFREQ=y

 #
@ -862,6 +875,7 @@ CONFIG_KERNEL_MODE_NEON=y
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
@ -997,6 +1011,8 @@ CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
@ -1360,6 +1376,7 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
 CONFIG_RDS=m
 CONFIG_RDS_RDMA=m
 CONFIG_RDS_TCP=m
@ -1389,8 +1406,6 @@ CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_HWMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@ -1706,7 +1721,7 @@ CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
+# CONFIG_RXKAD is not set
 # CONFIG_AF_KCM is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@ -1769,7 +1784,6 @@ CONFIG_NFC_SHDLC=y
 #
 # Near Field Communication (NFC) devices
 #
-CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 # CONFIG_NFC_TRF7970A is not set
 CONFIG_NFC_SIM=m
@ -1777,6 +1791,9 @@ CONFIG_NFC_PORT100=m
 # CONFIG_NFC_FDP is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MRVL=m
@ -1793,7 +1810,7 @@ CONFIG_LWTUNNEL=y
 CONFIG_DST_CACHE=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
-CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CBPF_JIT=y

 #
 # Device Drivers
@ -1804,7 +1821,8 @@ CONFIG_TEGRA_AHB=y
 #
 # Generic Driver Options
 #
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
@ -1921,6 +1939,7 @@ CONFIG_MTD_RAM=m
 CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
 CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@ -2051,7 +2070,6 @@ CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 # CONFIG_DUMMY_IRQ is not set
-CONFIG_HWLAT_DETECTOR=m
 # CONFIG_PHANTOM is not set
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
@ -2294,6 +2312,7 @@ CONFIG_ATA_BMDMA=y
 # SATA SFF controllers with BMDMA
 #
 # CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_DWC is not set
 CONFIG_SATA_MV=y
 CONFIG_SATA_NV=y
 CONFIG_SATA_PROMISE=m
@ -2407,6 +2426,7 @@ CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
+# CONFIG_ISCSI_TARGET_CXGB4 is not set
 CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
@ -2443,6 +2463,7 @@ CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
+# CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
@ -2483,13 +2504,8 @@ CONFIG_ATM_SOLOS=m
 #
 # Distributed Switch Architecture drivers
 #
-CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-# CONFIG_NET_DSA_MV88E6123 is not set
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
+# CONFIG_NET_DSA_MV88E6XXX is not set
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
@ -2632,7 +2648,6 @@ CONFIG_MLX4_DEBUG=y
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_EN_DCB=y
-CONFIG_MLX5_CORE_EN_VXLAN=y
 # CONFIG_MLXSW_CORE is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
@ -2671,6 +2686,8 @@ CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
+# CONFIG_QEDE_VXLAN is not set
+# CONFIG_QEDE_GENEVE is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000 is not set
 CONFIG_NET_VENDOR_REALTEK=y
@ -2958,7 +2975,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
 # CONFIG_IWLWIFI_PCIE_RTPM is not set

 #
@ -3379,7 +3395,6 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_NOZOMI=m
@ -3394,6 +3409,7 @@ CONFIG_DEVKMEM=y
 CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_DMA is not set
 CONFIG_SERIAL_8250_PCI=y
@ -3406,7 +3422,6 @@ CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
-# CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
 CONFIG_SERIAL_OF_PLATFORM=y

@ -3444,6 +3459,7 @@ CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+# CONFIG_SERIAL_MPS2_UART is not set
 # CONFIG_SERIAL_ARC is not set
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
@ -3630,7 +3646,6 @@ CONFIG_HSI_BOARDINFO=y
 # HSI controllers
 #
 CONFIG_OMAP_SSI=m
-CONFIG_OMAP_SSI_PORT=m

 #
 # HSI clients
@ -3756,6 +3771,7 @@ CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_PL061=y
 CONFIG_GPIO_SYSCON=y
+CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TS4800 is not set
 CONFIG_GPIO_VF610=y
 # CONFIG_GPIO_VX855 is not set
@ -3961,6 +3977,7 @@ CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
@ -4072,7 +4089,10 @@ CONFIG_IMX_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=y
 CONFIG_DOVE_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
-CONFIG_TEGRA_SOCTHERM=y
+
+#
+# ACPI INT340X thermal drivers
+#

 #
 # Texas Instruments thermal drivers
@ -4088,6 +4108,12 @@ CONFIG_DRA752_THERMAL=y
 # Samsung thermal drivers
 #
 CONFIG_EXYNOS_THERMAL=y
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=y
+CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
@ -4210,6 +4236,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 CONFIG_MFD_MAX14577=y
+# CONFIG_MFD_MAX77620 is not set
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=y
 # CONFIG_MFD_MAX77843 is not set
@ -4284,7 +4311,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_ACT8865=y
-# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AD5398=y
 CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_AS3722=y
 CONFIG_REGULATOR_AXP20X=y
@ -4292,8 +4319,8 @@ CONFIG_REGULATOR_BCM590XX=y
 CONFIG_REGULATOR_DA9052=y
 # CONFIG_REGULATOR_DA9055 is not set
 CONFIG_REGULATOR_DA9063=y
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_DA9210=y
+CONFIG_REGULATOR_DA9211=y
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL9305=y
@ -4323,6 +4350,7 @@ CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
 CONFIG_REGULATOR_PFUZE100=y
 # CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK808=y
@ -4338,7 +4366,7 @@ CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65090=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65218=y
-# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_TPS6524X=y
 CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
@ -4581,6 +4609,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_SOLO6X10=m
 CONFIG_VIDEO_TW68=m
+# CONFIG_VIDEO_TW686X is not set

 #
 # Media capture/analog TV support
@ -4665,10 +4694,10 @@ CONFIG_VIDEO_XILINX_VTC=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
-CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
-CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
 # CONFIG_VIDEO_SH_VEU is not set
 CONFIG_VIDEO_TI_VPE=m
 # CONFIG_VIDEO_TI_VPE_DEBUG is not set
@ -4729,6 +4758,7 @@ CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m

 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
@ -5047,7 +5077,6 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 #
 # ACP (Audio CoProcessor) Configuration
 #
-# CONFIG_DRM_AMD_ACP is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOUVEAU_DEBUG=5
@ -5078,11 +5107,13 @@ CONFIG_DRM_EXYNOS_DP=y
 #
 # Sub-drivers
 #
+# CONFIG_DRM_EXYNOS_G2D is not set
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 # CONFIG_DRM_EXYNOS_GSC is not set
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 CONFIG_ROCKCHIP_INNO_HDMI=m
@ -5091,6 +5122,7 @@ CONFIG_DRM_UDL=m
 # CONFIG_DRM_MGAG200 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_ARMADA=m
+CONFIG_DRM_SUN4I=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_OMAP2_DSS_INIT=y
@ -5150,10 +5182,12 @@ CONFIG_DRM_BRIDGE=y
 #
 # Display Interface Bridges
 #
+CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_NXP_PTN3460=y
 CONFIG_DRM_PARADE_PS8622=y
+CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_STI is not set
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
@ -5164,6 +5198,7 @@ CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
+# CONFIG_DRM_ARCPGU is not set

 #
 # Frame buffer Devices
@ -5453,6 +5488,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_EDMA_SOC=m
+CONFIG_SND_DAVINCI_SOC_I2S=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
 CONFIG_SND_AM33XX_SOC_EVM=m
@ -5596,6 +5632,7 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
@ -5620,6 +5657,7 @@ CONFIG_SND_SOC_WM8753=m
 # CONFIG_SND_SOC_WM8804_I2C is not set
 # CONFIG_SND_SOC_WM8804_SPI is not set
 CONFIG_SND_SOC_WM8903=m
+# CONFIG_SND_SOC_WM8960 is not set
 CONFIG_SND_SOC_WM8962=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
@ -5648,6 +5686,7 @@ CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
+# CONFIG_HID_ASUS is not set
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
@ -5772,6 +5811,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_MVEBU=y
+CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@ -5844,6 +5884,7 @@ CONFIG_USB_MICROTEK=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
@ -6093,6 +6134,8 @@ CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SIMPLE=y

 #
 # MMC/SD/SDIO Card Drivers
@ -6215,6 +6258,7 @@ CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
@ -6226,6 +6270,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 #
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
@ -6318,8 +6363,6 @@ CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=y

@ -6328,6 +6371,7 @@ CONFIG_RTC_DRV_S5M=y
 #
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
 CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1343=m
 CONFIG_RTC_DRV_DS1347=m
@ -6346,6 +6390,8 @@ CONFIG_RTC_I2C_AND_SPI=y
 #
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y

 #
 # Platform RTC drivers
@ -6442,6 +6488,11 @@ CONFIG_DW_DMAC=m
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
@ -6498,9 +6549,7 @@ CONFIG_8723AU_BT_COEXIST=y
 #
 CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
-CONFIG_ADIS16204=m
 CONFIG_ADIS16209=m
-CONFIG_ADIS16220=m
 CONFIG_ADIS16240=m
 CONFIG_LIS3L02DQ=m
 CONFIG_SCA3000=m
@ -6593,6 +6642,7 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_DVB_MN88472 is not set
 # CONFIG_VIDEO_MX3 is not set
 CONFIG_VIDEO_OMAP4=m
+# CONFIG_VIDEO_TW686X_KH is not set
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
@ -6601,17 +6651,13 @@ CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
-# CONFIG_STAGING_RDMA is not set

 #
 # Android
 #
 CONFIG_ASHMEM=y
-CONFIG_ANDROID_TIMED_OUTPUT=y
-CONFIG_ANDROID_TIMED_GPIO=m
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_SYNC=y
-# CONFIG_SW_SYNC is not set
 # CONFIG_ION is not set
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
@ -6691,6 +6737,8 @@ CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_COMMON_CLK_PALMAS=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_PXA is not set
+# CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_OXNAS is not set
 CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_CLK_CPU=y
 CONFIG_MVEBU_CLK_COREDIV=y
@ -6810,13 +6858,15 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y

 #
 # DEVFREQ Drivers
 #
-CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=y
+# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
 CONFIG_ARM_TEGRA_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
+# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_EXTCON=y

@ -6825,6 +6875,9 @@ CONFIG_EXTCON=y
 #
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_AXP288 is not set
+CONFIG_EXTCON_DT_CON=y
+CONFIG_EXTCON_DT_CON_PROXY=y
+CONFIG_EXTCON_DT_CON_GPIO=y
 CONFIG_EXTCON_GPIO=y
 CONFIG_EXTCON_MAX14577=y
 CONFIG_EXTCON_MAX3355=y
@ -6842,6 +6895,8 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_MVEBU_DEVBUS=y
 CONFIG_TEGRA20_MC=y
+CONFIG_SAMSUNG_MC=y
+CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
 CONFIG_TEGRA124_EMC=y
 CONFIG_IIO=m
@ -6955,6 +7010,9 @@ CONFIG_AD5380=m
 CONFIG_AD5421=m
 CONFIG_AD5446=m
 CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
 CONFIG_AD5686=m
@ -7020,6 +7078,7 @@ CONFIG_MAX30100=m
 #
 # Humidity sensors
 #
+CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
@ -7031,6 +7090,9 @@ CONFIG_SI7020=m
 #
 CONFIG_ADIS16400=m
 CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
 CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
@ -7046,6 +7108,7 @@ CONFIG_AL3320A=m
 CONFIG_APDS9300=m
 CONFIG_APDS9960=m
 CONFIG_BH1750=m
+CONFIG_BH1780=m
 CONFIG_CM32181=m
 CONFIG_CM3232=m
 CONFIG_CM3323=m
@ -7057,6 +7120,7 @@ CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
 CONFIG_RPR0521=m
 CONFIG_LTR501=m
+CONFIG_MAX44000=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
 CONFIG_STK3310=m
@ -7066,6 +7130,7 @@ CONFIG_SENSORS_TSL2563=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
+CONFIG_VEML6070=m

 #
 # Magnetometer sensors
@ -7073,6 +7138,8 @@ CONFIG_VCNL4000=m
 CONFIG_AK8975=m
 CONFIG_AK09911=m
 CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
 CONFIG_MAG3110=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_MMC35240=m
@ -7099,14 +7166,16 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 # Digital potentiometers
 #
+CONFIG_DS1803=m
+CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_TPL0102=m

 #
 # Pressure sensors
 #
-CONFIG_BMP280=m
 CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
 CONFIG_MPL115=m
 CONFIG_MPL115_I2C=m
 CONFIG_MPL115_SPI=m
@ -7119,6 +7188,7 @@ CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
+CONFIG_HP206C=m

 #
 # Lightning sensors
@ -7166,6 +7236,7 @@ CONFIG_ORION_IRQCHIP=y
 # CONFIG_TS4800_IRQ is not set
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
+CONFIG_LS_SCFG_MSI=y
 CONFIG_IPACK_BUS=y
 # CONFIG_BOARD_TPCI200 is not set
 # CONFIG_SERIAL_IPOCTAL is not set
@ -7201,6 +7272,7 @@ CONFIG_PHY_ROCKCHIP_USB=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_DP=y
 # CONFIG_PHY_TUSB1210 is not set
+CONFIG_PHY_TEGRA_XUSB=y
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set

@ -7288,6 +7360,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
@ -7411,7 +7484,6 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
-# CONFIG_AUFS_FS is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
@ -7623,6 +7695,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
@ -7662,7 +7735,9 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
@ -7706,6 +7781,7 @@ CONFIG_KEYS=y
 # CONFIG_BIG_KEYS is not set
 # CONFIG_TRUSTED_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=y
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@ -7717,6 +7793,7 @@ CONFIG_SECURITY_SMACK_BRINGUP=y
 # CONFIG_SECURITY_SMACK_NETFILTER is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
@ -7882,6 +7959,7 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_MXC_SCC=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@ -7890,7 +7968,6 @@ CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=m
-# CONFIG_PKCS7_TEST_KEY is not set

 #
 # Certificates for signature checking
@ -7991,5 +8068,6 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 # CONFIG_SG_SPLIT is not set
+CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_VIRTUALIZATION=y