core/linux-armv7 to 5.0.0-1

2025-01-17 23:34:07 +00:00 · 2019-03-05 04:11:36 +00:00 · 2019-03-05 04:11:36 +00:00 · e5e0438d33
commit e5e0438d33
parent b0ede85fcc
11 changed files with 228 additions and 167 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 b0383806e04f3ec9bb8c54e1ff142b03fc16ef3c Mon Sep 17 00:00:00 2001
+From aec38a2b1453395a62290dda38a5a33706d4d13d 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
--- 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 79a223586f088505b766e86b5762fb3399ab6f76 Mon Sep 17 00:00:00 2001
+From 500fa72f9dd68904807d9effd7011586e153ba6c 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
@ -17,7 +17,7 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
 1 file changed, 7 insertions(+), 1 deletion(-)

 diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
-index 41fa7316c52b..807ed160a4b9 100644
+index 330cd3c2eae5..82f3802ff695 100644
 --- a/arch/arm/boot/compressed/atags_to_fdt.c
 +++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -19,7 +19,7 @@ static int node_offset(void *fdt, const char *node_path)
@ -29,10 +29,10 @@ index 41fa7316c52b..807ed160a4b9 100644
 {
 	int offset = node_offset(fdt, node_path);
 	if (offset < 0)
-@@ -180,6 +180,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
- 					initrd_start);
- 			setprop_cell(fdt, "/chosen", "linux,initrd-end",
- 					initrd_start + initrd_size);
+@@ -203,6 +203,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
+ 			hex_str(serno, atag->u.serialnr.high);
+ 			hex_str(serno+8, atag->u.serialnr.low);
+ 			setprop_string(fdt, "/", "serial-number", serno);
 +		} else if (atag->hdr.tag == ATAG_MV_UBOOT) {
 +			/* This ATAG provides up to 4 MAC addresses */
 +			setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6);
--- 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 f1ec970d7f0ae471a18f23ce33ab00619f198d19 Mon Sep 17 00:00:00 2001
+From 25481e75ce7ac18b05d357c95e29f8f959cbe333 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 b0e966d625b9..5f63975495e0 100644
+index bd40148a15b2..97593ea828eb 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1149,6 +1149,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1175,6 +1175,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 	armada-370-db.dtb \
 	armada-370-dlink-dns327l.dtb \
 	armada-370-mirabox.dtb \
--- 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 659ffdc3f28c87dc54d3ee4d4d597f07ea4f0221 Mon Sep 17 00:00:00 2001
+From faed79b3f326e7111770a260dc9790f36e36a152 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
--- 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 76b41625a2f0bd09ad91f30bc785d238f444b178 Mon Sep 17 00:00:00 2001
+From fe27576a0c9c3e49af29b32695dbf820c5664cb3 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
@ -8,7 +8,7 @@ Subject: [PATCH 5/9] 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 f2d01cb6f958..6a39efed33ea 100644
+index e3d08626828e..2eaae00b4033 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@ -30,7 +30,7 @@ index f2d01cb6f958..6a39efed33ea 100644
 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
 					    u32 *data, int in_pm)
 {
-@@ -913,8 +918,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -911,8 +916,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);
 }
 
--- 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 227f68f9dcb5f1c50121d7fa5ba49f0715522d18 Mon Sep 17 00:00:00 2001
+From a6e2f2d8098639d0ba04591a392617bcdbd03ab6 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,10 +9,10 @@ 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 5649161de1d7..2be64a886555 100644
+index 99f531b8d2a7..534392a72621 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-@@ -80,6 +80,7 @@
+@@ -78,6 +78,7 @@
 		blue {
 			label = "cubietruck:blue:usr";
 			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
@ -20,7 +20,7 @@ index 5649161de1d7..2be64a886555 100644
 		};
 
 		orange {
-@@ -95,6 +96,7 @@
+@@ -93,6 +94,7 @@
 		green {
 			label = "cubietruck:green:usr";
 			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
--- 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 9b489a0d23c2e0e1025330f301ffde8754b81228 Mon Sep 17 00:00:00 2001
+From 3cb9a065486a4e9fc5fa0e83cd91fb86c65078c8 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
@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 2caa3132f34e..06c6ca20a969 100644
+index 3a9eb1e91c45..e990fb483905 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-@@ -423,7 +423,7 @@
+@@ -427,7 +427,7 @@
 
 			buck2_reg: BUCK2 {
 				regulator-name = "vdd_arm";
--- 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 d75f6db84386ce81fb595daab15a0425dd1f9dd7 Mon Sep 17 00:00:00 2001
+From 67be64e425bf44f5fa496833cfb32b60bc74f917 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
--- a/core/linux-armv7/0009-media-s5p-mfc-fix-incorrect-bus-assignment-in-virtua.patch
+++ b/core/linux-armv7/0009-media-s5p-mfc-fix-incorrect-bus-assignment-in-virtua.patch
@ -1,4 +1,4 @@
-From 9b6ed88a92f7f5e6b04024dcefec19c59698c5c8 Mon Sep 17 00:00:00 2001
+From 5d3a19c0fd89f6721a01c882d37a6f114337edb7 Mon Sep 17 00:00:00 2001
 From: Marek Szyprowski <m.szyprowski@samsung.com>
 Date: Mon, 7 Jan 2019 13:04:14 +0100
 Subject: [PATCH 9/9] media: s5p-mfc: fix incorrect bus assignment in virtual
@ -22,7 +22,7 @@ Tested-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
 1 file changed, 1 deletion(-)

 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
-index 927a1235408d..ca11f8a7569d 100644
+index 8a5ba3bec3af..0a9f59d89185 100644
 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
 +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1089,7 +1089,6 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@ -4,19 +4,19 @@
 buildarch=4

 pkgbase=linux-armv7
-_srcname=linux-4.20
+_srcname=linux-5.0
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.20.13
+pkgver=5.0.0
 pkgrel=1
-rcnrel=armv7-x9
+rcnrel=armv7-x2
 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"
+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://rcn-ee.com/deb/sid-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'
@ -34,19 +34,18 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        'linux.preset'
        '60-linux.hook'
        '90-linux.hook')
-md5sums=('d39dd4ba2d5861c54b90d49be19eaf31'
-         '78dfc42ffc09125aac594827977953ab'
-         '8bd39626ab6cdb64964cb13ecac27475'
-         'a9f76b75f18f89d535bbbe357c08f70e'
-         '40708505c237608fbc3923a714f8ffcb'
-         '339f1a7d7242c8639f33f6acd370f761'
-         'f276f1bfdd926516db36c81096eb6914'
-         '32ba1be48b4305dde4a3503097f1ad10'
-         '37c972c5bc79514b85846d5f1b13838a'
-         'c5fce59d890676702244170c2736dcb1'
-         '2907befef7c5dc788ceb5a99fdefd23c'
-         '2faa70647c4965b32e9f0f597614fcbf'
-         '2c592327a86b961ede5023f5370393fe'
+md5sums=('7381ce8aac80a01448e065ce795c19c0'
+         '055dbd896520b581f21287eff0fc2ff0'
+         '186d831eddea59ab5cc7c62cc4696897'
+         'd9a7a634715fa7219159573bd61d3ff7'
+         '495ec4bfb1e4a12cca55a3c9bde58bdc'
+         'f6d51f34eabdfd602ddff70bc3e7d143'
+         '4987fdc657955965451e44202eb4e5ac'
+         '9940571a36c300290c158267430c541e'
+         '5a4a3385293b0d6b156f393a2c685475'
+         'e4a4d30642990394812eb996de6705d5'
+         '21170922884a1ab0aa7d0711e1012b5f'
+         'b89208f0b9fd4df6e31ce5f11f6d1837'
         '4f2379ed84258050edb858ee8d281678'
         '61c5ff73c136ed07a7aadbf58db3d96a'
         '584777ae88bce2c5659960151b64c7d8'
@ -58,7 +57,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.20.13-1 Kernel Configuration
+# Linux/arm 5.0.0-1 Kernel Configuration
 #

 #
@ -9,6 +9,7 @@
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80201
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y

@ -41,8 +42,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y

 #
 # IRQ subsystem
@ -51,6 +50,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
@ -222,7 +222,6 @@ CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
-CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_NO_IOPORT_MAP=y
@ -371,6 +370,7 @@ CONFIG_SOC_LS1021A=y
 #
 CONFIG_SOC_IMX7D_CA7=y
 CONFIG_SOC_IMX7D=y
+CONFIG_SOC_IMX7ULP=y
 CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
@ -437,6 +437,7 @@ CONFIG_SOC_TI81XX=y
 CONFIG_OMAP5_ERRATA_801819=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S5PV210 is not set
@ -548,77 +549,6 @@ CONFIG_ARM_ERRATA_773022=y
 #
 # Bus support
 #
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_BRIDGE_EMUL=y
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-CONFIG_PCI_MVEBU=y
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_TEGRA=y
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_XILINX=y
-# CONFIG_PCI_V3_SEMI is not set
-# CONFIG_PCIE_ALTERA is not set
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-CONFIG_PCI_DRA7XX=y
-CONFIG_PCI_DRA7XX_HOST=y
-CONFIG_PCIE_DW_PLAT=y
-CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCI_IMX6=y
-# CONFIG_PCI_KEYSTONE is not set
-# CONFIG_PCI_LAYERSCAPE is not set
-# CONFIG_PCIE_ARMADA_8K is not set
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# CONFIG_PCCARD is not set

 #
 # Kernel Features
@ -790,6 +720,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@ -803,6 +734,7 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
+# CONFIG_INTEL_STRATIX10_SERVICE is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set

@ -824,6 +756,7 @@ CONFIG_CRYPTO_AES_ARM_BS=m
 # CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # CONFIG_CRYPTO_CRC32_ARM_CE is not set
 CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_VIRTUALIZATION=y
 # CONFIG_VHOST_NET is not set
 # CONFIG_VHOST_SCSI is not set
@ -923,7 +856,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
-CONFIG_BLK_WBT_SQ=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
@ -961,14 +893,6 @@ CONFIG_BLK_PM=y
 #
 # IO Schedulers
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
@ -1032,6 +956,7 @@ CONFIG_FRAME_VECTOR=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y

 #
 # Networking options
@ -1203,9 +1128,6 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@ -1425,7 +1347,6 @@ CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=m
@ -1968,6 +1889,80 @@ CONFIG_HAVE_EBPF_JIT=y
 #
 CONFIG_ARM_AMBA=y
 CONFIG_TEGRA_AHB=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_BRIDGE_EMUL=y
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_MVEBU=y
+
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCIE_CADENCE_HOST is not set
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_XILINX=y
+# CONFIG_PCI_V3_SEMI is not set
+# CONFIG_PCIE_ALTERA is not set
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_HOST=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCI_IMX6=y
+# CONFIG_PCI_KEYSTONE is not set
+# CONFIG_PCI_LAYERSCAPE is not set
+# CONFIG_PCIE_ARMADA_8K is not set
+# CONFIG_PCI_MESON is not set
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set

 #
 # Generic Driver Options
@ -2041,7 +2036,6 @@ CONFIG_GNSS_SIRF_SERIAL=m
 CONFIG_GNSS_UBX_SERIAL=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
@ -2050,6 +2044,7 @@ CONFIG_MTD_AR7_PARTS=m
 #
 # Partition parsers
 #
+# CONFIG_MTD_REDBOOT_PARTS is not set

 #
 # User Modules And Translation Layers
@ -2103,8 +2098,8 @@ 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_PHYSMAP_OF_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@ -2227,6 +2222,7 @@ CONFIG_BLK_DEV_NVME=m
 # CONFIG_NVME_MULTIPATH is not set
 # CONFIG_NVME_RDMA is not set
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set

 #
@ -2258,6 +2254,7 @@ CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_PVPANIC is not set
 CONFIG_TIEQEP=m
 CONFIG_UDOO_ARD=m
 # CONFIG_C2PORT is not set
@ -2322,6 +2319,7 @@ CONFIG_ALTERA_STAPL=m
 #
 CONFIG_BEAGLEBONE_PINMUX_HELPER=m
 # CONFIG_ECHO is not set
+# CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
 CONFIG_HAVE_IDE=y
@ -2335,7 +2333,6 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y

 #
@ -2674,7 +2671,7 @@ CONFIG_NET_DSA_BCM_SF2=m
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 # CONFIG_NET_DSA_MT7530 is not set
 CONFIG_NET_DSA_MV88E6060=m
-# CONFIG_MICROCHIP_KSZ is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
@ -2961,6 +2958,7 @@ CONFIG_TI_CPSW=y
 CONFIG_TI_CPTS=y
 CONFIG_TI_CPTS_MOD=y
 CONFIG_TLAN=m
+CONFIG_TI_PRUETH=m
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
@ -3096,6 +3094,7 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
 CONFIG_WLAN=y
 # CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
@ -3332,10 +3331,10 @@ CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PEARL_PCIE=m
+# CONFIG_QTNFMAC_PCIE is not set
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_VIRT_WIFI is not set

 #
 # WiMAX Wireless Broadband devices
@ -3535,6 +3534,7 @@ CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
@ -3661,6 +3661,7 @@ CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_OLPC_APSP is not set
 CONFIG_SERIO_SUN4I_PS2=m
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
@ -3760,6 +3761,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_VIRTIO_CONSOLE=y
@ -3893,6 +3895,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I3C is not set
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@ -3930,6 +3933,7 @@ CONFIG_SPI_S3C64XX=y
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
+# CONFIG_SPI_MXIC is not set
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@ -3979,13 +3983,14 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_AXP209=y
 # CONFIG_PINCTRL_AMD is not set
-CONFIG_PINCTRL_MCP23S08=m
+# CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_ZYNQ=y
 # CONFIG_PINCTRL_RK805 is not set
+# CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX50=y
@ -3997,6 +4002,7 @@ CONFIG_PINCTRL_IMX6SLL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_IMX6UL=y
 CONFIG_PINCTRL_IMX7D=y
+CONFIG_PINCTRL_IMX7ULP=y
 CONFIG_PINCTRL_VF610=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_DOVE=y
@ -4051,6 +4057,7 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
 CONFIG_GPIO_RASPBERRYPI_EXP=y
+# CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_DAVINCI=y
 CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_EXAR is not set
@ -4065,6 +4072,7 @@ CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
 CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TS4800 is not set
@ -4323,6 +4331,7 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
@ -4417,10 +4426,6 @@ CONFIG_ROCKCHIP_THERMAL=y
 CONFIG_DOVE_THERMAL=y
 CONFIG_ARMADA_THERMAL=y

-#
-# ACPI INT340X thermal drivers
-#
-
 #
 # Broadcom thermal drivers
 #
@ -4692,6 +4697,7 @@ CONFIG_REGULATOR_MAX77802=y
 CONFIG_REGULATOR_MC13XXX_CORE=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
+# CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MT6311 is not set
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=y
@ -4762,6 +4768,7 @@ CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SIR=m
+# CONFIG_RC_XBOX_DVD is not set
 CONFIG_MEDIA_SUPPORT=y

 #
@ -4782,7 +4789,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_PCI_SKELETON is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
@ -5045,6 +5051,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_CADENCE is not set
+# CONFIG_VIDEO_ASPEED is not set
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
@ -5061,6 +5068,7 @@ CONFIG_VIDEO_AM437X_VPFE=m
 CONFIG_VIDEO_XILINX=m
 CONFIG_VIDEO_XILINX_TPG=m
 CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_VIDEO_SUN6I_CSI=m
 # CONFIG_VIDEO_TI_CAL is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=m
@ -5584,6 +5592,16 @@ CONFIG_DRM_TILCDC=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
@ -5604,10 +5622,12 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
@ -5615,6 +5635,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y

@ -5632,7 +5653,7 @@ CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
+CONFIG_DRM_TOSHIBA_TC358764=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TI_SN65DSI86 is not set
@ -5645,6 +5666,7 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
 # CONFIG_DRM_STI is not set
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
@ -5664,6 +5686,7 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_TINYDRM=m
 CONFIG_TINYDRM_MIPI_DBI=m
+CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
@ -5942,11 +5965,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # 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
 CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_DESIGNWARE_PCM is not set

@ -5979,15 +5997,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 # CONFIG_SND_I2S_HI6210_I2S is not set
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_SDMA_SOC=m
-CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
-CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 # CONFIG_SND_SOC_IMG is not set
@ -6001,6 +6010,7 @@ CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 # CONFIG_SND_MESON_AXG_TDMOUT is not set
 # CONFIG_SND_MESON_AXG_SOUND_CARD is not set
 # CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+# CONFIG_SND_MESON_AXG_SPDIFIN is not set
 # CONFIG_SND_MESON_AXG_PDM is not set
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
@ -6050,6 +6060,30 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m
 CONFIG_SND_SOC_TEGRA_SGTL5000=m
+
+#
+# Audio support for Texas Instruments SoCs
+#
+CONFIG_SND_SOC_TI_EDMA_PCM=m
+CONFIG_SND_SOC_TI_SDMA_PCM=m
+
+#
+# Texas Instruments DAI support for:
+#
+CONFIG_SND_SOC_DAVINCI_MCASP=m
+CONFIG_SND_SOC_OMAP_DMIC=m
+CONFIG_SND_SOC_OMAP_MCBSP=m
+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_OMAP3_PANDORA=m
+CONFIG_SND_SOC_OMAP3_TWL4030=m
+CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_SOC_OMAP_HDMI=m
+# CONFIG_SND_SOC_XILINX_I2S is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
@ -6064,6 +6098,7 @@ CONFIG_SND_SOC_WM_HUBS=m
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
@ -6773,6 +6808,7 @@ CONFIG_MMC_BCM2835=y
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
 CONFIG_MMC_SDHCI_OMAP=y
+# CONFIG_MMC_SDHCI_AM654 is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set

@ -6869,6 +6905,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
@ -7115,7 +7152,7 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
+# CONFIG_UIO_PRUSS is not set
 CONFIG_UIO_MF624=m
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
@ -7205,7 +7242,6 @@ CONFIG_ADE7854_SPI=m
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S90=m
 CONFIG_AD2S1210=m
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
@ -7230,6 +7266,7 @@ CONFIG_VIDEO_IMX_CSI=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_VIDEO_OMAP4=m
+CONFIG_VIDEO_ROCKCHIP_VPU=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_TEGRA_VDE=m
@ -7239,7 +7276,6 @@ CONFIG_TEGRA_VDE=m
 #
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
-# CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_GS_FPGABOOT=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@ -7332,6 +7368,7 @@ CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_PALMAS=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
+CONFIG_MXC_CLK=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_COMMON_CLK_AMLOGIC=y
 CONFIG_COMMON_CLK_REGMAP_MESON=y
@ -7394,6 +7431,7 @@ CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_CLKSRC_IMX_TPM=y
 CONFIG_MAILBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_IMX_MBOX is not set
@ -7435,6 +7473,7 @@ CONFIG_IMX_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=y
 # CONFIG_KEYSTONE_REMOTEPROC is not set
+CONFIG_PRUSS_REMOTEPROC=m

 #
 # Rpmsg drivers
@ -7443,6 +7482,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+CONFIG_RPMSG_PRU=m
 # CONFIG_SOUNDWIRE is not set

 #
@ -7452,7 +7492,8 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
-# CONFIG_MESON_CANVAS is not set
+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_MX_SOCINFO=y
@ -7471,7 +7512,7 @@ CONFIG_FSL_GUTS=y
 #
 # i.MX SoC drivers
 #
-CONFIG_IMX7_PM_DOMAINS=y
+CONFIG_IMX_GPCV2_PM_DOMAINS=y

 #
 # Qualcomm SoC drivers
@ -7495,6 +7536,7 @@ CONFIG_SOC_TI=y
 # CONFIG_KEYSTONE_NAVIGATOR_DMA is not set
 CONFIG_AMX3_PM=y
 CONFIG_WKUP_M3_IPC=y
+CONFIG_TI_PRUSS=m

 #
 # Xilinx SoC drivers
@ -7545,9 +7587,11 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TI_EMIF_SRAM=y
 CONFIG_MVEBU_DEVBUS=y
+CONFIG_PL353_SMC=y
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA124_EMC=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
@ -7608,6 +7652,7 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
 CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
@ -7617,6 +7662,7 @@ CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
 CONFIG_AD7923=m
+CONFIG_AD7949=m
 CONFIG_AD799X=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
@ -7741,6 +7787,7 @@ CONFIG_MCP4725=m
 CONFIG_MCP4922=m
 CONFIG_TI_DAC082S085=m
 CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
 CONFIG_VF610_DAC=m

 #
@ -7867,6 +7914,7 @@ CONFIG_TSL2772=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
@ -7889,6 +7937,9 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m

 #
 # Multiplexers
@ -7919,6 +7970,7 @@ CONFIG_MAX5487=m
 CONFIG_MCP4018=m
 CONFIG_MCP4131=m
 CONFIG_MCP4531=m
+CONFIG_MCP41010=m
 CONFIG_TPL0102=m

 #
@ -7972,6 +8024,7 @@ CONFIG_VL53L0X_I2C=m
 #
 # Resolver to digital converters
 #
+CONFIG_AD2S90=m
 CONFIG_AD2S1200=m

 #
@ -8023,6 +8076,7 @@ CONFIG_IRQ_CROSSBAR=y
 CONFIG_IMX_GPCV2=y
 CONFIG_LS_SCFG_MSI=y
 CONFIG_MESON_IRQ_GPIO=y
+CONFIG_IMX_IRQSTEER=y
 CONFIG_IPACK_BUS=y
 # CONFIG_BOARD_TPCI200 is not set
 # CONFIG_SERIAL_IPOCTAL is not set
@ -8032,6 +8086,7 @@ CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON=y
 # CONFIG_RESET_MESON_AUDIO_ARB is not set
 CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SOCFPGA=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=y
 CONFIG_RESET_ZYNQ=y
@ -8048,6 +8103,8 @@ CONFIG_PHY_MESON_GXL_USB2=y
 CONFIG_PHY_MESON_GXL_USB3=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
@ -8081,6 +8138,7 @@ CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=y
 CONFIG_PHY_TUSB1210=m
 CONFIG_TWL4030_USB=y
+CONFIG_PHY_TI_GMII_SEL=y
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set

@ -8348,7 +8406,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
@ -8575,6 +8632,8 @@ CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m

 #
 # Hash modes
@ -8604,6 +8663,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_STREEBOG is not set
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m

@ -8657,6 +8717,7 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
@ -8776,6 +8837,7 @@ CONFIG_HAS_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_DMA_REMAP=y
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
@ -8797,7 +8859,6 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set

@ -8852,6 +8913,8 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@ -8955,7 +9018,6 @@ CONFIG_UNWINDER_ARM=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_VF_UART_PORT=1
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"