From e09abb00ffa3451f6c6a5845254bf23a211d6a1f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 26 Nov 2019 02:33:07 +0000
Subject: [PATCH] core/linux-armv7 to 5.4.0-1

---
 ...ags-add-support-for-Marvell-s-u-boot.patch |   4 +-
 ...trieve-MAC-addresses-from-Marvell-bo.patch |   4 +-
 .../0003-SMILE-Plug-device-tree-file.patch    |   8 +-
 .../0004-fix-mvsdio-eMMC-timing.patch         |   4 +-
 ...ow-mac-address-to-be-set-as-a-parame.patch |   4 +-
 ...-set-default-cubietruck-led-triggers.patch |   6 +-
 ...d-set-higher-minimum-buck2-regulator.patch |   4 +-
 ...8-ARM-dove-enable-ethernet-on-D3Plug.patch |   4 +-
 .../0009-USB-Armory-MkII-support.patch        |  14 +-
 core/linux-armv7/PKGBUILD                     |  37 ++--
 core/linux-armv7/config                       | 181 +++++++++++-------
 11 files changed, 156 insertions(+), 114 deletions(-)

diff --git 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
index 5aa8ac6da..074903c47 100644
--- 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 7e6e05267a620ba306a999982e685de549316c1d Mon Sep 17 00:00:00 2001
+From 88f69b1dcdda406ba9e4c6ad51f0577623d238b1 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644
  };
  
 -- 
-2.22.0
+2.23.0
 
diff --git 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
index cb71b2f2f..546120041 100644
--- 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 b59d7aa4ef5ee2411cb65395dac623ed598095b6 Mon Sep 17 00:00:00 2001
+From cb931641740269a78b002b438904292a1110a5a7 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -43,5 +43,5 @@ index 330cd3c2eae5..82f3802ff695 100644
  	}
  
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch
index 8ab6b76b8..b07e149b7 100644
--- 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 0d1cf24a03256d2a666e720babcd174ae97bfddb Mon Sep 17 00:00:00 2001
+From 8dc29eb34efbef2aa3ce6e499cea11765286ffbd 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/9] 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 9159fa2cea90..b73aca44d87a 100644
+index b21b3a64641a..a0f92b9dbd7d 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1206,6 +1206,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1216,6 +1216,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch
index a114fabb3..791a546d6 100644
--- 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 a3c359493c03401d2f40c6536d7715260d83d50b Mon Sep 17 00:00:00 2001
+From 579d132a05177e4b85d3ff2321762948fd78b420 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/9] fix mvsdio eMMC timing
@@ -34,5 +34,5 @@ index 74a0a7fbbf7f..92eadb116762 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.22.0
+2.23.0
 
diff --git 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
index b3b0bedc4..e95960163 100644
--- 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 244e51135d32faaa70f40a083be88bf8e6f184dd Mon Sep 17 00:00:00 2001
+From 585c73f82751043ebcf1e097a29bb9c6d2c3fbd1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
@@ -91,5 +91,5 @@ index 355be77f4241..c94a7193e0b9 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch
index 4fb0e57ae..efbbb49c4 100644
--- a/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch
+++ b/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch
@@ -1,4 +1,4 @@
-From 146490c16460ae11321acaafc6bff5b99c7e9392 Mon Sep 17 00:00:00 2001
+From 8fb925eac047386a298303e501042a0fd30e9ef9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 6/9] 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 99f531b8d2a7..534392a72621 100644
+index 8c8dee6ea461..4f52a11b913e 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -78,6 +78,7 @@
@@ -29,5 +29,5 @@ index 99f531b8d2a7..534392a72621 100644
  	};
  
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 664e54e21..40413f479 100644
--- a/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,4 +1,4 @@
-From 4d87a361938887b04909018827f861a51b0f4dc4 Mon Sep 17 00:00:00 2001
+From 054ac5f337ad4f79b22c9b191dc47f001722f0d6 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator
@@ -26,5 +26,5 @@ index ea55f377d17c..a7bfc58bbc79 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
index 6a48dd41b..b1687bf5c 100644
--- a/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ b/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
@@ -1,4 +1,4 @@
-From 7e2691572ccf30a35c91f1c79b6e85f1c0817c68 Mon Sep 17 00:00:00 2001
+From 8b696580b73c7f6e7f3e9635bd2ad1c5c59e9082 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
 Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug
@@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644
  /* Samsung M8G2F eMMC */
  &sdio0 {
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/0009-USB-Armory-MkII-support.patch b/core/linux-armv7/0009-USB-Armory-MkII-support.patch
index d6bdea885..4c8f8fed3 100644
--- a/core/linux-armv7/0009-USB-Armory-MkII-support.patch
+++ b/core/linux-armv7/0009-USB-Armory-MkII-support.patch
@@ -1,4 +1,4 @@
-From c4035052543c9d990ea439a1a1b4cc28c335196a Mon Sep 17 00:00:00 2001
+From 55e7015aa06dd943b55a0101beddae1c811a2be5 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 11 Aug 2019 12:34:17 -0600
 Subject: [PATCH 9/9] USB Armory MkII support
@@ -12,10 +12,10 @@ Subject: [PATCH 9/9] USB Armory MkII support
  create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b73aca44d87a..f45a644a2e9e 100644
+index a0f92b9dbd7d..5d6e9f76f6db 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -577,9 +577,11 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -580,9 +580,11 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
  	imx6ul-tx6ul-0010.dtb \
  	imx6ul-tx6ul-0011.dtb \
  	imx6ul-tx6ul-mainboard.dtb \
@@ -24,9 +24,9 @@ index b73aca44d87a..f45a644a2e9e 100644
  	imx6ull-colibri-eval-v3.dtb \
  	imx6ull-colibri-wifi-eval-v3.dtb \
 +	imx6ull-usbarmory.dtb \
- 	imx6ulz-14x14-evk.dtb
- dtb-$(CONFIG_SOC_IMX7D) += \
- 	imx7d-cl-som-imx7.dtb \
+ 	imx6ull-phytec-segin-ff-rdk-nand.dtb \
+ 	imx6ull-phytec-segin-ff-rdk-emmc.dtb \
+ 	imx6ull-phytec-segin-lc-rdk-nand.dtb \
 diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts
 new file mode 100644
 index 000000000000..3936ef8a64f1
@@ -551,5 +551,5 @@ index 000000000000..85cf30bff527
 +	status = "okay";
 +};
 -- 
-2.22.0
+2.23.0
 
diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 9085da004..83f7fd14e 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -4,20 +4,20 @@
 buildarch=4
 
 pkgbase=linux-armv7
-_srcname=linux-5.3
+_srcname=linux-5.4
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=5.3.13
+pkgver=5.4.0
 pkgrel=1
-rcnver=5.3.10
-rcnrel=armv7-x15
+rcnver=5.4.0
+rcnrel=armv7-x8
 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/v5.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+        #"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
         "http://rcn-ee.com/deb/sid-armhf/v${rcnver}-${rcnrel}/patch-${rcnver%.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'
@@ -35,19 +35,18 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook')
-md5sums=('c99feaade8047339528fb066ec5f8a49'
-         '9d1a403e339e9468ed70d80b6c1efcee'
-         'b0ace7b931676ee21cecda644a579b6b'
-         'f989c450907a0af28867b38dc0a1112e'
-         '884c3ef691a300cd2b0c704d795130c3'
-         'd9ab3a3d50a3684b6f13c5c1c8c23dbe'
-         '65449dc8fa2b45522135899c5e8acaed'
-         'c5a2831b832c726ba65077b69a8bc8e7'
-         '196a7cb2a570808dabfd22066646dbab'
-         '118d67de1d31194435b5564c36b0c57f'
-         '7334902800f72a0d17c26bef373d2c49'
-         '065e0eb93091edeea111c1c1f6e8fb44'
-         '3198b0e50f5075f17f75ab0c8efed639'
+md5sums=('ce9b2d974d27408a61c53a30d3f98fb9'
+         '8906e5bfc7fab33d4db3584c3816282e'
+         '8741125da5769dec5e2e677e79921873'
+         'c73bd92dfb373cfe747b37388ab79215'
+         'e25db57fa5c4068a4f488d8e60fcf952'
+         '1d740e2ebda8f1cfe3f7f6ac3ec87d8d'
+         'f33ddfc782a5efbad6a6a1f8e11328ed'
+         'a30ab4aecf7d39a5643f390ccda3c6d3'
+         '5ab56d2bf2422714f82e586d1440a835'
+         '20ce2ab46d910316fe00e70ddfb06130'
+         'b209fbb5ea8c5eecb9afa7b77c450f7f'
+         '38953deeb5f01372bb6b6ed14d8660a9'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -59,7 +58,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-${rcnver%.0}-${rcnrel}.diff
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index f8ac30acc..ae206cd06 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.3.7-1 Kernel Configuration
+# Linux/arm 5.4.0-1 Kernel Configuration
 #
 
 #
@@ -11,6 +11,7 @@ CONFIG_GCC_VERSION=80300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -272,19 +273,13 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 
 #
@@ -303,6 +298,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
+# CONFIG_ARCH_ASPEED is not set
 # CONFIG_ARCH_AT91 is not set
 CONFIG_ARCH_BCM=y
 
@@ -686,6 +682,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 #
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
 # CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
 # CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
@@ -693,6 +690,7 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 CONFIG_ARM_IMX_CPUFREQ_DT=y
 # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TI_CPUFREQ=y
@@ -713,6 +711,7 @@ CONFIG_DT_IDLE_STATES=y
 # ARM CPU Idle Drivers
 #
 CONFIG_ARM_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE=y
 # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 CONFIG_ARM_ZYNQ_CPUIDLE=y
@@ -778,6 +777,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_TRUSTED_FOUNDATIONS=y
+# CONFIG_TURRIS_MOX_RWTM is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
@@ -861,6 +861,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -908,6 +909,8 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_COMPRESS=y
 CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_UNUSED_SYMBOLS=y
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_SCSI_REQUEST=y
@@ -920,6 +923,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
@@ -1565,7 +1569,6 @@ CONFIG_NET_DSA_TAG_DSA=m
 CONFIG_NET_DSA_TAG_EDSA=m
 # CONFIG_NET_DSA_TAG_MTK is not set
 # CONFIG_NET_DSA_TAG_KSZ is not set
-# CONFIG_NET_DSA_TAG_KSZ9477 is not set
 # CONFIG_NET_DSA_TAG_QCA is not set
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
@@ -1693,6 +1696,7 @@ CONFIG_NET_ACT_TUNNEL_KEY=m
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
+# CONFIG_NET_TC_SKB_EXT is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1767,6 +1771,7 @@ CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
 CONFIG_CAN_ISOTP=m
 
 #
@@ -1779,6 +1784,7 @@ CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GRCAN=m
+# CONFIG_CAN_KVASER_PCIEFD is not set
 CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_XILINXCAN=m
@@ -2114,6 +2120,7 @@ CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PORT_CTRL=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_MOXTET is not set
 CONFIG_IMX_WEIM=y
 CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_INTERCONNECT=y
@@ -2135,13 +2142,13 @@ CONFIG_GNSS_SIRF_SERIAL=m
 CONFIG_GNSS_UBX_SERIAL=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_AR7_PARTS=m
 
 #
 # Partition parsers
 #
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # end of Partition parsers
@@ -2213,7 +2220,6 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 # CONFIG_MTD_DATAFLASH_OTP is not set
-CONFIG_MTD_M25P80=y
 # CONFIG_MTD_MCHP23K256 is not set
 CONFIG_MTD_SST25L=y
 # CONFIG_MTD_SLRAM is not set
@@ -2257,6 +2263,7 @@ CONFIG_MTD_NAND_VF610_NFC=y
 CONFIG_MTD_NAND_MXC=m
 # CONFIG_MTD_NAND_DAVINCI is not set
 CONFIG_MTD_NAND_SUNXI=y
+# CONFIG_MTD_NAND_MXIC is not set
 # CONFIG_MTD_NAND_TEGRA is not set
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_GPIO is not set
@@ -2351,7 +2358,6 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_PHANTOM is not set
-CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=y
@@ -2691,6 +2697,7 @@ CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
@@ -2703,6 +2710,7 @@ CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
@@ -2804,6 +2812,7 @@ CONFIG_NET_DSA_BCM_SF2=m
 # CONFIG_NET_DSA_MT7530 is not set
 CONFIG_NET_DSA_MV88E6060=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
@@ -2980,6 +2989,7 @@ CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_CORE_EN_DCB=y
 # CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
 CONFIG_NET_VENDOR_MICREL=y
@@ -3018,12 +3028,12 @@ CONFIG_NET_VENDOR_OKI=y
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLCNIC_DCB=y
 CONFIG_QLCNIC_HWMON=y
-CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
@@ -3135,6 +3145,7 @@ CONFIG_LED_TRIGGER_PHY=y
 # MII PHY device drivers
 #
 CONFIG_SFP=m
+# CONFIG_ADIN_PHY is not set
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 # CONFIG_AX88796B_PHY is not set
@@ -3258,6 +3269,7 @@ CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
+# CONFIG_ATH9K_PCI_NO_EEPROM is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_ATH9K_HWRNG=y
@@ -3356,7 +3368,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_PCIE_RTPM is not set
 
 #
 # Debugging Options
@@ -3634,6 +3645,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_PSXPAD_SPI=m
 CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_FSIA6B=m
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
@@ -3791,7 +3803,6 @@ CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_IMS_PCU=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
-# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
@@ -3870,6 +3881,7 @@ CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
@@ -3877,7 +3889,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_MOXA is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
@@ -3920,6 +3931,7 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_SERIAL_MVEBU_UART is not set
@@ -3960,6 +3972,8 @@ CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+
 #
 # I2C support
 #
@@ -4339,6 +4353,7 @@ CONFIG_W1_MASTER_MXC=m
 # CONFIG_W1_MASTER_DS1WM is not set
 CONFIG_W1_MASTER_GPIO=m
 CONFIG_HDQ_MASTER_OMAP=m
+# CONFIG_W1_MASTER_SGI is not set
 # end of 1-wire Bus Masters
 
 #
@@ -4357,6 +4372,7 @@ CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
 CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
@@ -4461,6 +4477,7 @@ CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AS370=m
 CONFIG_SENSORS_ASC7621=m
 # CONFIG_SENSORS_ASPEED is not set
 CONFIG_SENSORS_ATXP1=m
@@ -4538,6 +4555,7 @@ CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 # CONFIG_SENSORS_IBM_CFFPS is not set
+CONFIG_SENSORS_INSPUR_IPSPS=m
 CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_IR38064=m
 CONFIG_SENSORS_IRPS5401=m
@@ -4561,7 +4579,7 @@ CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_RASPBERRYPI_HWMON=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
-# CONFIG_SENSORS_SHT3x is not set
+CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
@@ -4577,7 +4595,6 @@ CONFIG_SENSORS_SCH5636=m
 # CONFIG_SENSORS_STTS751 is not set
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
@@ -4706,6 +4723,7 @@ CONFIG_TWL4030_WATCHDOG=m
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_IMX2_WDT=m
+# CONFIG_IMX7ULP_WDT is not set
 CONFIG_TEGRA_WATCHDOG=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 CONFIG_MESON_WATCHDOG=m
@@ -4768,8 +4786,7 @@ CONFIG_MFD_AC100=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
-CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_CHARDEV=m
+CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MADERA is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_PMIC_DA903X is not set
@@ -4945,6 +4962,7 @@ CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_STPMIC1=y
 CONFIG_REGULATOR_TI_ABB=y
 CONFIG_REGULATOR_SY8106A=y
+# CONFIG_REGULATOR_SY8824X is not set
 CONFIG_REGULATOR_TPS51632=y
 CONFIG_REGULATOR_TPS62360=y
 CONFIG_REGULATOR_TPS65023=y
@@ -5020,6 +5038,7 @@ CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2_I2C=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
@@ -5300,6 +5319,7 @@ CONFIG_VIDEO_AM437X_VPFE=m
 CONFIG_VIDEO_XILINX=m
 CONFIG_VIDEO_XILINX_TPG=m
 CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_VIDEO_SUN4I_CSI=m
 CONFIG_VIDEO_SUN6I_CSI=m
 # CONFIG_VIDEO_TI_CAL is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5408,7 +5428,7 @@ CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5428,12 +5448,12 @@ CONFIG_VIDEO_SAA6588=m
 # CONFIG_VIDEO_ADV748X is not set
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
 # CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
+CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
 # CONFIG_VIDEO_TVP514X is not set
@@ -5443,7 +5463,7 @@ CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
 # CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
+CONFIG_VIDEO_VPX3220=m
 
 #
 # Video and audio decoders
@@ -5455,9 +5475,9 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
 # CONFIG_VIDEO_AD9389B is not set
@@ -5481,6 +5501,7 @@ CONFIG_VIDEO_OV2640=m
 # CONFIG_VIDEO_OV5647 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
 # CONFIG_VIDEO_OV5695 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV772X is not set
@@ -5501,8 +5522,8 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9V011=m
 # CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
@@ -5788,6 +5809,7 @@ CONFIG_TEGRA_HOST1X=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM=y
+CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM is not set
@@ -5917,12 +5939,6 @@ CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 # CONFIG_DRM_OMAP_PANEL_DSI_CM is not set
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
-# CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
-# CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set
 # end of OMAPDRM External Display Device Drivers
 
 CONFIG_DRM_TILCDC=m
@@ -5961,12 +5977,16 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 # CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
@@ -5977,9 +5997,13 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # end of Display Panels
@@ -6029,13 +6053,11 @@ CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 # CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_MXS=y
 CONFIG_DRM_MXSFB=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
-CONFIG_DRM_TINYDRM=m
-CONFIG_TINYDRM_MIPI_DBI=m
+CONFIG_DRM_GM12U320=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
@@ -6309,6 +6331,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_ALIGNED_MMIO=y
 CONFIG_SND_HDA_PREALLOC_SIZE=2048
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
@@ -6460,7 +6483,7 @@ CONFIG_SND_SOC_OMAP_MCPDM=m
 #
 # Audio support for boards with Texas Instruments SoCs
 #
-# CONFIG_SND_SOC_NOKIA_RX51 is not set
+CONFIG_SND_SOC_NOKIA_RX51=m
 CONFIG_SND_SOC_OMAP3_PANDORA=m
 CONFIG_SND_SOC_OMAP3_TWL4030=m
 CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
@@ -6591,6 +6614,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS454 is not set
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
+# CONFIG_SND_SOC_UDA1334 is not set
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
@@ -6665,6 +6689,7 @@ CONFIG_HID_CORSAIR=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
@@ -6773,6 +6798,9 @@ CONFIG_I2C_HID=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=y
+# CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
@@ -6790,9 +6818,6 @@ CONFIG_USB_OTG_FSM=y
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
 #
 # USB Host Controller Drivers
@@ -6828,8 +6853,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_U132_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
 # CONFIG_USB_IMX21_HCD is not set
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
@@ -6880,6 +6903,7 @@ CONFIG_USBIP_VHCI_NR_HCS=8
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
+# CONFIG_USB_CDNS3 is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@@ -7155,18 +7179,12 @@ CONFIG_USB_G_HID=m
 CONFIG_USB_G_WEBCAM=m
 # CONFIG_TYPEC is not set
 CONFIG_USB_ROLE_SWITCH=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=y
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=16
+CONFIG_MMC_BLOCK_MINORS=256
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
@@ -7182,6 +7200,7 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
+# CONFIG_MMC_SDHCI_OF_ASPEED is not set
 CONFIG_MMC_SDHCI_OF_AT91=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
@@ -7332,6 +7351,7 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 # CONFIG_EDAC_LAYERSCAPE is not set
 # CONFIG_EDAC_ALTERA is not set
+# CONFIG_EDAC_ARMADA_XP is not set
 # CONFIG_EDAC_SYNOPSYS is not set
 # CONFIG_EDAC_TI is not set
 CONFIG_RTC_LIB=y
@@ -7356,7 +7376,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # I2C RTC drivers
 #
 CONFIG_RTC_DRV_ABB5ZES3=m
-# CONFIG_RTC_DRV_ABEOZ9 is not set
+CONFIG_RTC_DRV_ABEOZ9=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_AS3722=y
@@ -7371,6 +7391,7 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_RTC_DRV_RK808=y
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -7462,6 +7483,7 @@ CONFIG_RTC_DRV_CROS_EC=y
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=y
+CONFIG_RTC_DRV_FSL_FTM_ALARM=y
 # CONFIG_RTC_DRV_MESON is not set
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_HAVE_S3C_RTC=y
@@ -7541,6 +7563,7 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_SELFTESTS is not set
 # end of DMABUF options
 
 CONFIG_AUXDISPLAY=y
@@ -7579,6 +7602,7 @@ CONFIG_VIRTIO_MMIO=m
 #
 # end of Microsoft Hyper-V guest support
 
+# CONFIG_GREYBUS is not set
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
@@ -7672,7 +7696,6 @@ CONFIG_SERIO_NVEC_PS2=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
-CONFIG_I2C_BCM2048=m
 # CONFIG_VIDEO_HANTRO is not set
 CONFIG_VIDEO_IMX_MEDIA=m
 
@@ -7735,15 +7758,12 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
-CONFIG_FB_FLEX=m
-# CONFIG_FB_TFT_FBTFT_DEVICE is not set
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
 CONFIG_WILC1000_SPI=m
 # CONFIG_WILC1000_HW_OOB_INTR is not set
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
-# CONFIG_GREYBUS is not set
 CONFIG_BCM_VIDEOCORE=y
 CONFIG_BCM2835_VCHIQ=y
 CONFIG_SND_BCM2835=m
@@ -7756,9 +7776,17 @@ CONFIG_VIDEO_BCM2835=m
 # end of Gasket devices
 
 # CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_EROFS_FS is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_KPC2000 is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DONT_MOUNT_VFAT=y
 CONFIG_EXFAT_DISCARD=y
@@ -7767,12 +7795,16 @@ CONFIG_EXFAT_DISCARD=y
 # CONFIG_EXFAT_DEBUG_MSG is not set
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_QLGE=m
 # CONFIG_GOLDFISH is not set
+CONFIG_MFD_CROS_EC=y
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_EC_CHARDEV=y
 CONFIG_CROS_EC_LIGHTBAR=m
 CONFIG_CROS_EC_VBC=m
 CONFIG_CROS_EC_DEBUGFS=m
@@ -7810,7 +7842,7 @@ CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_CLK_BCM2835=y
-# CONFIG_CLK_RASPBERRYPI is not set
+CONFIG_CLK_RASPBERRYPI=y
 CONFIG_MXC_CLK=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_COMMON_CLK_MESON_REGMAP=y
@@ -7957,6 +7989,7 @@ CONFIG_MESON_CANVAS=m
 CONFIG_MESON_CLK_MEASURE=y
 # CONFIG_MESON_GX_SOCINFO is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
+CONFIG_MESON_EE_PM_DOMAINS=y
 CONFIG_MESON_MX_SOCINFO=y
 # end of Amlogic SoC drivers
 
@@ -7993,6 +8026,7 @@ CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_CHIPID=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
@@ -8033,6 +8067,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 #
 # CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
 CONFIG_ARM_TEGRA_DEVFREQ=y
+# CONFIG_ARM_TEGRA20_DEVFREQ is not set
 # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
 CONFIG_PM_DEVFREQ_EVENT=y
 # CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
@@ -8367,6 +8402,7 @@ CONFIG_SI7020=m
 # Inertial measurement units
 #
 CONFIG_ADIS16400=m
+CONFIG_ADIS16460=m
 CONFIG_ADIS16480=m
 CONFIG_BMI160=m
 CONFIG_BMI160_I2C=m
@@ -8410,6 +8446,7 @@ CONFIG_LTR501=m
 CONFIG_LV0104CS=m
 CONFIG_MAX44000=m
 CONFIG_MAX44009=m
+CONFIG_NOA1305=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
 CONFIG_SI1133=m
@@ -8482,6 +8519,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 CONFIG_AD5272=m
 CONFIG_DS1803=m
+CONFIG_MAX5432=m
 CONFIG_MAX5481=m
 CONFIG_MAX5487=m
 CONFIG_MCP4018=m
@@ -8819,6 +8857,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -8836,6 +8877,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
+# CONFIG_VIRTIO_FS is not set
 CONFIG_OVERLAY_FS=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -8966,7 +9008,7 @@ CONFIG_ROMFS_ON_MTD=y
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
-# CONFIG_AUFS_FS is not set
+# CONFIG_EROFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y
@@ -8995,7 +9037,6 @@ CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_NFSD_FAULT_INJECTION=y
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -9115,6 +9156,7 @@ CONFIG_SECURITY_SMACK_BRINGUP=y
 # CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
 # CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
@@ -9198,10 +9240,7 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
+CONFIG_CRYPTO_AEGIS128_SIMD=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -9220,6 +9259,7 @@ CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_NHPOLY1305=m
 CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
 
 #
 # Hash modes
@@ -9246,6 +9286,7 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
@@ -9257,6 +9298,7 @@ CONFIG_CRYPTO_WP512=m
 #
 # Ciphers
 #
+CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_ANUBIS=m
@@ -9268,6 +9310,7 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
@@ -9339,6 +9382,7 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
 # CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
+# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -9494,10 +9538,9 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_INSTALL is not set
-# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set