Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24

81 files changed, 772 insertions, 1088 deletions

diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
deleted file mode 100644
index 262c960b8..000000000
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 2a54526850121cd0d7cf649a321488b4dab5731d Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Fri, 26 Oct 2012 12:36:24 -0400
-Subject: [PATCH 17/20] KEYS: Add a system blacklist keyring
-
-This adds an additional keyring that is used to store certificates that
-are blacklisted.  This keyring is searched first when loading signed modules
-and if the module's certificate is found, it will refuse to load.  This is
-useful in cases where third party certificates are used for module signing.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- certs/system_keyring.c        | 22 ++++++++++++++++++++++
- include/keys/system_keyring.h |  4 ++++
- init/Kconfig                  |  9 +++++++++
- 3 files changed, 35 insertions(+)
-
-diff --git a/certs/system_keyring.c b/certs/system_keyring.c
-index 50979d6dcecd..787eeead2f57 100644
---- a/certs/system_keyring.c
-+++ b/certs/system_keyring.c
-@@ -22,6 +22,9 @@ static struct key *builtin_trusted_keys;
- #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
- static struct key *secondary_trusted_keys;
- #endif
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+struct key *system_blacklist_keyring;
-+#endif
- 
- extern __initconst const u8 system_certificate_list[];
- extern __initconst const unsigned long system_certificate_list_size;
-@@ -99,6 +102,16 @@ static __init int system_trusted_keyring_init(void)
- 	if (key_link(secondary_trusted_keys, builtin_trusted_keys) < 0)
- 		panic("Can't link trusted keyrings\n");
- #endif
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+	system_blacklist_keyring = keyring_alloc(".system_blacklist_keyring",
-+			KUIDT_INIT(0), KGIDT_INIT(0), current_cred(),
-+			((KEY_POS_ALL & ~KEY_POS_SETATTR) |
-+			 KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH),
-+			KEY_ALLOC_NOT_IN_QUOTA,
-+			NULL, NULL);
-+	if (IS_ERR(system_blacklist_keyring))
-+		panic("Can't allocate system blacklist keyring\n");
-+#endif
- 
- 	return 0;
- }
-@@ -214,6 +227,15 @@ int verify_pkcs7_signature(const void *data, size_t len,
- 		trusted_keys = builtin_trusted_keys;
- #endif
- 	}
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+	ret = pkcs7_validate_trust(pkcs7, system_blacklist_keyring);
-+	if (!ret) {
-+		/* module is signed with a cert in the blacklist.  reject */
-+		pr_err("Module key is in the blacklist\n");
-+		ret = -EKEYREJECTED;
-+		goto error;
-+	}
-+#endif
- 	ret = pkcs7_validate_trust(pkcs7, trusted_keys);
- 	if (ret < 0) {
- 		if (ret == -ENOKEY)
-diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
-index fbd4647767e9..5bc291a3d261 100644
---- a/include/keys/system_keyring.h
-+++ b/include/keys/system_keyring.h
-@@ -33,6 +33,10 @@ extern int restrict_link_by_builtin_and_secondary_trusted(
- #define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted
- #endif
- 
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+extern struct key *system_blacklist_keyring;
-+#endif
-+
- #ifdef CONFIG_IMA_BLACKLIST_KEYRING
- extern struct key *ima_blacklist_keyring;
- 
-diff --git a/init/Kconfig b/init/Kconfig
-index 34407f15e6d3..461ad575a608 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1859,6 +1859,15 @@ config SYSTEM_DATA_VERIFICATION
- 	  module verification, kexec image verification and firmware blob
- 	  verification.
- 
-+config SYSTEM_BLACKLIST_KEYRING
-+	bool "Provide system-wide ring of blacklisted keys"
-+	depends on KEYS
-+	help
-+	  Provide a system keyring to which blacklisted keys can be added.
-+	  Keys in the keyring are considered entirely untrusted.  Keys in this
-+	  keyring are used by the module signature checking to reject loading
-+	  of modules signed with a blacklisted key.
-+
- config PROFILING
- 	bool "Profiling support"
- 	help
--- 
-2.9.3
-
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index 76084d472..e5b531215 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -55,8 +55,8 @@ index 5bc291a3d261..56ff5715ab67 100644
 --- a/include/keys/system_keyring.h
 +++ b/include/keys/system_keyring.h
 @@ -36,6 +36,7 @@ extern int restrict_link_by_builtin_and_secondary_trusted(
- #ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
- extern struct key *system_blacklist_keyring;
+ 	return 0;
+ }
  #endif
 +extern struct key *get_system_keyring(void);
  
diff --git a/arm64-hikey-fixes.patch b/arm64-hikey-fixes.patch
index 18bc05b2b..a698ac122 100644
--- a/arm64-hikey-fixes.patch
+++ b/arm64-hikey-fixes.patch
@@ -34,44 +34,3 @@ index 35ce53e..d5e5229 100644
  postcore_initcall(hi6220_reset_init);
 +
 +MODULE_LICENSE("GPL v2");
-From patchwork Mon Apr  3 05:28:42 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2,1/2] regulator: hi655x: Describe consumed platform device
-From: Jeremy Linton <lintonrjeremy@gmail.com>
-X-Patchwork-Id: 9658793
-Message-Id: <20170403052843.12711-2-lintonrjeremy@gmail.com>
-To: linux-kernel@vger.kernel.org
-Cc: broonie@kernel.org, lgirdwood@gmail.com, puck.chen@hisilicon.com,
- lee.jones@linaro.org, Jeremy Linton <lintonrjeremy@gmail.com>
-Date: Mon,  3 Apr 2017 00:28:42 -0500
-
-The hi655x-regulator driver consumes a similarly named platform device.
-Adding that to the module device table, allows modprobe to locate this
-driver once the device is created.
-
-Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com>
----
- drivers/regulator/hi655x-regulator.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c
-index 065c100..36ae54b 100644
---- a/drivers/regulator/hi655x-regulator.c
-+++ b/drivers/regulator/hi655x-regulator.c
-@@ -214,7 +214,14 @@ static int hi655x_regulator_probe(struct platform_device *pdev)
- 	return 0;
- }
- 
-+static const struct platform_device_id hi655x_regulator_table[] = {
-+	{ .name = "hi655x-regulator" },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(platform, hi655x_regulator_table);
-+
- static struct platform_driver hi655x_regulator_driver = {
-+	.id_table = hi655x_regulator_table,
- 	.driver = {
- 		.name	= "hi655x-regulator",
- 	},
diff --git a/baseconfig/CONFIG_BACKLIGHT_ARCXCNN b/baseconfig/CONFIG_BACKLIGHT_ARCXCNN
new file mode 100644
index 000000000..49161963d
--- /dev/null
+++ b/baseconfig/CONFIG_BACKLIGHT_ARCXCNN
@@ -0,0 +1 @@
+CONFIG_BACKLIGHT_ARCXCNN=m
diff --git a/baseconfig/CONFIG_DM_INTEGRITY b/baseconfig/CONFIG_DM_INTEGRITY
new file mode 100644
index 000000000..ee953fd2d
--- /dev/null
+++ b/baseconfig/CONFIG_DM_INTEGRITY
@@ -0,0 +1 @@
+CONFIG_DM_INTEGRITY=m
diff --git a/baseconfig/CONFIG_DRM_DW_HDMI_AHB_AUDIO b/baseconfig/CONFIG_DRM_DW_HDMI_AHB_AUDIO
new file mode 100644
index 000000000..5c276f1dc
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_DW_HDMI_AHB_AUDIO
@@ -0,0 +1 @@
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
diff --git a/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO b/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO
index 34ecaf242..d1f777db4 100644
--- a/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO
+++ b/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO
@@ -1 +1 @@
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
diff --git a/baseconfig/CONFIG_DRM_FBDEV_OVERALLOC b/baseconfig/CONFIG_DRM_FBDEV_OVERALLOC
new file mode 100644
index 000000000..32e5c4520
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_FBDEV_OVERALLOC
@@ -0,0 +1 @@
+CONFIG_DRM_FBDEV_OVERALLOC=100
diff --git a/baseconfig/CONFIG_DRM_LVDS_ENCODER b/baseconfig/CONFIG_DRM_LVDS_ENCODER
new file mode 100644
index 000000000..e2ea277b3
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_LVDS_ENCODER
@@ -0,0 +1 @@
+# CONFIG_DRM_LVDS_ENCODER is not set
diff --git a/baseconfig/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW b/baseconfig/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
new file mode 100644
index 000000000..7aa3826f4
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
@@ -0,0 +1 @@
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
diff --git a/baseconfig/CONFIG_DRM_PANEL_LVDS b/baseconfig/CONFIG_DRM_PANEL_LVDS
new file mode 100644
index 000000000..af4bf6e01
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_PANEL_LVDS
@@ -0,0 +1 @@
+# CONFIG_DRM_PANEL_LVDS is not set
diff --git a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 b/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
new file mode 100644
index 000000000..8cb5243d1
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
@@ -0,0 +1 @@
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
diff --git a/baseconfig/x86/i686/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 b/baseconfig/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
index 9d584f6ab..9d584f6ab 100644
--- a/baseconfig/x86/i686/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
+++ b/baseconfig/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
diff --git a/baseconfig/x86/i686/CONFIG_DRM_PANEL_SHARP_LS043T1LE01 b/baseconfig/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
index 64dedb057..64dedb057 100644
--- a/baseconfig/x86/i686/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
+++ b/baseconfig/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
diff --git a/baseconfig/CONFIG_DRM_PANEL_SITRONIX_ST7789V b/baseconfig/CONFIG_DRM_PANEL_SITRONIX_ST7789V
new file mode 100644
index 000000000..712cb79a7
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_PANEL_SITRONIX_ST7789V
@@ -0,0 +1 @@
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
diff --git a/baseconfig/CONFIG_DRM_RCAR_DW_HDMI b/baseconfig/CONFIG_DRM_RCAR_DW_HDMI
new file mode 100644
index 000000000..d3dace0e8
--- /dev/null
+++ b/baseconfig/CONFIG_DRM_RCAR_DW_HDMI
@@ -0,0 +1 @@
+# CONFIG_DRM_RCAR_DW_HDMI is not set
diff --git a/baseconfig/CONFIG_I2C_MUX_LTC4306 b/baseconfig/CONFIG_I2C_MUX_LTC4306
new file mode 100644
index 000000000..f7c16456c
--- /dev/null
+++ b/baseconfig/CONFIG_I2C_MUX_LTC4306
@@ -0,0 +1 @@
+CONFIG_I2C_MUX_LTC4306=m
diff --git a/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON b/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON
new file mode 100644
index 000000000..8bb21d01a
--- /dev/null
+++ b/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON
@@ -0,0 +1 @@
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
diff --git a/baseconfig/CONFIG_MFD_TI_LMU b/baseconfig/CONFIG_MFD_TI_LMU
new file mode 100644
index 000000000..4a84e3fd0
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_TI_LMU
@@ -0,0 +1 @@
+# CONFIG_MFD_TI_LMU is not set
diff --git a/baseconfig/CONFIG_REGULATOR_TPS65132 b/baseconfig/CONFIG_REGULATOR_TPS65132
new file mode 100644
index 000000000..b82a99f6c
--- /dev/null
+++ b/baseconfig/CONFIG_REGULATOR_TPS65132
@@ -0,0 +1 @@
+# CONFIG_REGULATOR_TPS65132 is not set
diff --git a/baseconfig/CONFIG_REGULATOR_VCTRL b/baseconfig/CONFIG_REGULATOR_VCTRL
new file mode 100644
index 000000000..478bc6400
--- /dev/null
+++ b/baseconfig/CONFIG_REGULATOR_VCTRL
@@ -0,0 +1 @@
+CONFIG_REGULATOR_VCTRL=m
diff --git a/baseconfig/CONFIG_SND_DESIGNWARE_PCM b/baseconfig/CONFIG_SND_DESIGNWARE_PCM
index 4fb3ac59e..8f93f9dce 100644
--- a/baseconfig/CONFIG_SND_DESIGNWARE_PCM
+++ b/baseconfig/CONFIG_SND_DESIGNWARE_PCM
@@ -1 +1 @@
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
diff --git a/baseconfig/CONFIG_SND_FIREFACE b/baseconfig/CONFIG_SND_FIREFACE
new file mode 100644
index 000000000..18782f689
--- /dev/null
+++ b/baseconfig/CONFIG_SND_FIREFACE
@@ -0,0 +1 @@
+CONFIG_SND_FIREFACE=m
diff --git a/baseconfig/CONFIG_SND_FIREWIRE_MOTU b/baseconfig/CONFIG_SND_FIREWIRE_MOTU
new file mode 100644
index 000000000..73299e869
--- /dev/null
+++ b/baseconfig/CONFIG_SND_FIREWIRE_MOTU
@@ -0,0 +1 @@
+CONFIG_SND_FIREWIRE_MOTU=m
diff --git a/baseconfig/CONFIG_SND_I2S_HI6210_I2S b/baseconfig/CONFIG_SND_I2S_HI6210_I2S
new file mode 100644
index 000000000..9ae15dc8a
--- /dev/null
+++ b/baseconfig/CONFIG_SND_I2S_HI6210_I2S
@@ -0,0 +1 @@
+CONFIG_SND_I2S_HI6210_I2S=m
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU1761_I2C b/baseconfig/CONFIG_SND_SOC_ADAU1761_I2C
new file mode 100644
index 000000000..54124be46
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_ADAU1761_I2C
@@ -0,0 +1 @@
+CONFIG_SND_SOC_ADAU1761_I2C=m
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU1761_SPI b/baseconfig/CONFIG_SND_SOC_ADAU1761_SPI
new file mode 100644
index 000000000..fce8309a6
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_ADAU1761_SPI
@@ -0,0 +1 @@
+CONFIG_SND_SOC_ADAU1761_SPI=m
diff --git a/baseconfig/CONFIG_SND_SOC_CS35L35 b/baseconfig/CONFIG_SND_SOC_CS35L35
new file mode 100644
index 000000000..3969b2fee
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_CS35L35
@@ -0,0 +1 @@
+CONFIG_SND_SOC_CS35L35=m
diff --git a/baseconfig/CONFIG_SND_SOC_DIO2125 b/baseconfig/CONFIG_SND_SOC_DIO2125
new file mode 100644
index 000000000..d3121e77e
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_DIO2125
@@ -0,0 +1 @@
+CONFIG_SND_SOC_DIO2125=m
diff --git a/baseconfig/CONFIG_SND_SOC_ES7134 b/baseconfig/CONFIG_SND_SOC_ES7134
new file mode 100644
index 000000000..ff087adce
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_ES7134
@@ -0,0 +1 @@
+CONFIG_SND_SOC_ES7134=m
diff --git a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH b/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
new file mode 100644
index 000000000..0697694f9
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
@@ -0,0 +1 @@
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
diff --git a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH b/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
new file mode 100644
index 000000000..db07e5fb0
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
@@ -0,0 +1 @@
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
diff --git a/baseconfig/CONFIG_SND_SOC_MAX98927 b/baseconfig/CONFIG_SND_SOC_MAX98927
new file mode 100644
index 000000000..341a74d43
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_MAX98927
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MAX98927=m
diff --git a/baseconfig/CONFIG_SND_SOC_NAU8824 b/baseconfig/CONFIG_SND_SOC_NAU8824
new file mode 100644
index 000000000..3551419c6
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_NAU8824
@@ -0,0 +1 @@
+CONFIG_SND_SOC_NAU8824=m
diff --git a/baseconfig/CONFIG_SYSTEM_BLACKLIST_HASH_LIST b/baseconfig/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
new file mode 100644
index 000000000..858e87e78
--- /dev/null
+++ b/baseconfig/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
@@ -0,0 +1 @@
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/baseconfig/x86/CONFIG_TCG_CRB b/baseconfig/CONFIG_TCG_CRB
index 07a62cae3..07a62cae3 100644
--- a/baseconfig/x86/CONFIG_TCG_CRB
+++ b/baseconfig/CONFIG_TCG_CRB
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC2007_IIO b/baseconfig/CONFIG_TOUCHSCREEN_TSC2007_IIO
new file mode 100644
index 000000000..b67dd760f
--- /dev/null
+++ b/baseconfig/CONFIG_TOUCHSCREEN_TSC2007_IIO
@@ -0,0 +1 @@
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
diff --git a/baseconfig/CONFIG_ZX_TDM b/baseconfig/CONFIG_ZX_TDM
new file mode 100644
index 000000000..9d2d9bf4c
--- /dev/null
+++ b/baseconfig/CONFIG_ZX_TDM
@@ -0,0 +1 @@
+# CONFIG_ZX_TDM is not set
diff --git a/baseconfig/arm/CONFIG_AXP20X_ADC b/baseconfig/arm/CONFIG_AXP20X_ADC
new file mode 100644
index 000000000..025239f25
--- /dev/null
+++ b/baseconfig/arm/CONFIG_AXP20X_ADC
@@ -0,0 +1 @@
+CONFIG_AXP20X_ADC=m
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO b/baseconfig/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO
new file mode 100644
index 000000000..679147e29
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO
@@ -0,0 +1 @@
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO b/baseconfig/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO
new file mode 100644
index 000000000..34ecaf242
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO
@@ -0,0 +1 @@
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
diff --git a/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI b/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI
new file mode 100644
index 000000000..2590929f1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI
@@ -0,0 +1 @@
+CONFIG_DRM_MESON_DW_HDMI=m
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_LVDS b/baseconfig/arm/CONFIG_DRM_PANEL_LVDS
new file mode 100644
index 000000000..6d4d3c7c6
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_PANEL_LVDS
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL_LVDS=m
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 b/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
new file mode 100644
index 000000000..8334ac016
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP b/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
index ee89108f9..4f8576d47 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
@@ -1 +1 @@
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI b/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI
index 49748e701..80c330104 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI
@@ -1 +1 @@
-CONFIG_ROCKCHIP_DW_HDMI=m
+CONFIG_ROCKCHIP_DW_HDMI=y
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI b/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
index 516f3b1c7..6c00423c8 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
@@ -1 +1 @@
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI b/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI
index 34b798abf..50cf998df 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI
@@ -1 +1 @@
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX b/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX
new file mode 100644
index 000000000..bcc41c376
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX
@@ -0,0 +1 @@
+CONFIG_I2C_XLP9XX=m
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_XLP b/baseconfig/arm/arm64/CONFIG_SPI_XLP
new file mode 100644
index 000000000..6026d5f51
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SPI_XLP
@@ -0,0 +1 @@
+CONFIG_SPI_XLP=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID b/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID
new file mode 100644
index 000000000..ece6cf56f
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID
@@ -0,0 +1 @@
+CONFIG_SND_SOC_ODROID=m
diff --git a/baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
new file mode 100644
index 000000000..5b25d7565
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
@@ -0,0 +1 @@
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_LVDS b/baseconfig/x86/CONFIG_DRM_PANEL_LVDS
new file mode 100644
index 000000000..6d4d3c7c6
--- /dev/null
+++ b/baseconfig/x86/CONFIG_DRM_PANEL_LVDS
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL_LVDS=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 b/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
deleted file mode 100644
index 9d584f6ab..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LS043T1LE01 b/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
deleted file mode 100644
index 64dedb057..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC b/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
new file mode 100644
index 000000000..d79565e48
--- /dev/null
+++ b/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
@@ -0,0 +1 @@
+CONFIG_INFINIBAND_OPA_VNIC=m
diff --git a/bcm283x-hdmi-audio.patch b/bcm283x-hdmi-audio.patch
index 3ed3d2d34..8c962442f 100644
--- a/bcm283x-hdmi-audio.patch
+++ b/bcm283x-hdmi-audio.patch
@@ -1,810 +1,3 @@
-From bbcb8aacb871edf0360e808180162591b11c6a35 Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-Date: Mon, 27 Feb 2017 12:28:01 -0800
-Subject: [PATCH 1/3] dt-bindings: Document the dmas and dma-names properties
- for VC4 HDMI
-
-These are optional, but necessary for HDMI audio support.
-
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Acked-by: Rob Herring <robh@kernel.org>
-Link: http://patchwork.freedesktop.org/patch/msgid/20170227202803.12855-1-eric@anholt.net
----
- Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
-index 34c7fddcea39..ca02d3e4db91 100644
---- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
-@@ -34,6 +34,9 @@ Optional properties for HDMI:
- - hpd-gpios:	The GPIO pin for HDMI hotplug detect (if it doesn't appear
- 		  as an interrupt/status bit in the HDMI controller
- 		  itself).  See bindings/pinctrl/brcm,bcm2835-gpio.txt
-+- dmas:		Should contain one entry pointing to the DMA channel used to
-+		transfer audio data
-+- dma-names:	Should contain "audio-rx"
- 
- Required properties for DPI:
- - compatible:	Should be "brcm,bcm2835-dpi"
--- 
-2.12.0
-
-From 8e13e0d8ecf2202c707225a612d10c9534d849f7 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Mon, 27 Feb 2017 12:28:02 -0800
-Subject: [PATCH 2/3] drm/vc4: Add HDMI audio support
-
-The HDMI encoder IP embeds all needed blocks to output audio, with a
-custom DAI called MAI moving audio between the two parts of the HDMI
-core.  This driver now exposes a sound card to let users stream audio
-to their display.
-
-Using the hdmi-codec driver has been considered here, but MAI meant
-having to significantly rework hdmi-codec, and it would have left
-little shared code with the I2S mode anyway.
-
-The encoder requires that the audio be SPDIF-formatted frames only,
-which alsalib will format-convert for us.
-
-This patch is the combined work of Eric Anholt (initial register setup
-with a separate dmaengine driver and using simple-audio-card) and
-Boris Brezillon (moving it all into HDMI, massive debug to get it
-actually working), and which Eric has the permission to release.
-
-v2: Drop "-audio" from sound card name, since that's already implied
-    (suggestion by Boris)
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Link: http://patchwork.freedesktop.org/patch/msgid/20170227202803.12855-2-eric@anholt.net
----
- drivers/gpu/drm/vc4/Kconfig    |   4 +
- drivers/gpu/drm/vc4/vc4_hdmi.c | 494 ++++++++++++++++++++++++++++++++++++++++-
- drivers/gpu/drm/vc4/vc4_regs.h | 107 ++++++++-
- 3 files changed, 603 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
-index e1517d07cb7d..973b4203c0b2 100644
---- a/drivers/gpu/drm/vc4/Kconfig
-+++ b/drivers/gpu/drm/vc4/Kconfig
-@@ -2,11 +2,15 @@ config DRM_VC4
- 	tristate "Broadcom VC4 Graphics"
- 	depends on ARCH_BCM2835 || COMPILE_TEST
- 	depends on DRM
-+	depends on SND && SND_SOC
- 	depends on COMMON_CLK
- 	select DRM_KMS_HELPER
- 	select DRM_KMS_CMA_HELPER
- 	select DRM_GEM_CMA_HELPER
- 	select DRM_PANEL
-+	select SND_PCM
-+	select SND_PCM_ELD
-+	select SND_SOC_GENERIC_DMAENGINE_PCM
- 	select DRM_MIPI_DSI
- 	help
- 	  Choose this option if you have a system that has a Broadcom
-diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 93d5994f3a04..e4abf4bfc464 100644
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -31,11 +31,27 @@
- #include "linux/clk.h"
- #include "linux/component.h"
- #include "linux/i2c.h"
-+#include "linux/of_address.h"
- #include "linux/of_gpio.h"
- #include "linux/of_platform.h"
-+#include "linux/rational.h"
-+#include "sound/dmaengine_pcm.h"
-+#include "sound/pcm_drm_eld.h"
-+#include "sound/pcm_params.h"
-+#include "sound/soc.h"
- #include "vc4_drv.h"
- #include "vc4_regs.h"
- 
-+/* HDMI audio information */
-+struct vc4_hdmi_audio {
-+	struct snd_soc_card card;
-+	struct snd_soc_dai_link link;
-+	int samplerate;
-+	int channels;
-+	struct snd_dmaengine_dai_dma_data dma_data;
-+	struct snd_pcm_substream *substream;
-+};
-+
- /* General HDMI hardware state. */
- struct vc4_hdmi {
- 	struct platform_device *pdev;
-@@ -43,6 +59,8 @@ struct vc4_hdmi {
- 	struct drm_encoder *encoder;
- 	struct drm_connector *connector;
- 
-+	struct vc4_hdmi_audio audio;
-+
- 	struct i2c_adapter *ddc;
- 	void __iomem *hdmicore_regs;
- 	void __iomem *hd_regs;
-@@ -98,6 +116,10 @@ static const struct {
- 	HDMI_REG(VC4_HDMI_SW_RESET_CONTROL),
- 	HDMI_REG(VC4_HDMI_HOTPLUG_INT),
- 	HDMI_REG(VC4_HDMI_HOTPLUG),
-+	HDMI_REG(VC4_HDMI_MAI_CHANNEL_MAP),
-+	HDMI_REG(VC4_HDMI_MAI_CONFIG),
-+	HDMI_REG(VC4_HDMI_MAI_FORMAT),
-+	HDMI_REG(VC4_HDMI_AUDIO_PACKET_CONFIG),
- 	HDMI_REG(VC4_HDMI_RAM_PACKET_CONFIG),
- 	HDMI_REG(VC4_HDMI_HORZA),
- 	HDMI_REG(VC4_HDMI_HORZB),
-@@ -108,6 +130,7 @@ static const struct {
- 	HDMI_REG(VC4_HDMI_VERTB0),
- 	HDMI_REG(VC4_HDMI_VERTB1),
- 	HDMI_REG(VC4_HDMI_TX_PHY_RESET_CTL),
-+	HDMI_REG(VC4_HDMI_TX_PHY_CTL0),
- };
- 
- static const struct {
-@@ -116,6 +139,9 @@ static const struct {
- } hd_regs[] = {
- 	HDMI_REG(VC4_HD_M_CTL),
- 	HDMI_REG(VC4_HD_MAI_CTL),
-+	HDMI_REG(VC4_HD_MAI_THR),
-+	HDMI_REG(VC4_HD_MAI_FMT),
-+	HDMI_REG(VC4_HD_MAI_SMP),
- 	HDMI_REG(VC4_HD_VID_CTL),
- 	HDMI_REG(VC4_HD_CSC_CTL),
- 	HDMI_REG(VC4_HD_FRAME_COUNT),
-@@ -215,6 +241,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
- 
- 	drm_mode_connector_update_edid_property(connector, edid);
- 	ret = drm_add_edid_modes(connector, edid);
-+	drm_edid_to_eld(connector, edid);
- 
- 	return ret;
- }
-@@ -300,7 +327,7 @@ static void vc4_hdmi_write_infoframe(struct drm_encoder *encoder,
- 	struct drm_device *dev = encoder->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	u32 packet_id = frame->any.type - 0x80;
--	u32 packet_reg = VC4_HDMI_GCP_0 + VC4_HDMI_PACKET_STRIDE * packet_id;
-+	u32 packet_reg = VC4_HDMI_RAM_PACKET(packet_id);
- 	uint8_t buffer[VC4_HDMI_PACKET_STRIDE];
- 	ssize_t len, i;
- 	int ret;
-@@ -381,6 +408,24 @@ static void vc4_hdmi_set_spd_infoframe(struct drm_encoder *encoder)
- 	vc4_hdmi_write_infoframe(encoder, &frame);
- }
- 
-+static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder)
-+{
-+	struct drm_device *drm = encoder->dev;
-+	struct vc4_dev *vc4 = drm->dev_private;
-+	struct vc4_hdmi *hdmi = vc4->hdmi;
-+	union hdmi_infoframe frame;
-+	int ret;
-+
-+	ret = hdmi_audio_infoframe_init(&frame.audio);
-+
-+	frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
-+	frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
-+	frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
-+	frame.audio.channels = hdmi->audio.channels;
-+
-+	vc4_hdmi_write_infoframe(encoder, &frame);
-+}
-+
- static void vc4_hdmi_set_infoframes(struct drm_encoder *encoder)
- {
- 	vc4_hdmi_set_avi_infoframe(encoder);
-@@ -589,6 +634,447 @@ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
- 	.enable = vc4_hdmi_encoder_enable,
- };
- 
-+/* HDMI audio codec callbacks */
-+static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *hdmi)
-+{
-+	struct drm_device *drm = hdmi->encoder->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	u32 hsm_clock = clk_get_rate(hdmi->hsm_clock);
-+	unsigned long n, m;
-+
-+	rational_best_approximation(hsm_clock, hdmi->audio.samplerate,
-+				    VC4_HD_MAI_SMP_N_MASK >>
-+				    VC4_HD_MAI_SMP_N_SHIFT,
-+				    (VC4_HD_MAI_SMP_M_MASK >>
-+				     VC4_HD_MAI_SMP_M_SHIFT) + 1,
-+				    &n, &m);
-+
-+	HD_WRITE(VC4_HD_MAI_SMP,
-+		 VC4_SET_FIELD(n, VC4_HD_MAI_SMP_N) |
-+		 VC4_SET_FIELD(m - 1, VC4_HD_MAI_SMP_M));
-+}
-+
-+static void vc4_hdmi_set_n_cts(struct vc4_hdmi *hdmi)
-+{
-+	struct drm_encoder *encoder = hdmi->encoder;
-+	struct drm_crtc *crtc = encoder->crtc;
-+	struct drm_device *drm = encoder->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-+	u32 samplerate = hdmi->audio.samplerate;
-+	u32 n, cts;
-+	u64 tmp;
-+
-+	n = 128 * samplerate / 1000;
-+	tmp = (u64)(mode->clock * 1000) * n;
-+	do_div(tmp, 128 * samplerate);
-+	cts = tmp;
-+
-+	HDMI_WRITE(VC4_HDMI_CRP_CFG,
-+		   VC4_HDMI_CRP_CFG_EXTERNAL_CTS_EN |
-+		   VC4_SET_FIELD(n, VC4_HDMI_CRP_CFG_N));
-+
-+	/*
-+	 * We could get slightly more accurate clocks in some cases by
-+	 * providing a CTS_1 value.  The two CTS values are alternated
-+	 * between based on the period fields
-+	 */
-+	HDMI_WRITE(VC4_HDMI_CTS_0, cts);
-+	HDMI_WRITE(VC4_HDMI_CTS_1, cts);
-+}
-+
-+static inline struct vc4_hdmi *dai_to_hdmi(struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_card *card = snd_soc_dai_get_drvdata(dai);
-+
-+	return snd_soc_card_get_drvdata(card);
-+}
-+
-+static int vc4_hdmi_audio_startup(struct snd_pcm_substream *substream,
-+				  struct snd_soc_dai *dai)
-+{
-+	struct vc4_hdmi *hdmi = dai_to_hdmi(dai);
-+	struct drm_encoder *encoder = hdmi->encoder;
-+	struct vc4_dev *vc4 = to_vc4_dev(encoder->dev);
-+	int ret;
-+
-+	if (hdmi->audio.substream && hdmi->audio.substream != substream)
-+		return -EINVAL;
-+
-+	hdmi->audio.substream = substream;
-+
-+	/*
-+	 * If the HDMI encoder hasn't probed, or the encoder is
-+	 * currently in DVI mode, treat the codec dai as missing.
-+	 */
-+	if (!encoder->crtc || !(HDMI_READ(VC4_HDMI_RAM_PACKET_CONFIG) &
-+				VC4_HDMI_RAM_PACKET_ENABLE))
-+		return -ENODEV;
-+
-+	ret = snd_pcm_hw_constraint_eld(substream->runtime,
-+					hdmi->connector->eld);
-+	if (ret)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static int vc4_hdmi_audio_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
-+{
-+	return 0;
-+}
-+
-+static void vc4_hdmi_audio_reset(struct vc4_hdmi *hdmi)
-+{
-+	struct drm_encoder *encoder = hdmi->encoder;
-+	struct drm_device *drm = encoder->dev;
-+	struct device *dev = &hdmi->pdev->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	int ret;
-+
-+	ret = vc4_hdmi_stop_packet(encoder, HDMI_INFOFRAME_TYPE_AUDIO);
-+	if (ret)
-+		dev_err(dev, "Failed to stop audio infoframe: %d\n", ret);
-+
-+	HD_WRITE(VC4_HD_MAI_CTL, VC4_HD_MAI_CTL_RESET);
-+	HD_WRITE(VC4_HD_MAI_CTL, VC4_HD_MAI_CTL_ERRORF);
-+	HD_WRITE(VC4_HD_MAI_CTL, VC4_HD_MAI_CTL_FLUSH);
-+}
-+
-+static void vc4_hdmi_audio_shutdown(struct snd_pcm_substream *substream,
-+				    struct snd_soc_dai *dai)
-+{
-+	struct vc4_hdmi *hdmi = dai_to_hdmi(dai);
-+
-+	if (substream != hdmi->audio.substream)
-+		return;
-+
-+	vc4_hdmi_audio_reset(hdmi);
-+
-+	hdmi->audio.substream = NULL;
-+}
-+
-+/* HDMI audio codec callbacks */
-+static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream,
-+				    struct snd_pcm_hw_params *params,
-+				    struct snd_soc_dai *dai)
-+{
-+	struct vc4_hdmi *hdmi = dai_to_hdmi(dai);
-+	struct drm_encoder *encoder = hdmi->encoder;
-+	struct drm_device *drm = encoder->dev;
-+	struct device *dev = &hdmi->pdev->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	u32 audio_packet_config, channel_mask;
-+	u32 channel_map, i;
-+
-+	if (substream != hdmi->audio.substream)
-+		return -EINVAL;
-+
-+	dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
-+		params_rate(params), params_width(params),
-+		params_channels(params));
-+
-+	hdmi->audio.channels = params_channels(params);
-+	hdmi->audio.samplerate = params_rate(params);
-+
-+	HD_WRITE(VC4_HD_MAI_CTL,
-+		 VC4_HD_MAI_CTL_RESET |
-+		 VC4_HD_MAI_CTL_FLUSH |
-+		 VC4_HD_MAI_CTL_DLATE |
-+		 VC4_HD_MAI_CTL_ERRORE |
-+		 VC4_HD_MAI_CTL_ERRORF);
-+
-+	vc4_hdmi_audio_set_mai_clock(hdmi);
-+
-+	audio_packet_config =
-+		VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_SAMPLE_FLAT |
-+		VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS |
-+		VC4_SET_FIELD(0xf, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
-+
-+	channel_mask = GENMASK(hdmi->audio.channels - 1, 0);
-+	audio_packet_config |= VC4_SET_FIELD(channel_mask,
-+					     VC4_HDMI_AUDIO_PACKET_CEA_MASK);
-+
-+	/* Set the MAI threshold.  This logic mimics the firmware's. */
-+	if (hdmi->audio.samplerate > 96000) {
-+		HD_WRITE(VC4_HD_MAI_THR,
-+			 VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQHIGH) |
-+			 VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQLOW));
-+	} else if (hdmi->audio.samplerate > 48000) {
-+		HD_WRITE(VC4_HD_MAI_THR,
-+			 VC4_SET_FIELD(0x14, VC4_HD_MAI_THR_DREQHIGH) |
-+			 VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQLOW));
-+	} else {
-+		HD_WRITE(VC4_HD_MAI_THR,
-+			 VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
-+			 VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
-+			 VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
-+			 VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
-+	}
-+
-+	HDMI_WRITE(VC4_HDMI_MAI_CONFIG,
-+		   VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
-+		   VC4_SET_FIELD(channel_mask, VC4_HDMI_MAI_CHANNEL_MASK));
-+
-+	channel_map = 0;
-+	for (i = 0; i < 8; i++) {
-+		if (channel_mask & BIT(i))
-+			channel_map |= i << (3 * i);
-+	}
-+
-+	HDMI_WRITE(VC4_HDMI_MAI_CHANNEL_MAP, channel_map);
-+	HDMI_WRITE(VC4_HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
-+	vc4_hdmi_set_n_cts(hdmi);
-+
-+	return 0;
-+}
-+
-+static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
-+				  struct snd_soc_dai *dai)
-+{
-+	struct vc4_hdmi *hdmi = dai_to_hdmi(dai);
-+	struct drm_encoder *encoder = hdmi->encoder;
-+	struct drm_device *drm = encoder->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+		vc4_hdmi_set_audio_infoframe(encoder);
-+		HDMI_WRITE(VC4_HDMI_TX_PHY_CTL0,
-+			   HDMI_READ(VC4_HDMI_TX_PHY_CTL0) &
-+			   ~VC4_HDMI_TX_PHY_RNG_PWRDN);
-+		HD_WRITE(VC4_HD_MAI_CTL,
-+			 VC4_SET_FIELD(hdmi->audio.channels,
-+				       VC4_HD_MAI_CTL_CHNUM) |
-+			 VC4_HD_MAI_CTL_ENABLE);
-+		break;
-+	case SNDRV_PCM_TRIGGER_STOP:
-+		HD_WRITE(VC4_HD_MAI_CTL,
-+			 VC4_HD_MAI_CTL_DLATE |
-+			 VC4_HD_MAI_CTL_ERRORE |
-+			 VC4_HD_MAI_CTL_ERRORF);
-+		HDMI_WRITE(VC4_HDMI_TX_PHY_CTL0,
-+			   HDMI_READ(VC4_HDMI_TX_PHY_CTL0) |
-+			   VC4_HDMI_TX_PHY_RNG_PWRDN);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static inline struct vc4_hdmi *
-+snd_component_to_hdmi(struct snd_soc_component *component)
-+{
-+	struct snd_soc_card *card = snd_soc_component_get_drvdata(component);
-+
-+	return snd_soc_card_get_drvdata(card);
-+}
-+
-+static int vc4_hdmi_audio_eld_ctl_info(struct snd_kcontrol *kcontrol,
-+				       struct snd_ctl_elem_info *uinfo)
-+{
-+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-+	struct vc4_hdmi *hdmi = snd_component_to_hdmi(component);
-+
-+	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-+	uinfo->count = sizeof(hdmi->connector->eld);
-+
-+	return 0;
-+}
-+
-+static int vc4_hdmi_audio_eld_ctl_get(struct snd_kcontrol *kcontrol,
-+				      struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-+	struct vc4_hdmi *hdmi = snd_component_to_hdmi(component);
-+
-+	memcpy(ucontrol->value.bytes.data, hdmi->connector->eld,
-+	       sizeof(hdmi->connector->eld));
-+
-+	return 0;
-+}
-+
-+static const struct snd_kcontrol_new vc4_hdmi_audio_controls[] = {
-+	{
-+		.access = SNDRV_CTL_ELEM_ACCESS_READ |
-+			  SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,
-+		.name = "ELD",
-+		.info = vc4_hdmi_audio_eld_ctl_info,
-+		.get = vc4_hdmi_audio_eld_ctl_get,
-+	},
-+};
-+
-+static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = {
-+	SND_SOC_DAPM_OUTPUT("TX"),
-+};
-+
-+static const struct snd_soc_dapm_route vc4_hdmi_audio_routes[] = {
-+	{ "TX", NULL, "Playback" },
-+};
-+
-+static const struct snd_soc_codec_driver vc4_hdmi_audio_codec_drv = {
-+	.component_driver = {
-+		.controls = vc4_hdmi_audio_controls,
-+		.num_controls = ARRAY_SIZE(vc4_hdmi_audio_controls),
-+		.dapm_widgets = vc4_hdmi_audio_widgets,
-+		.num_dapm_widgets = ARRAY_SIZE(vc4_hdmi_audio_widgets),
-+		.dapm_routes = vc4_hdmi_audio_routes,
-+		.num_dapm_routes = ARRAY_SIZE(vc4_hdmi_audio_routes),
-+	},
-+};
-+
-+static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = {
-+	.startup = vc4_hdmi_audio_startup,
-+	.shutdown = vc4_hdmi_audio_shutdown,
-+	.hw_params = vc4_hdmi_audio_hw_params,
-+	.set_fmt = vc4_hdmi_audio_set_fmt,
-+	.trigger = vc4_hdmi_audio_trigger,
-+};
-+
-+static struct snd_soc_dai_driver vc4_hdmi_audio_codec_dai_drv = {
-+	.name = "vc4-hdmi-hifi",
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 8,
-+		.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
-+			 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
-+			 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
-+			 SNDRV_PCM_RATE_192000,
-+		.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE,
-+	},
-+};
-+
-+static const struct snd_soc_component_driver vc4_hdmi_audio_cpu_dai_comp = {
-+	.name = "vc4-hdmi-cpu-dai-component",
-+};
-+
-+static int vc4_hdmi_audio_cpu_dai_probe(struct snd_soc_dai *dai)
-+{
-+	struct vc4_hdmi *hdmi = dai_to_hdmi(dai);
-+
-+	snd_soc_dai_init_dma_data(dai, &hdmi->audio.dma_data, NULL);
-+
-+	return 0;
-+}
-+
-+static struct snd_soc_dai_driver vc4_hdmi_audio_cpu_dai_drv = {
-+	.name = "vc4-hdmi-cpu-dai",
-+	.probe  = vc4_hdmi_audio_cpu_dai_probe,
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 1,
-+		.channels_max = 8,
-+		.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
-+			 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
-+			 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
-+			 SNDRV_PCM_RATE_192000,
-+		.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE,
-+	},
-+	.ops = &vc4_hdmi_audio_dai_ops,
-+};
-+
-+static const struct snd_dmaengine_pcm_config pcm_conf = {
-+	.chan_names[SNDRV_PCM_STREAM_PLAYBACK] = "audio-rx",
-+	.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
-+};
-+
-+static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi)
-+{
-+	struct snd_soc_dai_link *dai_link = &hdmi->audio.link;
-+	struct snd_soc_card *card = &hdmi->audio.card;
-+	struct device *dev = &hdmi->pdev->dev;
-+	const __be32 *addr;
-+	int ret;
-+
-+	if (!of_find_property(dev->of_node, "dmas", NULL)) {
-+		dev_warn(dev,
-+			 "'dmas' DT property is missing, no HDMI audio\n");
-+		return 0;
-+	}
-+
-+	/*
-+	 * Get the physical address of VC4_HD_MAI_DATA. We need to retrieve
-+	 * the bus address specified in the DT, because the physical address
-+	 * (the one returned by platform_get_resource()) is not appropriate
-+	 * for DMA transfers.
-+	 * This VC/MMU should probably be exposed to avoid this kind of hacks.
-+	 */
-+	addr = of_get_address(dev->of_node, 1, NULL, NULL);
-+	hdmi->audio.dma_data.addr = be32_to_cpup(addr) + VC4_HD_MAI_DATA;
-+	hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+	hdmi->audio.dma_data.maxburst = 2;
-+
-+	ret = devm_snd_dmaengine_pcm_register(dev, &pcm_conf, 0);
-+	if (ret) {
-+		dev_err(dev, "Could not register PCM component: %d\n", ret);
-+		return ret;
-+	}
-+
-+	ret = devm_snd_soc_register_component(dev, &vc4_hdmi_audio_cpu_dai_comp,
-+					      &vc4_hdmi_audio_cpu_dai_drv, 1);
-+	if (ret) {
-+		dev_err(dev, "Could not register CPU DAI: %d\n", ret);
-+		return ret;
-+	}
-+
-+	/* register codec and codec dai */
-+	ret = snd_soc_register_codec(dev, &vc4_hdmi_audio_codec_drv,
-+				     &vc4_hdmi_audio_codec_dai_drv, 1);
-+	if (ret) {
-+		dev_err(dev, "Could not register codec: %d\n", ret);
-+		return ret;
-+	}
-+
-+	dai_link->name = "MAI";
-+	dai_link->stream_name = "MAI PCM";
-+	dai_link->codec_dai_name = vc4_hdmi_audio_codec_dai_drv.name;
-+	dai_link->cpu_dai_name = dev_name(dev);
-+	dai_link->codec_name = dev_name(dev);
-+	dai_link->platform_name = dev_name(dev);
-+
-+	card->dai_link = dai_link;
-+	card->num_links = 1;
-+	card->name = "vc4-hdmi";
-+	card->dev = dev;
-+
-+	/*
-+	 * Be careful, snd_soc_register_card() calls dev_set_drvdata() and
-+	 * stores a pointer to the snd card object in dev->driver_data. This
-+	 * means we cannot use it for something else. The hdmi back-pointer is
-+	 * now stored in card->drvdata and should be retrieved with
-+	 * snd_soc_card_get_drvdata() if needed.
-+	 */
-+	snd_soc_card_set_drvdata(card, hdmi);
-+	ret = devm_snd_soc_register_card(dev, card);
-+	if (ret) {
-+		dev_err(dev, "Could not register sound card: %d\n", ret);
-+		goto unregister_codec;
-+	}
-+
-+	return 0;
-+
-+unregister_codec:
-+	snd_soc_unregister_codec(dev);
-+
-+	return ret;
-+}
-+
-+static void vc4_hdmi_audio_cleanup(struct vc4_hdmi *hdmi)
-+{
-+	struct device *dev = &hdmi->pdev->dev;
-+
-+	/*
-+	 * If drvdata is not set this means the audio card was not
-+	 * registered, just skip codec unregistration in this case.
-+	 */
-+	if (dev_get_drvdata(dev))
-+		snd_soc_unregister_codec(dev);
-+}
-+
- static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
-@@ -720,6 +1206,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
- 		goto err_destroy_encoder;
- 	}
- 
-+	ret = vc4_hdmi_audio_init(hdmi);
-+	if (ret)
-+		goto err_destroy_encoder;
-+
- 	return 0;
- 
- err_destroy_encoder:
-@@ -741,6 +1231,8 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master,
- 	struct vc4_dev *vc4 = drm->dev_private;
- 	struct vc4_hdmi *hdmi = vc4->hdmi;
- 
-+	vc4_hdmi_audio_cleanup(hdmi);
-+
- 	vc4_hdmi_connector_destroy(hdmi->connector);
- 	vc4_hdmi_encoder_destroy(hdmi->encoder);
- 
-diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 385405a2df05..932093936178 100644
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -446,11 +446,62 @@
- #define VC4_HDMI_HOTPLUG			0x00c
- # define VC4_HDMI_HOTPLUG_CONNECTED		BIT(0)
- 
-+/* 3 bits per field, where each field maps from that corresponding MAI
-+ * bus channel to the given HDMI channel.
-+ */
-+#define VC4_HDMI_MAI_CHANNEL_MAP		0x090
-+
-+#define VC4_HDMI_MAI_CONFIG			0x094
-+# define VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE		BIT(27)
-+# define VC4_HDMI_MAI_CONFIG_BIT_REVERSE		BIT(26)
-+# define VC4_HDMI_MAI_CHANNEL_MASK_MASK			VC4_MASK(15, 0)
-+# define VC4_HDMI_MAI_CHANNEL_MASK_SHIFT		0
-+
-+/* Last received format word on the MAI bus. */
-+#define VC4_HDMI_MAI_FORMAT			0x098
-+
-+#define VC4_HDMI_AUDIO_PACKET_CONFIG		0x09c
-+# define VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_SAMPLE_FLAT		BIT(29)
-+# define VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS	BIT(24)
-+# define VC4_HDMI_AUDIO_PACKET_FORCE_SAMPLE_PRESENT		BIT(19)
-+# define VC4_HDMI_AUDIO_PACKET_FORCE_B_FRAME			BIT(18)
-+# define VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER_MASK		VC4_MASK(13, 10)
-+# define VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER_SHIFT		10
-+/* If set, then multichannel, otherwise 2 channel. */
-+# define VC4_HDMI_AUDIO_PACKET_AUDIO_LAYOUT			BIT(9)
-+/* If set, then AUDIO_LAYOUT overrides audio_cea_mask */
-+# define VC4_HDMI_AUDIO_PACKET_FORCE_AUDIO_LAYOUT		BIT(8)
-+# define VC4_HDMI_AUDIO_PACKET_CEA_MASK_MASK			VC4_MASK(7, 0)
-+# define VC4_HDMI_AUDIO_PACKET_CEA_MASK_SHIFT			0
-+
- #define VC4_HDMI_RAM_PACKET_CONFIG		0x0a0
- # define VC4_HDMI_RAM_PACKET_ENABLE		BIT(16)
- 
- #define VC4_HDMI_RAM_PACKET_STATUS		0x0a4
- 
-+#define VC4_HDMI_CRP_CFG			0x0a8
-+/* When set, the CTS_PERIOD counts based on MAI bus sync pulse instead
-+ * of pixel clock.
-+ */
-+# define VC4_HDMI_CRP_USE_MAI_BUS_SYNC_FOR_CTS	BIT(26)
-+/* When set, no CRP packets will be sent. */
-+# define VC4_HDMI_CRP_CFG_DISABLE		BIT(25)
-+/* If set, generates CTS values based on N, audio clock, and video
-+ * clock.  N must be divisible by 128.
-+ */
-+# define VC4_HDMI_CRP_CFG_EXTERNAL_CTS_EN	BIT(24)
-+# define VC4_HDMI_CRP_CFG_N_MASK		VC4_MASK(19, 0)
-+# define VC4_HDMI_CRP_CFG_N_SHIFT		0
-+
-+/* 20-bit fields containing CTS values to be transmitted if !EXTERNAL_CTS_EN */
-+#define VC4_HDMI_CTS_0				0x0ac
-+#define VC4_HDMI_CTS_1				0x0b0
-+/* 20-bit fields containing number of clocks to send CTS0/1 before
-+ * switching to the other one.
-+ */
-+#define VC4_HDMI_CTS_PERIOD_0			0x0b4
-+#define VC4_HDMI_CTS_PERIOD_1			0x0b8
-+
- #define VC4_HDMI_HORZA				0x0c4
- # define VC4_HDMI_HORZA_VPOS			BIT(14)
- # define VC4_HDMI_HORZA_HPOS			BIT(13)
-@@ -512,7 +563,11 @@
- 
- #define VC4_HDMI_TX_PHY_RESET_CTL		0x2c0
- 
--#define VC4_HDMI_GCP_0				0x400
-+#define VC4_HDMI_TX_PHY_CTL0			0x2c4
-+# define VC4_HDMI_TX_PHY_RNG_PWRDN		BIT(25)
-+
-+#define VC4_HDMI_GCP(x)				(0x400 + ((x) * 0x4))
-+#define VC4_HDMI_RAM_PACKET(x)			(0x400 + ((x) * 0x24))
- #define VC4_HDMI_PACKET_STRIDE			0x24
- 
- #define VC4_HD_M_CTL				0x00c
-@@ -522,6 +577,56 @@
- # define VC4_HD_M_ENABLE			BIT(0)
- 
- #define VC4_HD_MAI_CTL				0x014
-+/* Set when audio stream is received at a slower rate than the
-+ * sampling period, so MAI fifo goes empty.  Write 1 to clear.
-+ */
-+# define VC4_HD_MAI_CTL_DLATE			BIT(15)
-+# define VC4_HD_MAI_CTL_BUSY			BIT(14)
-+# define VC4_HD_MAI_CTL_CHALIGN			BIT(13)
-+# define VC4_HD_MAI_CTL_WHOLSMP			BIT(12)
-+# define VC4_HD_MAI_CTL_FULL			BIT(11)
-+# define VC4_HD_MAI_CTL_EMPTY			BIT(10)
-+# define VC4_HD_MAI_CTL_FLUSH			BIT(9)
-+/* If set, MAI bus generates SPDIF (bit 31) parity instead of passing
-+ * through.
-+ */
-+# define VC4_HD_MAI_CTL_PAREN			BIT(8)
-+# define VC4_HD_MAI_CTL_CHNUM_MASK		VC4_MASK(7, 4)
-+# define VC4_HD_MAI_CTL_CHNUM_SHIFT		4
-+# define VC4_HD_MAI_CTL_ENABLE			BIT(3)
-+/* Underflow error status bit, write 1 to clear. */
-+# define VC4_HD_MAI_CTL_ERRORE			BIT(2)
-+/* Overflow error status bit, write 1 to clear. */
-+# define VC4_HD_MAI_CTL_ERRORF			BIT(1)
-+/* Single-shot reset bit.  Read value is undefined. */
-+# define VC4_HD_MAI_CTL_RESET			BIT(0)
-+
-+#define VC4_HD_MAI_THR				0x018
-+# define VC4_HD_MAI_THR_PANICHIGH_MASK		VC4_MASK(29, 24)
-+# define VC4_HD_MAI_THR_PANICHIGH_SHIFT		24
-+# define VC4_HD_MAI_THR_PANICLOW_MASK		VC4_MASK(21, 16)
-+# define VC4_HD_MAI_THR_PANICLOW_SHIFT		16
-+# define VC4_HD_MAI_THR_DREQHIGH_MASK		VC4_MASK(13, 8)
-+# define VC4_HD_MAI_THR_DREQHIGH_SHIFT		8
-+# define VC4_HD_MAI_THR_DREQLOW_MASK		VC4_MASK(5, 0)
-+# define VC4_HD_MAI_THR_DREQLOW_SHIFT		0
-+
-+/* Format header to be placed on the MAI data. Unused. */
-+#define VC4_HD_MAI_FMT				0x01c
-+
-+/* Register for DMAing in audio data to be transported over the MAI
-+ * bus to the Falcon core.
-+ */
-+#define VC4_HD_MAI_DATA				0x020
-+
-+/* Divider from HDMI HSM clock to MAI serial clock.  Sampling period
-+ * converges to N / (M + 1) cycles.
-+ */
-+#define VC4_HD_MAI_SMP				0x02c
-+# define VC4_HD_MAI_SMP_N_MASK			VC4_MASK(31, 8)
-+# define VC4_HD_MAI_SMP_N_SHIFT			8
-+# define VC4_HD_MAI_SMP_M_MASK			VC4_MASK(7, 0)
-+# define VC4_HD_MAI_SMP_M_SHIFT			0
- 
- #define VC4_HD_VID_CTL				0x038
- # define VC4_HD_VID_CTL_ENABLE			BIT(31)
--- 
-2.12.0
-
 From 25ea82d7f7c869ff81ff8e64d24c5c4a896239fe Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@free-electrons.com>
 Date: Mon, 27 Feb 2017 12:28:03 -0800
diff --git a/gitrev b/gitrev
index f40c51224..92ca8d8f6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-89c9fea3c8034cdb2fd745f551cde0b507fd6893
+a1be8edda4fe1f0a75007f26000a51436800869d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b67337f95..213d6cfd1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -397,6 +397,7 @@ CONFIG_AUXDISPLAY=y
 # CONFIG_AVERAGE is not set
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -426,6 +427,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
@@ -1182,6 +1184,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DMI=y
 CONFIG_DM_LOG_USERSPACE=m
@@ -1227,8 +1230,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_HISI_HIBMC=m
@@ -1241,8 +1246,11 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1256,18 +1264,22 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NXP_PTN3460=m
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -1960,6 +1972,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -2001,6 +2014,7 @@ CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 # CONFIG_I2C_XILINX is not set
+CONFIG_I2C_XLP9XX=m
 CONFIG_I2C=y
 # CONFIG_I2O is not set
 # CONFIG_I40E_DCB is not set
@@ -2134,6 +2148,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2928,6 +2943,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4241,8 +4257,10 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR=y
@@ -4277,11 +4295,11 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -4928,7 +4946,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4944,7 +4962,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4979,6 +4999,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -5033,6 +5054,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -5048,6 +5071,7 @@ CONFIG_SND_SOC_APQ8016_SBC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5061,7 +5085,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5079,13 +5105,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5242,6 +5272,7 @@ CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+CONFIG_SPI_XLP=m
 CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 CONFIG_SPMI=m
@@ -5328,6 +5359,7 @@ CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5351,6 +5383,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -5535,6 +5568,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6288,3 +6322,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 86df52c5b..22c79c4e2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -397,6 +397,7 @@ CONFIG_AUXDISPLAY=y
 # CONFIG_AVERAGE is not set
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -426,6 +427,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
@@ -1172,6 +1174,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DMI=y
 CONFIG_DM_LOG_USERSPACE=m
@@ -1217,8 +1220,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_HISI_HIBMC=m
@@ -1231,8 +1236,11 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1246,18 +1254,22 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NXP_PTN3460=m
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -1943,6 +1955,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -1984,6 +1997,7 @@ CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 # CONFIG_I2C_XILINX is not set
+CONFIG_I2C_XLP9XX=m
 CONFIG_I2C=y
 # CONFIG_I2O is not set
 # CONFIG_I40E_DCB is not set
@@ -2117,6 +2131,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2908,6 +2923,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4219,8 +4235,10 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR=y
@@ -4255,11 +4273,11 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -4906,7 +4924,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4922,7 +4940,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4957,6 +4977,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -5010,6 +5031,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -5025,6 +5048,7 @@ CONFIG_SND_SOC_APQ8016_SBC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5038,7 +5062,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5056,13 +5082,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5219,6 +5249,7 @@ CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+CONFIG_SPI_XLP=m
 CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 CONFIG_SPMI=m
@@ -5305,6 +5336,7 @@ CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5328,6 +5360,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -5512,6 +5545,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6265,3 +6299,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d9eac6a58..02069e57e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -436,6 +436,7 @@ CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -465,6 +466,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DA9052=m
@@ -1255,6 +1257,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1322,6 +1325,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1340,8 +1344,11 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1371,18 +1378,22 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -2108,6 +2119,7 @@ CONFIG_I2C_IMX=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -2293,6 +2305,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 CONFIG_INPUT_DA9052_ONKEY=m
 CONFIG_INPUT_DA9055_ONKEY=m
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
@@ -3144,6 +3157,7 @@ CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC6387XB=y
 # CONFIG_MFD_TC6393XB is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4594,6 +4608,7 @@ CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
+# CONFIG_REGULATOR_TPS65132 is not set
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6524X=m
@@ -4603,6 +4618,7 @@ CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_WM8994=m
@@ -4636,12 +4652,12 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -5338,7 +5354,7 @@ CONFIG_SND_DAVINCI_SOC_VCIF=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -5354,7 +5370,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -5389,6 +5407,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_IMX_SOC=m
@@ -5460,6 +5479,8 @@ CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
@@ -5478,6 +5499,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5491,7 +5513,9 @@ CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5519,15 +5543,20 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_WM8962=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_ODROID=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5833,6 +5862,7 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5856,6 +5886,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -6054,6 +6085,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6872,3 +6904,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 69cb8c8d0..5a42e9842 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -421,6 +421,7 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -450,6 +451,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
@@ -1205,6 +1207,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1270,6 +1273,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1283,8 +1287,11 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1295,18 +1302,22 @@ CONFIG_DRM_NXP_PTN3460=m
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -2007,6 +2018,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -2181,6 +2193,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -3007,6 +3020,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4325,6 +4339,7 @@ CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
+# CONFIG_REGULATOR_TPS65132 is not set
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -4332,6 +4347,7 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_WM8994=m
@@ -4365,12 +4381,12 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -5033,7 +5049,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -5049,7 +5065,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -5084,6 +5102,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -5142,6 +5161,8 @@ CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -5157,6 +5178,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5170,7 +5192,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5188,13 +5212,18 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_ODROID=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5458,6 +5487,7 @@ CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5481,6 +5511,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -5669,6 +5700,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6454,3 +6486,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b030caff6..d8d4c2576 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -420,6 +420,7 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -449,6 +450,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
@@ -1195,6 +1197,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1260,6 +1263,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1273,8 +1277,11 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1285,18 +1292,22 @@ CONFIG_DRM_NXP_PTN3460=m
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -1990,6 +2001,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -2164,6 +2176,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2987,6 +3000,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4303,6 +4317,7 @@ CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
+# CONFIG_REGULATOR_TPS65132 is not set
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -4310,6 +4325,7 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_WM8994=m
@@ -4343,12 +4359,12 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -5011,7 +5027,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -5027,7 +5043,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -5062,6 +5080,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -5119,6 +5138,8 @@ CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -5134,6 +5155,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5147,7 +5169,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5165,13 +5189,18 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_ODROID=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5435,6 +5464,7 @@ CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5458,6 +5488,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -5646,6 +5677,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6431,3 +6463,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 77c7e7136..59aa14658 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -435,6 +435,7 @@ CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_CHARGER=m
@@ -464,6 +465,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DA9052=m
@@ -1245,6 +1247,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1312,6 +1315,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1330,8 +1334,11 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
@@ -1361,18 +1368,22 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_ROCKCHIP=m
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
@@ -2091,6 +2102,7 @@ CONFIG_I2C_IMX=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -2276,6 +2288,7 @@ CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 CONFIG_INPUT_DA9052_ONKEY=m
 CONFIG_INPUT_DA9055_ONKEY=m
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
@@ -3124,6 +3137,7 @@ CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC6387XB=y
 # CONFIG_MFD_TC6393XB is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4572,6 +4586,7 @@ CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
+# CONFIG_REGULATOR_TPS65132 is not set
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6524X=m
@@ -4581,6 +4596,7 @@ CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_WM8994=m
@@ -4614,12 +4630,12 @@ CONFIG_RMI4_F55=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_MBOX=y
@@ -5316,7 +5332,7 @@ CONFIG_SND_DAVINCI_SOC_VCIF=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -5332,7 +5348,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -5367,6 +5385,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_IMX_SOC=m
@@ -5437,6 +5456,8 @@ CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
@@ -5455,6 +5476,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -5468,7 +5490,9 @@ CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -5496,15 +5520,20 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_WM8962=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_ODROID=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5810,6 +5839,7 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5833,6 +5863,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
@@ -6031,6 +6062,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6849,3 +6881,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index a2c11e358..4f4af47b3 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -350,6 +350,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1051,6 +1052,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1094,8 +1096,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1116,7 +1120,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1125,18 +1131,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1861,6 +1871,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2030,6 +2041,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2847,6 +2859,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4029,6 +4042,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4688,7 +4703,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4704,7 +4719,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4738,6 +4755,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4790,6 +4808,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4804,6 +4824,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4817,7 +4838,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4840,6 +4863,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4856,10 +4881,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5049,6 +5076,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5248,6 +5276,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6020,3 +6049,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index ac61b2886..ec46e3847 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -351,6 +351,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1062,6 +1063,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1105,8 +1107,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1127,7 +1131,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1136,18 +1142,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1879,6 +1889,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2048,6 +2059,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2867,6 +2879,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4050,6 +4063,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4709,7 +4724,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4725,7 +4740,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4759,6 +4776,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4812,6 +4830,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4826,6 +4846,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4839,7 +4860,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4862,6 +4885,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4878,10 +4903,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5071,6 +5098,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5270,6 +5298,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6042,3 +6071,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 3cb33285a..d147e7b4d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -351,6 +351,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1062,6 +1063,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1105,8 +1107,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1127,7 +1131,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1136,18 +1142,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1879,6 +1889,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2048,6 +2059,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2867,6 +2879,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4050,6 +4063,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4709,7 +4724,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4725,7 +4740,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4759,6 +4776,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4812,6 +4830,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4826,6 +4846,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4839,7 +4860,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4862,6 +4885,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4878,10 +4903,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5071,6 +5098,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5270,6 +5298,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6040,3 +6069,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 05d9f82d1..8ced03c95 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -350,6 +350,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1051,6 +1052,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1094,8 +1096,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1116,7 +1120,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1125,18 +1131,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1861,6 +1871,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2030,6 +2041,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2847,6 +2859,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4029,6 +4042,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4688,7 +4703,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4704,7 +4719,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4738,6 +4755,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4790,6 +4808,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4804,6 +4824,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4817,7 +4838,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4840,6 +4863,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4856,10 +4881,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5049,6 +5076,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5248,6 +5276,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6018,3 +6047,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index a2360db2d..602dda3f1 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -300,6 +300,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1032,6 +1033,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1073,8 +1075,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1084,7 +1088,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1093,13 +1099,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1769,6 +1782,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1941,6 +1955,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2715,6 +2730,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3872,6 +3888,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4533,7 +4551,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4549,7 +4567,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4583,6 +4603,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4638,6 +4659,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4652,6 +4675,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4665,7 +4689,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4681,13 +4707,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4871,6 +4901,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4894,6 +4925,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -5056,6 +5088,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5756,3 +5789,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index b0170af60..e1ddff27a 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -299,6 +299,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1021,6 +1022,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1062,8 +1064,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1073,7 +1077,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1082,13 +1088,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1751,6 +1764,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1923,6 +1937,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2694,6 +2709,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3849,6 +3865,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4510,7 +4528,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4526,7 +4544,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4560,6 +4580,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4614,6 +4635,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4628,6 +4651,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4641,7 +4665,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4657,13 +4683,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4847,6 +4877,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4870,6 +4901,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -5032,6 +5064,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5732,3 +5765,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 16d1b0068..a11b4f639 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -294,6 +294,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -988,6 +989,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1029,8 +1031,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1040,7 +1044,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1049,13 +1055,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1722,6 +1735,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1887,6 +1901,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2661,6 +2676,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3812,6 +3828,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4464,7 +4482,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4480,7 +4498,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4514,6 +4534,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4567,6 +4588,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4581,6 +4604,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4594,7 +4618,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4610,13 +4636,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4800,6 +4830,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4823,6 +4854,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4985,6 +5017,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5679,3 +5712,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index f2fccc557..bbe941b93 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -293,6 +293,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -977,6 +978,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1018,8 +1020,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1029,7 +1033,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1038,13 +1044,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1704,6 +1717,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1869,6 +1883,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2640,6 +2655,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3789,6 +3805,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4441,7 +4459,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4457,7 +4475,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4491,6 +4511,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4543,6 +4564,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4557,6 +4580,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4570,7 +4594,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4586,13 +4612,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4776,6 +4806,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4799,6 +4830,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4961,6 +4993,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5655,3 +5688,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 4650bf7f6..53cb9c2a2 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -294,6 +294,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -987,6 +988,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1028,8 +1030,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1039,7 +1043,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1048,13 +1054,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1721,6 +1734,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1886,6 +1900,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2660,6 +2675,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3811,6 +3827,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4463,7 +4481,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4479,7 +4497,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4513,6 +4533,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4566,6 +4587,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4580,6 +4603,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4593,7 +4617,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4609,13 +4635,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4799,6 +4829,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4822,6 +4853,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4984,6 +5016,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5678,3 +5711,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index d8b8c478d..f82453a1f 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -293,6 +293,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -976,6 +977,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1017,8 +1019,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1028,7 +1032,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1037,13 +1043,20 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1703,6 +1716,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MPC=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -1868,6 +1882,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2639,6 +2654,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3788,6 +3804,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4440,7 +4458,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4456,7 +4474,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4490,6 +4510,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4542,6 +4563,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4556,6 +4579,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4569,7 +4593,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4585,13 +4611,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4775,6 +4805,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4798,6 +4829,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4960,6 +4992,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5654,3 +5687,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 5846bafdd..d177751c9 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -295,6 +295,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -982,6 +983,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1023,8 +1025,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1035,6 +1039,8 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1043,13 +1049,19 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1676,6 +1688,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PCA954x is not set
@@ -1835,6 +1848,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2598,6 +2612,7 @@ CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3703,6 +3718,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4361,7 +4378,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4377,7 +4394,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4411,6 +4430,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4463,6 +4483,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4477,6 +4499,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4490,7 +4513,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4506,13 +4531,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4692,6 +4721,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4715,6 +4745,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4883,6 +4914,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5566,3 +5598,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6aee60bcb..b7e13b2a4 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -294,6 +294,7 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -971,6 +972,7 @@ CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=y
@@ -1012,8 +1014,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1024,6 +1028,8 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1032,13 +1038,19 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1658,6 +1670,7 @@ CONFIG_I2C=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PCA954x is not set
@@ -1817,6 +1830,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2577,6 +2591,7 @@ CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -3680,6 +3695,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4338,7 +4355,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4354,7 +4371,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4388,6 +4407,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4439,6 +4459,8 @@ CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4453,6 +4475,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4466,7 +4489,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -4482,13 +4507,17 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -4668,6 +4697,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -4691,6 +4721,7 @@ CONFIG_TASKS_RCU=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_CRB=m
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -4859,6 +4890,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -5542,3 +5574,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 1f288c70f..3b7b36861 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -350,6 +350,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1094,6 +1095,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1137,8 +1139,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1159,7 +1163,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1168,16 +1174,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1905,6 +1917,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2054,6 +2067,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_OPA_VNIC=m
 # CONFIG_INFINIBAND_QEDR is not set
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
@@ -2078,6 +2092,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2900,6 +2915,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4074,6 +4090,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4739,7 +4757,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4755,7 +4773,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4789,6 +4809,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4842,6 +4863,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4856,6 +4879,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4869,7 +4893,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4892,6 +4918,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4908,10 +4936,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5105,6 +5135,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5302,6 +5333,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6071,3 +6103,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 07ba0e74f..191145943 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -349,6 +349,7 @@ CONFIG_B53_SRAB_DRIVER=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 # CONFIG_BACKLIGHT_BD6107 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -1083,6 +1084,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_ERA is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DMIID=y
+CONFIG_DM_INTEGRITY=m
 CONFIG_DMI_SYSFS=y
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
@@ -1126,8 +1128,10 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
@@ -1148,7 +1152,9 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1157,16 +1163,22 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SIL_SII8620=m
@@ -1887,6 +1899,7 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_MLXCPLD=m
 # CONFIG_I2C_MUX_PCA9541 is not set
@@ -2036,6 +2049,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_NES=m
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_OPA_VNIC=m
 # CONFIG_INFINIBAND_QEDR is not set
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_QIB=m
@@ -2060,6 +2074,7 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2880,6 +2895,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
@@ -4053,6 +4069,8 @@ CONFIG_REGMAP=y
 CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -4718,7 +4736,7 @@ CONFIG_SND_DARLA24=m
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_DESIGNWARE_PCM=m
+CONFIG_SND_DESIGNWARE_PCM=y
 CONFIG_SND_DICE=m
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_DRIVERS=y
@@ -4734,7 +4752,9 @@ CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_MOTU=m
 CONFIG_SND_FIREWIRE_TASCAM=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
@@ -4768,6 +4788,7 @@ CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HRTIMER=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INDIGODJ=m
@@ -4820,6 +4841,8 @@ CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -4834,6 +4857,7 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -4847,7 +4871,9 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -4870,6 +4896,8 @@ CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
@@ -4886,10 +4914,12 @@ CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X is not set
@@ -5083,6 +5113,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
@@ -5280,6 +5311,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TS4800=m
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -6049,3 +6081,4 @@ CONFIG_ZRAM=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSWAP=y
+# CONFIG_ZX_TDM is not set
diff --git a/kernel.spec b/kernel.spec
index 763794885..af859cded 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -558,9 +558,6 @@ Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..pa
 # Upstream fixes for i2c/serial/ethernet MAC addresses
 Patch435: bcm283x-fixes.patch
 
-# https://lists.freedesktop.org/archives/dri-devel/2017-February/133823.html
-Patch436: vc4-fix-vblank-cursor-update-issue.patch
-
 Patch437: bcm283x-hdmi-audio.patch
 
 # https://www.spinics.net/lists/arm-kernel/msg554183.html
@@ -591,11 +588,6 @@ Patch487: Add-EFI-signature-data-types.patch
 
 Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch
 
-# This doesn't apply. It seems like it could be replaced by
-# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5ac7eace2d00eab5ae0e9fdee63e38aee6001f7c
-# which has an explicit line about blacklisting
-Patch489: KEYS-Add-a-system-blacklist-keyring.patch
-
 Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
 
 Patch491: MODSIGN-Support-not-importing-certs-from-db.patch
@@ -2206,6 +2198,9 @@ fi
 #
 #
 %changelog
+* Thu May 04 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git3.1
+- Linux v4.11-7650-ga1be8ed
+
 * Wed May 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git2.1
 - Linux v4.11-4395-g89c9fea
 
diff --git a/sources b/sources
index 8489c6a20..17ce92cce 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.11-git2.xz) = 08bd451d07c139701bf8af78e06dbc176b6283200615d34b6f5ac048c559fc1519ddf87ed7bf01d19a0b347865273afb24ddb10c22ee6685e23f6a4ef9aba56a
+SHA512 (patch-4.11-git3.xz) = 4281a0d0ff677f816aeaf004c396311fc6e403f0ba3671b2ede1ae5ca88fc33745cc7bcbe050d29c9cae10e05e0b485948d21b3f5213b0037800484fe406dc93
diff --git a/vc4-fix-vblank-cursor-update-issue.patch b/vc4-fix-vblank-cursor-update-issue.patch
deleted file mode 100644
index 8537d67ca..000000000
--- a/vc4-fix-vblank-cursor-update-issue.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 6d24c1c5918907ab78a5729b78c0d165deb3cc2b Mon Sep 17 00:00:00 2001
-From: Michael Zoran <mzoran@crowfest.net>
-Date: Thu, 23 Feb 2017 17:54:31 -0800
-Subject: drm/vc4: Don't wait for vblank when updating the cursor
-
-Commonly used desktop environments such as xfce4 and gnome
-on debian sid can flood the graphics drivers with cursor
-updates.  Because the current implementation is waiting
-for a vblank between cursor updates, this will cause the
-display to hang for a long time since a typical refresh
-rate is only 60Hz.
-
-This is unnecessary and unexpected by user mode software,
-so simply swap out the cursor frame buffer without waiting.
-
-Signed-off-by: Michael Zoran <mzoran@crowfest.net>
-Reviewed-by: Eric Anholt <eric@anholt.net>
-Link: http://patchwork.freedesktop.org/patch/msgid/20170224015431.24583-1-mzoran@crowfest.net
-
-diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index f7a229d..110224c 100644
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -20,6 +20,7 @@
- 
- #include "vc4_drv.h"
- #include "vc4_regs.h"
-+#include "drm_atomic.h"
- #include "drm_atomic_helper.h"
- #include "drm_fb_cma_helper.h"
- #include "drm_plane_helper.h"
-@@ -769,12 +770,6 @@ vc4_update_plane(struct drm_plane *plane,
- 	if (!plane_state)
- 		goto out;
- 
--	/* If we're changing the cursor contents, do that in the
--	 * normal vblank-synced atomic path.
--	 */
--	if (fb != plane_state->fb)
--		goto out;
--
- 	/* No configuring new scaling in the fast path. */
- 	if (crtc_w != plane_state->crtc_w ||
- 	    crtc_h != plane_state->crtc_h ||
-@@ -783,6 +778,11 @@ vc4_update_plane(struct drm_plane *plane,
- 		goto out;
- 	}
- 
-+	if (fb != plane_state->fb) {
-+		drm_atomic_set_fb_for_plane(plane->state, fb);
-+		vc4_plane_async_set_fb(plane, fb);
-+	}
-+
- 	/* Set the cursor's position on the screen.  This is the
- 	 * expected change from the drm_mode_cursor_universal()
- 	 * helper.
--- 
-cgit v0.10.2
-