core/linux-armv7 to 4.14.0-1

2025-01-27 23:44:04 +00:00 · 2017-11-14 03:53:15 +00:00 · 2017-11-14 03:53:15 +00:00 · 5e503bdca2
commit 5e503bdca2
parent 63ecc6c9c5
11 changed files with 234 additions and 173 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 81e89a314fb1e70274c2ec72013ba0a076de55dd Mon Sep 17 00:00:00 2001
+From 043141070b13388a29ce9f73d1378db6fee9ea00 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 979ff4016404..d1d0c1950fa4 100644
 };
 
 -- 
-2.13.0
+2.14.2

--- 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 e62b74b84f4b146e0b82d6acf1c043dc599ea884 Mon Sep 17 00:00:00 2001
+From 278772450de941a06782c07a43e7511b6bdbf430 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 9448aa0c6686..ac7b6ae6c00f 100644
 	}
 
 -- 
-2.13.0
+2.14.2

--- 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 8a920b8030a9a677dd6d38cf0305e7bf63617a61 Mon Sep 17 00:00:00 2001
+From db678c33357f6349df02b0f4979fc8c9ee365697 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 9c5e1d944d1c..342ed08ab225 100644
+index faf46abaa4a2..aecdcfa7a67b 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -985,6 +985,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1010,6 +1010,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.13.0
+2.14.2

--- 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 9ef8feb3e1a701eacd6979653511e1b13b095697 Mon Sep 17 00:00:00 2001
+From 1b4696de4df2ebd2d2a0da05a284705e11427e06 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 58d74b8d6c79..c9715530d676 100644
 		host->clock = ios->clock;
 		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.13.0
+2.14.2

--- 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 d52a089f2564db419f6a9b4109ccda69e847793d Mon Sep 17 00:00:00 2001
+From ffd117b73c6a0185d3089ec9abee06122e88eecb 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 765400b62168..ee3212f887e3 100644
+index 309b88acd3d0..7bc9feb891a1 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@ -91,5 +91,5 @@ index 765400b62168..ee3212f887e3 100644
 
 	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.13.0
+2.14.2

--- 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 6a5a573951f166fdda2d2daa235207f32d9bec92 Mon Sep 17 00:00:00 2001
+From e2567ba6352c663819406b73d4aa3aa31ad4ca06 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 102903e83bd2..40ce78704e8f 100644
+index 852a0aa24dce..82c963629a55 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -69,6 +69,7 @@
@ -29,5 +29,5 @@ index 102903e83bd2..40ce78704e8f 100644
 	};
 
 -- 
-2.13.0
+2.14.2

--- 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 65265b8379903a8dd95489616fde0126d10bd4ef Mon Sep 17 00:00:00 2001
+From dc9e6fcc9675737091fb99550b361aea81a94b90 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,7 +13,7 @@ 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 0f1ff792fe44..a6fc2a53522f 100644
+index 102acd78be15..5b65992e5667 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -423,7 +423,7 @@
@ -26,5 +26,5 @@ index 0f1ff792fe44..a6fc2a53522f 100644
 				regulator-always-on;
 				regulator-boot-on;
 -- 
-2.13.0
+2.14.2

--- a/core/linux-armv7/0008-disable-USB3-port-on-ODROID-XU.patch
+++ b/core/linux-armv7/0008-disable-USB3-port-on-ODROID-XU.patch
@ -1,4 +1,4 @@
-From 800ac49ce45ca2500e2455194d155d5d20f633e0 Mon Sep 17 00:00:00 2001
+From c5b29f6344d0e5da1d5ef64e4e7e5ed4937541be Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 25 Feb 2017 19:39:51 -0700
 Subject: [PATCH 8/9] disable USB3 port on ODROID-XU
@ -23,5 +23,5 @@ index c4de1353e5df..f80fa58995c5 100644
 
 &usbdrd_dwc3_1 {
 -- 
-2.13.0
+2.14.2

--- a/core/linux-armv7/0009-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ b/core/linux-armv7/0009-ARM-dove-enable-ethernet-on-D3Plug.patch
@ -1,4 +1,4 @@
-From 04cbef0366837832994a3dd25661d28afe0d65a4 Mon Sep 17 00:00:00 2001
+From 43fc6d48884feb1d121bef1dd64ab444b5c46169 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
 Subject: [PATCH 9/9] ARM: dove: enable ethernet on D3Plug
@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 7 insertions(+)

 diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts
-index f5f59bb5a534..b0ad0bbf6818 100644
+index e88ff83f1dec..5004f09d76b7 100644
 --- a/arch/arm/boot/dts/dove-d3plug.dts
 +++ b/arch/arm/boot/dts/dove-d3plug.dts
@@ -60,6 +60,13 @@
@ -27,5 +27,5 @@ index f5f59bb5a534..b0ad0bbf6818 100644
 /* Samsung M8G2F eMMC */
 &sdio0 {
 -- 
-2.13.0
+2.14.2

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

 pkgbase=linux-armv7
-_srcname=linux-4.13
+_srcname=linux-4.14
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.13.11
+pkgver=4.14.0
 pkgrel=1
-rcnrel=armv7-x2
+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://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"
        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@ -33,19 +33,18 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        'kernel_data_key.vbprivk'
        'linux.preset'
        '99-linux.hook')
-md5sums=('ab1a2abc6f37b752dd2595338bec4e78'
-         'f03030893fae6a5620ba1056a9e3b931'
-         'f68c070e2fac7c82e983670c316d334b'
-         '722bc867ef5285e2719ce3e526425a65'
-         'c2e8438c4e7a93bb8fbf1576f23773f7'
-         'def3e95ff11cffe49d4624f4e00b59a2'
-         'bfe387475c4c42551dadd6d4aeb724ee'
-         'bd455ff6f763350f2f7c723141d90803'
-         '125c70a670250e1db8771a828daaef61'
-         'ff5f4ca7f97b8ebfbb09ec76363e71ec'
-         'f9282ee13ad2c393c462ef20b143ae22'
-         '9fb6cef04dd98e38094803c56e9c453b'
-         'fd5fdf1b25968f09ea2564ff67f7a16f'
+md5sums=('bacdb9ffdcd922aa069a5e1520160e24'
+         'cebb22526e0d05b8575d99cc965ee98f'
+         'a9a96c56f83a0190a55511bf340774e1'
+         '0783eff6ee3c3e69d860468ea350a091'
+         '98c229baab4561144eb37210a20283a1'
+         'a5a7083d247fd3827fe22b06b78f909c'
+         '33067cc37863c18b4bc1820020c83859'
+         '2dbc0a7f497085917711f3a0cc6aa66e'
+         '1073c8192dc512674ccbf923334c5b79'
+         'c1712dcecd00d08884cf2e078159b023'
+         '90d0639b90925ad2e79cc26a7ec51e58'
+         'be40c005af1bc2a7d4a1c22bfb251b4a'
         '4f2379ed84258050edb858ee8d281678'
         '61c5ff73c136ed07a7aadbf58db3d96a'
         '584777ae88bce2c5659960151b64c7d8'
@ -56,7 +55,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.13.9-1 Kernel Configuration
+# Linux/arm 4.14.0-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -66,6 +66,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
@ -188,6 +189,7 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@ -218,6 +220,7 @@ CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_SLAB_FREELIST_HARDENED is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
@ -348,6 +351,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y

 #
 # IO Schedulers
@ -1094,14 +1098,12 @@ CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_INLINE=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=m

@ -1184,6 +1186,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NETFILTER_XTABLES=m

 #
@ -1638,6 +1641,7 @@ CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
+# CONFIG_NET_NSH is not set
 CONFIG_HSR=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
@ -1651,6 +1655,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_STREAM_PARSER=y
 CONFIG_NET_FLOW_LIMIT=y

 #
@ -1725,57 +1730,6 @@ CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_8DEV_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-# CONFIG_IRNET is not set
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-# CONFIG_VLSI_FIR is not set
-CONFIG_MCS_FIR=m
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@ -1808,7 +1762,6 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
@ -1826,7 +1779,7 @@ CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=y
 # CONFIG_AF_KCM is not set
-# CONFIG_STREAM_PARSER is not set
+CONFIG_STREAM_PARSER=y
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@ -1922,7 +1875,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
-CONFIG_HAVE_CBPF_JIT=y
+CONFIG_HAVE_EBPF_JIT=y

 #
 # Device Drivers
@ -2159,7 +2112,7 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
-# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@ -2680,6 +2633,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_BNX2X=m
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
+CONFIG_BNXT_FLOWER_OFFLOAD=y
 # CONFIG_BNXT_DCB is not set
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
@ -2738,8 +2692,10 @@ CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HNS is not set
 # CONFIG_HNS_DSAF is not set
 # CONFIG_HNS_ENET is not set
+# CONFIG_HNS3 is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
 CONFIG_E1000=m
@ -2778,6 +2734,8 @@ CONFIG_MLX4_DEBUG=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_FPGA is not set
 CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_CORE_EN_DCB=y
 # CONFIG_MLX5_CORE_IPOIB is not set
 # CONFIG_MLXSW_CORE is not set
@ -2821,6 +2779,7 @@ CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
@ -2887,8 +2846,12 @@ CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
 CONFIG_NET_VENDOR_WIZNET=y
-# CONFIG_WIZNET_W5100 is not set
+CONFIG_WIZNET_W5100=m
 # CONFIG_WIZNET_W5300 is not set
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
@ -2939,6 +2902,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
+CONFIG_ROCKCHIP_PHY=m
 CONFIG_SMSC_PHY=y
 CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
@ -3042,10 +3006,12 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_AHB is not set
 # CONFIG_ATH10K_SDIO is not set
+# CONFIG_ATH10K_USB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
 CONFIG_WCN36XX=m
@ -3498,6 +3464,8 @@ CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_RK805_PWRKEY is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_DA9052_ONKEY=m
 CONFIG_INPUT_DA9055_ONKEY=m
@ -3540,6 +3508,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_SUN4I_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 CONFIG_GAMEPORT=m
 # CONFIG_GAMEPORT_NS558 is not set
@ -3645,6 +3614,7 @@ CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_MESON=m
 # CONFIG_NVRAM is not set
@ -3715,6 +3685,7 @@ CONFIG_I2C_ALGOPCA=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_ALTERA is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_CADENCE=y
 # CONFIG_I2C_CBUS_GPIO is not set
@ -3875,6 +3846,7 @@ CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_ZYNQ=y
+# CONFIG_PINCTRL_RK805 is not set
 CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX50=y
@ -4032,6 +4004,7 @@ CONFIG_W1_SLAVE_DS2408_READBACK=y
 CONFIG_W1_SLAVE_DS2413=m
 CONFIG_W1_SLAVE_DS2406=m
 CONFIG_W1_SLAVE_DS2423=m
+# CONFIG_W1_SLAVE_DS2805 is not set
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
@ -4040,7 +4013,6 @@ CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_POWER_RESET=y
@ -4075,14 +4047,17 @@ CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
 CONFIG_BATTERY_DA9052=m
 CONFIG_CHARGER_AXP20X=m
 CONFIG_BATTERY_AXP20X=m
 CONFIG_AXP20X_POWER=y
+CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1721X is not set
 CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_CHARGER_ISP1704=m
@ -4203,6 +4178,7 @@ CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 # CONFIG_SENSORS_IR35221 is not set
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
@ -4213,6 +4189,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_TPS40422=m
+# CONFIG_SENSORS_TPS53679 is not set
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_ZL6100=m
@ -4387,10 +4364,6 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@ -4415,6 +4388,7 @@ CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 CONFIG_MFD_BCM590XX=y
+# CONFIG_MFD_BD9571MWV is not set
 CONFIG_MFD_AC100=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
@ -4599,52 +4573,8 @@ CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_REGULATOR_WM8994=y
 CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_SUPPORT=y
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CEC_RC=y
-CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_VIDEO_DEV=y
-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
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=y
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=y
+CONFIG_CEC_PIN=y
+CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
@ -4673,10 +4603,56 @@ CONFIG_IR_TTUSBIR=m
 CONFIG_IR_RX51=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
+CONFIG_IR_PWM_TX=m
 CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_IR_SIR is not set
+CONFIG_IR_SIR=m
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_VIDEO_DEV=y
+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
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_CORE=y
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=16
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+
+#
+# Media drivers
+#
 CONFIG_MEDIA_USB_SUPPORT=y

 #
@ -4915,6 +4891,7 @@ CONFIG_DVB_MANTIS=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
@ -4954,6 +4931,7 @@ CONFIG_VIDEO_TI_CSC=m
 CONFIG_DVB_PLATFORM_DRIVERS=y
 CONFIG_DVB_C8SECTPFE=m
 CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 # CONFIG_SDR_PLATFORM_DRIVERS is not set

@ -5007,7 +4985,7 @@ CONFIG_SMS_SIANO_RC=y
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m

 #
 # Audio decoders, processors and mixers
@ -5099,7 +5077,6 @@ CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
@ -5148,7 +5125,10 @@ CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
 CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
 CONFIG_DVB_M88DS3103=m

 #
@ -5339,7 +5319,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_EXYNOS=m
-CONFIG_DRM_EXYNOS_IOMMU=y

 #
 # CRTCs
@ -5379,6 +5358,7 @@ CONFIG_DRM_ARMADA=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN8I_MIXER=m
 CONFIG_DRM_OMAP=m
@ -5415,7 +5395,7 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
 # CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set
 CONFIG_DRM_TILCDC=m
-CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
+# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
@ -5424,6 +5404,7 @@ CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_DRM_STM=y
+# CONFIG_DRM_STM_DSI is not set
 CONFIG_DRM_PANEL=y

 #
@ -5464,6 +5445,7 @@ CONFIG_DRM_I2C_ADV7533=y
 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_STI is not set
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
@ -5471,6 +5453,7 @@ CONFIG_DRM_IMX_TVE=m
 CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_VC4=m
+CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 # CONFIG_DRM_ARCPGU is not set
@ -5889,6 +5872,7 @@ CONFIG_SND_SOC_CS42L51=m
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 # CONFIG_SND_SOC_DIO2125 is not set
@ -5946,6 +5930,7 @@ CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
 # CONFIG_SND_SOC_WM8580 is not set
 # CONFIG_SND_SOC_WM8711 is not set
 # CONFIG_SND_SOC_WM8728 is not set
@ -6495,7 +6480,6 @@ CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=y
@ -6507,6 +6491,7 @@ CONFIG_SDIO_UART=m
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
@ -6531,6 +6516,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=y
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_MVSDIO=y
+CONFIG_MMC_SPI=y
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=y
 CONFIG_MMC_DW=y
@ -6576,6 +6562,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 # LED drivers
 #
 # CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
 CONFIG_LEDS_BCM6328=m
 CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_LM3530=m
@ -6592,6 +6579,7 @@ CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_LP8501=m
 CONFIG_LEDS_LP8860=m
 CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_DAC124S085=m
@ -6641,6 +6629,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_USER_ACCESS is not set
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
@ -6829,6 +6818,7 @@ CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
 CONFIG_AMBA_PL08X=y
 CONFIG_AXI_DMAC=y
 CONFIG_DMA_BCM2835=y
@ -6900,6 +6890,57 @@ CONFIG_VIRTIO_MMIO=m
 #
 # CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_STAGING=y
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+# CONFIG_IRNET is not set
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+# CONFIG_VLSI_FIR is not set
+CONFIG_MCS_FIR=m
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
 CONFIG_RTL8192U=m
@ -6912,6 +6953,7 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
+# CONFIG_R8822BE is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@ -7031,7 +7073,6 @@ CONFIG_LNET_MAX_PAYLOAD=1048576
 CONFIG_LNET_SELFTEST=m
 CONFIG_LNET_XPRT_IB=m
 CONFIG_LUSTRE_FS=m
-CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
 CONFIG_LUSTRE_TRANSLATE_ERRNOS=y
 # CONFIG_DGNC is not set
@ -7090,6 +7131,7 @@ CONFIG_VIDEO_BCM2835=m
 # USB Power Delivery and Type-C drivers
 #
 # CONFIG_TYPEC_TCPM is not set
+# CONFIG_PI433 is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC_CHARDEV=y
@ -7105,6 +7147,7 @@ CONFIG_ICST=y
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
+# CONFIG_CLK_HSDK is not set
 CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SI5351=y
@ -7138,6 +7181,7 @@ CONFIG_DOVE_CLK=y
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
@ -7146,6 +7190,7 @@ CONFIG_SUN8I_A83T_CCU=y
 CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUN8I_V3S_CCU=y
 CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_R40_CCU=y
 CONFIG_SUN9I_A80_CCU=y
 CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
@ -7214,14 +7259,14 @@ CONFIG_OMAP_IOMMU=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_EXYNOS_IOMMU=y
-# CONFIG_EXYNOS_IOMMU_DEBUG is not set
+# CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y

 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+CONFIG_IMX_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=y
 # CONFIG_KEYSTONE_REMOTEPROC is not set
@ -7238,6 +7283,11 @@ CONFIG_RPMSG_VIRTIO=m
 # SOC (System On Chip) specific Drivers
 #

+#
+# Amlogic SoC drivers
+#
+CONFIG_MESON_GX_SOCINFO=y
+
 #
 # Broadcom SoC drivers
 #
@ -7249,6 +7299,10 @@ CONFIG_FSL_GUTS=y
 # i.MX SoC drivers
 #
 CONFIG_IMX7_PM_DOMAINS=y
+
+#
+# Qualcomm SoC drivers
+#
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@ -7260,6 +7314,7 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TEGRA_PMC=y
 CONFIG_SOC_TI=y
@ -7293,7 +7348,7 @@ CONFIG_EXTCON=y
 # Extcon Device Drivers
 #
 # CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_AXP288 is not set
+CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=y
 CONFIG_EXTCON_MAX14577=y
 CONFIG_EXTCON_MAX3355=y
@ -7303,6 +7358,7 @@ CONFIG_EXTCON_PALMAS=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
+# CONFIG_EXTCON_USBC_CROS_EC is not set
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_TI_AEMIF=y
@ -7380,12 +7436,14 @@ CONFIG_AD799X=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
+CONFIG_DLN2_ADC=m
 CONFIG_ENVELOPE_DETECTOR=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_HI8435=m
 CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
 CONFIG_IMX7D_ADC=m
+CONFIG_LTC2471=m
 CONFIG_LTC2485=m
 CONFIG_LTC2497=m
 CONFIG_MAX1027=m
@ -7426,6 +7484,7 @@ CONFIG_AD8366=m
 # Chemical Sensors
 #
 CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_CCS811=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@ -7745,8 +7804,8 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_ATH79 is not set
 # CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_GEMINI is not set
 CONFIG_RESET_IMX7=y
+# CONFIG_RESET_LANTIQ is not set
 # CONFIG_RESET_LPC18XX is not set
 CONFIG_RESET_MESON=y
 # CONFIG_RESET_PISTACHIO is not set
@ -7768,6 +7827,7 @@ CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
+# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@ -7818,13 +7878,11 @@ CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_NVMEM_VF610_OCOTP=y
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
-
-#
-# FPGA Configuration Support
-#
 CONFIG_FPGA=m
 CONFIG_FPGA_REGION=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
+# CONFIG_FPGA_MGR_ALTERA_CVP is not set
+# CONFIG_FPGA_MGR_ALTERA_PS_SPI is not set
 CONFIG_FPGA_MGR_SOCFPGA=m
 CONFIG_FPGA_MGR_SOCFPGA_A10=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
@ -8037,6 +8095,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
@ -8059,7 +8118,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
@ -8304,6 +8362,7 @@ CONFIG_RING_BUFFER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+# CONFIG_DMA_API_DEBUG is not set

 #
 # Runtime Testing
@ -8326,17 +8385,16 @@ CONFIG_TRACING_SUPPORT=y
 # 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
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
-# CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_TEST_KMOD is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
@ -8557,7 +8615,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_CRYPTO_DEV_OMAP=m
@ -8570,6 +8627,7 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
@ -8624,9 +8682,10 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC4 is not set
-CONFIG_CRC7=m
+CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
+CONFIG_XXHASH=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@ -8636,6 +8695,8 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set
@ -8686,6 +8747,7 @@ CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
 CONFIG_VIRTUALIZATION=y
 # CONFIG_VHOST_NET is not set
 # CONFIG_VHOST_SCSI is not set