summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-12-27 16:26:26 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2016-12-27 16:26:26 +0100
commitd28c1866fb423eedb7e98324883c77e24756efe8 (patch)
tree5633022d9fd11cf9b4d5230dd302f987fa33cc61
parent9ea96a82a9afc439b39ee838a64fd0d9630d2835 (diff)
parent12a945943d7c7f2a3c4d848683cc9bb76b6fe7af (diff)
downloadkernel-4.10.0-0.rc1.git0.1.vanilla.knurd.1.fc25.tar.gz
kernel-4.10.0-0.rc1.git0.1.vanilla.knurd.1.fc25.tar.xz
kernel-4.10.0-0.rc1.git0.1.vanilla.knurd.1.fc25.zip
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc1.git0.1.vanilla.knurd.1.fc25
-rw-r--r--baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM1
-rw-r--r--baseconfig/CONFIG_AXP20X_POWER1
-rw-r--r--baseconfig/CONFIG_BMP2802
-rw-r--r--baseconfig/CONFIG_CHARGER_TPS652171
-rw-r--r--baseconfig/CONFIG_CRYPTO_SIMD1
-rw-r--r--baseconfig/CONFIG_FSL_PQ_MDIO (renamed from baseconfig/powerpc/CONFIG_FSL_PQ_MDIO)0
-rw-r--r--baseconfig/CONFIG_GPIO_SYSFS2
-rw-r--r--baseconfig/CONFIG_GPIO_TPS652181
-rw-r--r--baseconfig/CONFIG_LEDS_PM80581
-rw-r--r--baseconfig/CONFIG_MDIO_BUS_MUX1
-rw-r--r--baseconfig/CONFIG_MDIO_BUS_MUX_GPIO (renamed from baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_GPIO)0
-rw-r--r--baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG (renamed from baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_MMIOREG)0
-rw-r--r--baseconfig/CONFIG_MDIO_OCTEON (renamed from baseconfig/s390x/CONFIG_MDIO_OCTEON)0
-rw-r--r--baseconfig/CONFIG_MEDIA_CEC1
-rw-r--r--baseconfig/CONFIG_MFD_AAT2870_CORE1
-rw-r--r--baseconfig/CONFIG_MFD_AS37111
-rw-r--r--baseconfig/CONFIG_MFD_AXP20X1
-rw-r--r--baseconfig/CONFIG_MFD_AXP20X_RSB1
-rw-r--r--baseconfig/CONFIG_MFD_DA9052_I2C1
-rw-r--r--baseconfig/CONFIG_MFD_DA90551
-rw-r--r--baseconfig/CONFIG_MFD_LP87881
-rw-r--r--baseconfig/CONFIG_MFD_PM8XXX1
-rw-r--r--baseconfig/CONFIG_MFD_RC5T5831
-rw-r--r--baseconfig/CONFIG_MFD_SEC_CORE1
-rw-r--r--baseconfig/CONFIG_MFD_SMSC1
-rw-r--r--baseconfig/CONFIG_MMC_MTK2
-rw-r--r--baseconfig/CONFIG_PMIC_ADP55201
-rw-r--r--baseconfig/CONFIG_PMIC_DA903X1
-rw-r--r--baseconfig/CONFIG_QEDI1
-rw-r--r--baseconfig/CONFIG_SND_SOC_HDMI_CODEC1
-rw-r--r--baseconfig/CONFIG_W1_MASTER_DS1WM2
-rw-r--r--baseconfig/CONFIG_XZ_DEC_ARM1
-rw-r--r--baseconfig/CONFIG_XZ_DEC_ARMTHUMB1
-rw-r--r--baseconfig/arm/CONFIG_ARCH_MESON1
-rw-r--r--baseconfig/arm/CONFIG_ARM_PSCI_CHECKER1
-rw-r--r--baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ2
-rw-r--r--baseconfig/arm/CONFIG_BMP2801
-rw-r--r--baseconfig/arm/CONFIG_COMMON_CLK_PWM1
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE1
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE1
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE1
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE1
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM641
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM641
-rw-r--r--baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI1
-rw-r--r--baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC1
-rw-r--r--baseconfig/arm/CONFIG_DWMAC_MESON1
-rw-r--r--baseconfig/arm/CONFIG_EEPROM_AT251
-rw-r--r--baseconfig/arm/CONFIG_FSL_XGMAC_MDIO1
-rw-r--r--baseconfig/arm/CONFIG_HW_RANDOM_MESON1
-rw-r--r--baseconfig/arm/CONFIG_I2C1
-rw-r--r--baseconfig/arm/CONFIG_I2C_MESON1
-rw-r--r--baseconfig/arm/CONFIG_I2C_PXA1
-rw-r--r--baseconfig/arm/CONFIG_I2C_PXA_SLAVE1
-rw-r--r--baseconfig/arm/CONFIG_IR_MESON1
-rw-r--r--baseconfig/arm/CONFIG_MDIO_BUS_MUX1
-rw-r--r--baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO2
-rw-r--r--baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG2
-rw-r--r--baseconfig/arm/CONFIG_MDIO_GPIO1
-rw-r--r--baseconfig/arm/CONFIG_MESON_EFUSE1
-rw-r--r--baseconfig/arm/CONFIG_MESON_SM1
-rw-r--r--baseconfig/arm/CONFIG_MFD_PM8XXX1
-rw-r--r--baseconfig/arm/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/CONFIG_PHY_MESON8B_USB21
-rw-r--r--baseconfig/arm/CONFIG_PLATFORM_MHU2
-rw-r--r--baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT1
-rw-r--r--baseconfig/arm/CONFIG_PWM_MESON1
-rw-r--r--baseconfig/arm/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/arm/CONFIG_SERIAL_MESON1
-rw-r--r--baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE1
-rw-r--r--baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/arm/CONFIG_SPI_ARMADA_37001
-rw-r--r--baseconfig/arm/CONFIG_SPI_MESON_SPIFC1
-rw-r--r--baseconfig/arm/CONFIG_TEGRA_BPMP1
-rw-r--r--baseconfig/arm/CONFIG_TEGRA_HSP_MBOX1
-rw-r--r--baseconfig/arm/CONFIG_TEGRA_IVC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ1
-rw-r--r--baseconfig/arm/arm64/CONFIG_AXP20X_POWER1
-rw-r--r--baseconfig/arm/arm64/CONFIG_AXP288_ADC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_AXP288_CHARGER1
-rw-r--r--baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE1
-rw-r--r--baseconfig/arm/arm64/CONFIG_CAN_SUN4I1
-rw-r--r--baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX776861
-rw-r--r--baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/arm/arm64/CONFIG_DRM_MESON1
-rw-r--r--baseconfig/arm/arm64/CONFIG_EXTCON_AXP2881
-rw-r--r--baseconfig/arm/arm64/CONFIG_GPIO_AXP2091
-rw-r--r--baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP1
-rw-r--r--baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MFD_AXP20X1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MMC_MESON_GX1
-rw-r--r--baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SPI_SUN6I1
-rw-r--r--baseconfig/arm/arm64/CONFIG_TEGRA_GMI1
-rw-r--r--baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI1
-rw-r--r--baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ2
-rw-r--r--baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP2
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_MESON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI1
-rw-r--r--baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_GPIO_AXP2092
-rw-r--r--baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP1
-rw-r--r--baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MMC_MESON_GX1
-rw-r--r--baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP1
-rw-r--r--baseconfig/arm/armv7/CONFIG_TEGRA_GMI1
-rw-r--r--baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO (renamed from baseconfig/arm/armv7/lpae/CONFIG_TI_DAVINCI_MDIO)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC2
-rw-r--r--baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS652181
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS49001
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM80581
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX511
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM89601
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL1
-rw-r--r--baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM1
-rw-r--r--baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM1
-rw-r--r--baseconfig/powerpc/CONFIG_MDIO_OCTEON1
-rw-r--r--baseconfig/powerpc/CONFIG_MFD_SYSCON1
-rw-r--r--baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/x86/CONFIG_AXP288_ADC1
-rw-r--r--baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_RDT_A1
-rw-r--r--baseconfig/x86/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/x86/CONFIG_SURFACE3_WMI1
-rw-r--r--baseconfig/x86/CONFIG_SURFACE_3_BUTTON1
-rw-r--r--baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/x86/i686/CONFIG_MFD_SYSCON1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON1
-rw-r--r--filter-aarch64.sh2
-rw-r--r--filter-armv7hl.sh2
-rw-r--r--filter-i686.sh2
-rwxr-xr-xfilter-modules.sh2
-rw-r--r--filter-ppc64.sh2
-rw-r--r--filter-ppc64le.sh2
-rw-r--r--filter-ppc64p7.sh2
-rw-r--r--fixes-4.10.patch359
-rw-r--r--kernel-aarch64-debug.config91
-rw-r--r--kernel-aarch64.config91
-rw-r--r--kernel-armv7hl-debug.config71
-rw-r--r--kernel-armv7hl-lpae-debug.config72
-rw-r--r--kernel-armv7hl-lpae.config72
-rw-r--r--kernel-armv7hl.config71
-rw-r--r--kernel-i686-PAE.config26
-rw-r--r--kernel-i686-PAEdebug.config26
-rw-r--r--kernel-i686-debug.config26
-rw-r--r--kernel-i686.config26
-rw-r--r--kernel-ppc64-debug.config33
-rw-r--r--kernel-ppc64.config33
-rw-r--r--kernel-ppc64le-debug.config33
-rw-r--r--kernel-ppc64le.config33
-rw-r--r--kernel-ppc64p7-debug.config33
-rw-r--r--kernel-ppc64p7.config33
-rw-r--r--kernel-s390x-debug.config36
-rw-r--r--kernel-s390x.config36
-rw-r--r--kernel-x86_64-debug.config29
-rw-r--r--kernel-x86_64.config29
-rw-r--r--kernel.spec11
-rw-r--r--sources2
189 files changed, 1013 insertions, 439 deletions
diff --git a/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM b/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
deleted file mode 100644
index 01aca79d0..000000000
--- a/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
diff --git a/baseconfig/CONFIG_AXP20X_POWER b/baseconfig/CONFIG_AXP20X_POWER
deleted file mode 100644
index e02cee707..000000000
--- a/baseconfig/CONFIG_AXP20X_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AXP20X_POWER is not set
diff --git a/baseconfig/CONFIG_BMP280 b/baseconfig/CONFIG_BMP280
index e882be513..b41053b52 100644
--- a/baseconfig/CONFIG_BMP280
+++ b/baseconfig/CONFIG_BMP280
@@ -1 +1 @@
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
diff --git a/baseconfig/CONFIG_CHARGER_TPS65217 b/baseconfig/CONFIG_CHARGER_TPS65217
deleted file mode 100644
index 629b8503c..000000000
--- a/baseconfig/CONFIG_CHARGER_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_TPS65217 is not set
diff --git a/baseconfig/CONFIG_CRYPTO_SIMD b/baseconfig/CONFIG_CRYPTO_SIMD
new file mode 100644
index 000000000..91fac0ebe
--- /dev/null
+++ b/baseconfig/CONFIG_CRYPTO_SIMD
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SIMD=y
diff --git a/baseconfig/powerpc/CONFIG_FSL_PQ_MDIO b/baseconfig/CONFIG_FSL_PQ_MDIO
index f7952819a..f7952819a 100644
--- a/baseconfig/powerpc/CONFIG_FSL_PQ_MDIO
+++ b/baseconfig/CONFIG_FSL_PQ_MDIO
diff --git a/baseconfig/CONFIG_GPIO_SYSFS b/baseconfig/CONFIG_GPIO_SYSFS
index 52708d181..006904523 100644
--- a/baseconfig/CONFIG_GPIO_SYSFS
+++ b/baseconfig/CONFIG_GPIO_SYSFS
@@ -1 +1 @@
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
diff --git a/baseconfig/CONFIG_GPIO_TPS65218 b/baseconfig/CONFIG_GPIO_TPS65218
deleted file mode 100644
index 0b7ccda87..000000000
--- a/baseconfig/CONFIG_GPIO_TPS65218
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_TPS65218 is not set
diff --git a/baseconfig/CONFIG_LEDS_PM8058 b/baseconfig/CONFIG_LEDS_PM8058
deleted file mode 100644
index 601771aa9..000000000
--- a/baseconfig/CONFIG_LEDS_PM8058
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LEDS_PM8058 is not set
diff --git a/baseconfig/CONFIG_MDIO_BUS_MUX b/baseconfig/CONFIG_MDIO_BUS_MUX
new file mode 100644
index 000000000..0d74f0500
--- /dev/null
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX
@@ -0,0 +1 @@
+# CONFIG_MDIO_BUS_MUX is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..27b93466f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..4d738fd98 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/s390x/CONFIG_MDIO_OCTEON b/baseconfig/CONFIG_MDIO_OCTEON
index e14c4b041..e14c4b041 100644
--- a/baseconfig/s390x/CONFIG_MDIO_OCTEON
+++ b/baseconfig/CONFIG_MDIO_OCTEON
diff --git a/baseconfig/CONFIG_MEDIA_CEC b/baseconfig/CONFIG_MEDIA_CEC
deleted file mode 100644
index aad8ea4c0..000000000
--- a/baseconfig/CONFIG_MEDIA_CEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEDIA_CEC is not set
diff --git a/baseconfig/CONFIG_MFD_AAT2870_CORE b/baseconfig/CONFIG_MFD_AAT2870_CORE
new file mode 100644
index 000000000..9d4cf9056
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AAT2870_CORE
@@ -0,0 +1 @@
+# CONFIG_MFD_AAT2870_CORE is not set
diff --git a/baseconfig/CONFIG_MFD_AS3711 b/baseconfig/CONFIG_MFD_AS3711
new file mode 100644
index 000000000..53b3b04f1
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AS3711
@@ -0,0 +1 @@
+# CONFIG_MFD_AS3711 is not set
diff --git a/baseconfig/CONFIG_MFD_AXP20X b/baseconfig/CONFIG_MFD_AXP20X
new file mode 100644
index 000000000..1d658245a
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AXP20X
@@ -0,0 +1 @@
+# CONFIG_MFD_AXP20X is not set
diff --git a/baseconfig/CONFIG_MFD_AXP20X_RSB b/baseconfig/CONFIG_MFD_AXP20X_RSB
deleted file mode 100644
index 589a48fbd..000000000
--- a/baseconfig/CONFIG_MFD_AXP20X_RSB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AXP20X_RSB is not set
diff --git a/baseconfig/CONFIG_MFD_DA9052_I2C b/baseconfig/CONFIG_MFD_DA9052_I2C
new file mode 100644
index 000000000..c294bc24d
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_DA9052_I2C
@@ -0,0 +1 @@
+# CONFIG_MFD_DA9052_I2C is not set
diff --git a/baseconfig/CONFIG_MFD_DA9055 b/baseconfig/CONFIG_MFD_DA9055
new file mode 100644
index 000000000..3f7ae6423
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_DA9055
@@ -0,0 +1 @@
+# CONFIG_MFD_DA9055 is not set
diff --git a/baseconfig/CONFIG_MFD_LP8788 b/baseconfig/CONFIG_MFD_LP8788
new file mode 100644
index 000000000..4600a154f
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_LP8788
@@ -0,0 +1 @@
+# CONFIG_MFD_LP8788 is not set
diff --git a/baseconfig/CONFIG_MFD_PM8XXX b/baseconfig/CONFIG_MFD_PM8XXX
deleted file mode 100644
index c20d0cb19..000000000
--- a/baseconfig/CONFIG_MFD_PM8XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PM8XXX=m
diff --git a/baseconfig/CONFIG_MFD_RC5T583 b/baseconfig/CONFIG_MFD_RC5T583
new file mode 100644
index 000000000..f3976be09
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_RC5T583
@@ -0,0 +1 @@
+# CONFIG_MFD_RC5T583 is not set
diff --git a/baseconfig/CONFIG_MFD_SEC_CORE b/baseconfig/CONFIG_MFD_SEC_CORE
new file mode 100644
index 000000000..d6bc4de4d
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_SEC_CORE
@@ -0,0 +1 @@
+# CONFIG_MFD_SEC_CORE is not set
diff --git a/baseconfig/CONFIG_MFD_SMSC b/baseconfig/CONFIG_MFD_SMSC
new file mode 100644
index 000000000..998701017
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_SMSC
@@ -0,0 +1 @@
+# CONFIG_MFD_SMSC is not set
diff --git a/baseconfig/CONFIG_MMC_MTK b/baseconfig/CONFIG_MMC_MTK
index 8d1b25c48..d92a9072c 100644
--- a/baseconfig/CONFIG_MMC_MTK
+++ b/baseconfig/CONFIG_MMC_MTK
@@ -1 +1 @@
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
diff --git a/baseconfig/CONFIG_PMIC_ADP5520 b/baseconfig/CONFIG_PMIC_ADP5520
new file mode 100644
index 000000000..8664194c8
--- /dev/null
+++ b/baseconfig/CONFIG_PMIC_ADP5520
@@ -0,0 +1 @@
+# CONFIG_PMIC_ADP5520 is not set
diff --git a/baseconfig/CONFIG_PMIC_DA903X b/baseconfig/CONFIG_PMIC_DA903X
new file mode 100644
index 000000000..875cd2580
--- /dev/null
+++ b/baseconfig/CONFIG_PMIC_DA903X
@@ -0,0 +1 @@
+# CONFIG_PMIC_DA903X is not set
diff --git a/baseconfig/CONFIG_QEDI b/baseconfig/CONFIG_QEDI
new file mode 100644
index 000000000..c751aba20
--- /dev/null
+++ b/baseconfig/CONFIG_QEDI
@@ -0,0 +1 @@
+CONFIG_QEDI=m
diff --git a/baseconfig/CONFIG_SND_SOC_HDMI_CODEC b/baseconfig/CONFIG_SND_SOC_HDMI_CODEC
new file mode 100644
index 000000000..8b198f3fa
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_HDMI_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SOC_HDMI_CODEC=m
diff --git a/baseconfig/CONFIG_W1_MASTER_DS1WM b/baseconfig/CONFIG_W1_MASTER_DS1WM
index 24ca8ef38..bf2934c1e 100644
--- a/baseconfig/CONFIG_W1_MASTER_DS1WM
+++ b/baseconfig/CONFIG_W1_MASTER_DS1WM
@@ -1 +1 @@
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
diff --git a/baseconfig/CONFIG_XZ_DEC_ARM b/baseconfig/CONFIG_XZ_DEC_ARM
deleted file mode 100644
index 52cbc2d10..000000000
--- a/baseconfig/CONFIG_XZ_DEC_ARM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XZ_DEC_ARM=y
diff --git a/baseconfig/CONFIG_XZ_DEC_ARMTHUMB b/baseconfig/CONFIG_XZ_DEC_ARMTHUMB
deleted file mode 100644
index 50b05d115..000000000
--- a/baseconfig/CONFIG_XZ_DEC_ARMTHUMB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/baseconfig/arm/CONFIG_ARCH_MESON b/baseconfig/arm/CONFIG_ARCH_MESON
new file mode 100644
index 000000000..d13ebc08a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARCH_MESON
@@ -0,0 +1 @@
+CONFIG_ARCH_MESON=y
diff --git a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
new file mode 100644
index 000000000..dce78572b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
@@ -0,0 +1 @@
+CONFIG_ARM_PSCI_CHECKER=y
diff --git a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ b/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
index b2168cb2d..cd4598a17 100644
--- a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
+++ b/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
@@ -1 +1 @@
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
diff --git a/baseconfig/arm/CONFIG_BMP280 b/baseconfig/arm/CONFIG_BMP280
deleted file mode 100644
index b41053b52..000000000
--- a/baseconfig/arm/CONFIG_BMP280
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BMP280=m
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_PWM b/baseconfig/arm/CONFIG_COMMON_CLK_PWM
new file mode 100644
index 000000000..08193dd2c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_COMMON_CLK_PWM
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_PWM=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
new file mode 100644
index 000000000..ee9966699
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32_ARM64_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE
new file mode 100644
index 000000000..242e37489
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32_ARM_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
new file mode 100644
index 000000000..c59d53cfb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
new file mode 100644
index 000000000..6b13ea30c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64 b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
new file mode 100644
index 000000000..ba32f8501
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA256_ARM64=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64 b/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64
new file mode 100644
index 000000000..de1c4c957
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA512_ARM64=m
diff --git a/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI b/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
new file mode 100644
index 000000000..b6bc07970
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
@@ -0,0 +1 @@
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
diff --git a/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC b/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC
new file mode 100644
index 000000000..9bd8d9fd1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC
@@ -0,0 +1 @@
+CONFIG_DRM_DUMB_VGA_DAC=m
diff --git a/baseconfig/arm/CONFIG_DWMAC_MESON b/baseconfig/arm/CONFIG_DWMAC_MESON
new file mode 100644
index 000000000..ff4f84617
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DWMAC_MESON
@@ -0,0 +1 @@
+CONFIG_DWMAC_MESON=m
diff --git a/baseconfig/arm/CONFIG_EEPROM_AT25 b/baseconfig/arm/CONFIG_EEPROM_AT25
new file mode 100644
index 000000000..90358f33c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_EEPROM_AT25
@@ -0,0 +1 @@
+CONFIG_EEPROM_AT25=m
diff --git a/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO b/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO
new file mode 100644
index 000000000..9113f3294
--- /dev/null
+++ b/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO
@@ -0,0 +1 @@
+# CONFIG_FSL_XGMAC_MDIO is not set
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_MESON b/baseconfig/arm/CONFIG_HW_RANDOM_MESON
new file mode 100644
index 000000000..882698030
--- /dev/null
+++ b/baseconfig/arm/CONFIG_HW_RANDOM_MESON
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_MESON=m
diff --git a/baseconfig/arm/CONFIG_I2C b/baseconfig/arm/CONFIG_I2C
new file mode 100644
index 000000000..aafb657f5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C
@@ -0,0 +1 @@
+CONFIG_I2C=y
diff --git a/baseconfig/arm/CONFIG_I2C_MESON b/baseconfig/arm/CONFIG_I2C_MESON
new file mode 100644
index 000000000..373686139
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_MESON
@@ -0,0 +1 @@
+CONFIG_I2C_MESON=m
diff --git a/baseconfig/arm/CONFIG_I2C_PXA b/baseconfig/arm/CONFIG_I2C_PXA
new file mode 100644
index 000000000..59d18f0cb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_PXA
@@ -0,0 +1 @@
+CONFIG_I2C_PXA=m
diff --git a/baseconfig/arm/CONFIG_I2C_PXA_SLAVE b/baseconfig/arm/CONFIG_I2C_PXA_SLAVE
new file mode 100644
index 000000000..7cc440320
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_PXA_SLAVE
@@ -0,0 +1 @@
+# CONFIG_I2C_PXA_SLAVE is not set
diff --git a/baseconfig/arm/CONFIG_IR_MESON b/baseconfig/arm/CONFIG_IR_MESON
new file mode 100644
index 000000000..e248de441
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IR_MESON
@@ -0,0 +1 @@
+CONFIG_IR_MESON=m
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX b/baseconfig/arm/CONFIG_MDIO_BUS_MUX
new file mode 100644
index 000000000..19416a6ca
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX
@@ -0,0 +1 @@
+CONFIG_MDIO_BUS_MUX=m
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..5df332c5e 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
@@ -1 +1 @@
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_GPIO=m
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..bbb54cf22 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
@@ -1 +1 @@
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
diff --git a/baseconfig/arm/CONFIG_MDIO_GPIO b/baseconfig/arm/CONFIG_MDIO_GPIO
new file mode 100644
index 000000000..a317fa125
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MDIO_GPIO
@@ -0,0 +1 @@
+CONFIG_MDIO_GPIO=m
diff --git a/baseconfig/arm/CONFIG_MESON_EFUSE b/baseconfig/arm/CONFIG_MESON_EFUSE
new file mode 100644
index 000000000..832f28e6d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_EFUSE
@@ -0,0 +1 @@
+CONFIG_MESON_EFUSE=m
diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM
new file mode 100644
index 000000000..3cd5a9e30
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_SM
@@ -0,0 +1 @@
+CONFIG_MESON_SM=y
diff --git a/baseconfig/arm/CONFIG_MFD_PM8XXX b/baseconfig/arm/CONFIG_MFD_PM8XXX
new file mode 100644
index 000000000..9f7f192d0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MFD_PM8XXX
@@ -0,0 +1 @@
+# CONFIG_MFD_PM8XXX is not set
diff --git a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..d156cb188
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/CONFIG_PHY_MESON8B_USB2 b/baseconfig/arm/CONFIG_PHY_MESON8B_USB2
new file mode 100644
index 000000000..b238f12dc
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PHY_MESON8B_USB2
@@ -0,0 +1 @@
+CONFIG_PHY_MESON8B_USB2=m
diff --git a/baseconfig/arm/CONFIG_PLATFORM_MHU b/baseconfig/arm/CONFIG_PLATFORM_MHU
index b30b57613..4c29f9874 100644
--- a/baseconfig/arm/CONFIG_PLATFORM_MHU
+++ b/baseconfig/arm/CONFIG_PLATFORM_MHU
@@ -1 +1 @@
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
diff --git a/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT b/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT
new file mode 100644
index 000000000..af91a2b50
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT
@@ -0,0 +1 @@
+CONFIG_PM_DEVFREQ_EVENT=y
diff --git a/baseconfig/arm/CONFIG_PWM_MESON b/baseconfig/arm/CONFIG_PWM_MESON
new file mode 100644
index 000000000..bc2a778e3
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PWM_MESON
@@ -0,0 +1 @@
+CONFIG_PWM_MESON=m
diff --git a/baseconfig/arm/CONFIG_REGMAP_I2C b/baseconfig/arm/CONFIG_REGMAP_I2C
new file mode 100644
index 000000000..907c212ef
--- /dev/null
+++ b/baseconfig/arm/CONFIG_REGMAP_I2C
@@ -0,0 +1 @@
+CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON b/baseconfig/arm/CONFIG_SERIAL_MESON
new file mode 100644
index 000000000..aebe1f2c7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SERIAL_MESON
@@ -0,0 +1 @@
+CONFIG_SERIAL_MESON=y
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE b/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE
new file mode 100644
index 000000000..0b1831e77
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_MESON_CONSOLE=y
diff --git a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
new file mode 100644
index 000000000..28ea30190
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/arm/CONFIG_SPI_ARMADA_3700 b/baseconfig/arm/CONFIG_SPI_ARMADA_3700
new file mode 100644
index 000000000..f245ed398
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SPI_ARMADA_3700
@@ -0,0 +1 @@
+CONFIG_SPI_ARMADA_3700=m
diff --git a/baseconfig/arm/CONFIG_SPI_MESON_SPIFC b/baseconfig/arm/CONFIG_SPI_MESON_SPIFC
new file mode 100644
index 000000000..a0f6a6247
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SPI_MESON_SPIFC
@@ -0,0 +1 @@
+CONFIG_SPI_MESON_SPIFC=m
diff --git a/baseconfig/arm/CONFIG_TEGRA_BPMP b/baseconfig/arm/CONFIG_TEGRA_BPMP
new file mode 100644
index 000000000..348002b0b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_BPMP
@@ -0,0 +1 @@
+CONFIG_TEGRA_BPMP=y
diff --git a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX
new file mode 100644
index 000000000..3d46b7c93
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX
@@ -0,0 +1 @@
+CONFIG_TEGRA_HSP_MBOX=y
diff --git a/baseconfig/arm/CONFIG_TEGRA_IVC b/baseconfig/arm/CONFIG_TEGRA_IVC
new file mode 100644
index 000000000..cdcacbec2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_IVC
@@ -0,0 +1 @@
+CONFIG_TEGRA_IVC=y
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION b/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
new file mode 100644
index 000000000..92036b975
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
@@ -0,0 +1 @@
+CONFIG_ACPI_I2C_OPREGION=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
new file mode 100644
index 000000000..0439db330
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
@@ -0,0 +1 @@
+# CONFIG_ARCH_TEGRA_186_SOC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP b/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
new file mode 100644
index 000000000..5090299f2
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
@@ -0,0 +1 @@
+# CONFIG_ARM64_PTDUMP is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
new file mode 100644
index 000000000..3b878e832
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
@@ -0,0 +1 @@
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
new file mode 100644
index 000000000..d64e3e373
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA_DEVFREQ=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER b/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
new file mode 100644
index 000000000..ddf89f551
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
@@ -0,0 +1 @@
+CONFIG_AXP20X_POWER=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_ADC b/baseconfig/arm/arm64/CONFIG_AXP288_ADC
new file mode 100644
index 000000000..e138f36af
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_ADC
@@ -0,0 +1 @@
+CONFIG_AXP288_ADC=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER b/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
new file mode 100644
index 000000000..0418f962c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
@@ -0,0 +1 @@
+CONFIG_AXP288_CHARGER=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
new file mode 100644
index 000000000..e171b954b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
@@ -0,0 +1 @@
+CONFIG_AXP288_FUEL_GAUGE=m
diff --git a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I b/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
new file mode 100644
index 000000000..925f02a15
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
@@ -0,0 +1 @@
+CONFIG_CAN_SUN4I=m
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686
new file mode 100644
index 000000000..71ba0b45c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_MAX77686=m
diff --git a/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MESON b/baseconfig/arm/arm64/CONFIG_DRM_MESON
new file mode 100644
index 000000000..638714333
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MESON
@@ -0,0 +1 @@
+CONFIG_DRM_MESON=m
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288 b/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
new file mode 100644
index 000000000..7fadeb58d
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
@@ -0,0 +1 @@
+CONFIG_EXTCON_AXP288=m
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209 b/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
new file mode 100644
index 000000000..2365ae707
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
@@ -0,0 +1 @@
+CONFIG_GPIO_AXP209=m
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
new file mode 100644
index 000000000..cf37a6e35
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK b/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
new file mode 100644
index 000000000..e2fbdf907
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
@@ -0,0 +1 @@
+CONFIG_INPUT_AXP20X_PEK=m
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL b/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
new file mode 100644
index 000000000..d334d3f90
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
@@ -0,0 +1 @@
+CONFIG_MAX77620_THERMAL=m
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
new file mode 100644
index 000000000..f998244fd
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MAX77620_WATCHDOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
new file mode 100644
index 000000000..a9c8de737
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MESON_GXBB_WATCHDOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY b/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
new file mode 100644
index 000000000..cc59580cc
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
@@ -0,0 +1 @@
+CONFIG_MESON_GXL_PHY=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
new file mode 100644
index 000000000..2e5c153a9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
@@ -0,0 +1 @@
+# CONFIG_MESON_WATCHDOG is not set
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
new file mode 100644
index 000000000..ada79c0d1
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X=y
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
new file mode 100644
index 000000000..22c60295b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X_I2C=y
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
new file mode 100644
index 000000000..29150d51b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X_RSB=m
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX b/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
new file mode 100644
index 000000000..f6d05988f
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
@@ -0,0 +1 @@
+CONFIG_MMC_MESON_GX=m
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X b/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
new file mode 100644
index 000000000..6694810a6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
@@ -0,0 +1 @@
+CONFIG_REGULATOR_AXP20X=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
new file mode 100644
index 000000000..6cce5a1f7
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SUN4I_CODEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I b/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
new file mode 100644
index 000000000..031cd17b9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
@@ -0,0 +1 @@
+CONFIG_SPI_SUN6I=m
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI b/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
new file mode 100644
index 000000000..5def3e891
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
@@ -0,0 +1 @@
+CONFIG_TEGRA_GMI=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI b/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
new file mode 100644
index 000000000..258e716ab
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
@@ -0,0 +1 @@
+CONFIG_USB_MUSB_SUNXI=m
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ b/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
index 02cbb9860..ab6fb6341 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
+++ b/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
@@ -1 +1 @@
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ b/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
new file mode 100644
index 000000000..d64e3e373
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA_DEVFREQ=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
index bfa695c8e..6ebace316 100644
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
+++ b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
@@ -1 +1 @@
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
deleted file mode 100644
index c48791aae..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
new file mode 100644
index 000000000..149aea920
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
@@ -0,0 +1 @@
+CONFIG_DEVFREQ_GOV_PASSIVE=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE
deleted file mode 100644
index 84ede7faa..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE
deleted file mode 100644
index da1ec0019..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index 881ebdd7e..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE
deleted file mode 100644
index cc588b996..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_USERSPACE=y
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON
new file mode 100644
index 000000000..7a6179102
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DRM_MESON
@@ -0,0 +1 @@
+# CONFIG_DRM_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI b/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI
deleted file mode 100644
index fcd7748b7..000000000
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXYNOS_MIPI_DSI=y
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO b/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO
deleted file mode 100644
index 40b0b76d9..000000000
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXYNOS_VIDEO=y
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209 b/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
index c71682292..2365ae707 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
+++ b/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
@@ -1 +1 @@
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
diff --git a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP
new file mode 100644
index 000000000..cf37a6e35
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON b/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
deleted file mode 100644
index c20d19635..000000000
--- a/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO
deleted file mode 100644
index 5df332c5e..000000000
--- a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_BUS_MUX_GPIO=m
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG
deleted file mode 100644
index bbb54cf22..000000000
--- a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG b/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
new file mode 100644
index 000000000..05aa86754
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
@@ -0,0 +1 @@
+# CONFIG_MESON_GXBB_WATCHDOG is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY b/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY
new file mode 100644
index 000000000..5e3300106
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY
@@ -0,0 +1 @@
+# CONFIG_MESON_GXL_PHY is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG b/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG
new file mode 100644
index 000000000..477ce5e06
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MESON_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX b/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX
new file mode 100644
index 000000000..92f0e7e77
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX
@@ -0,0 +1 @@
+# CONFIG_MMC_MESON_GX is not set
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP b/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP
deleted file mode 100644
index 14c5f9e64..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_ANATOP=m
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_GMI b/baseconfig/arm/armv7/CONFIG_TEGRA_GMI
new file mode 100644
index 000000000..5def3e891
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_TEGRA_GMI
@@ -0,0 +1 @@
+CONFIG_TEGRA_GMI=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_DAVINCI_MDIO b/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO
index aee3112bc..aee3112bc 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_DAVINCI_MDIO
+++ b/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
index 14ebcca32..d56f76146 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
+++ b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
@@ -1 +1 @@
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
new file mode 100644
index 000000000..67462a76e
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
@@ -0,0 +1 @@
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
new file mode 100644
index 000000000..0b01e2387
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
@@ -0,0 +1 @@
+CONFIG_GPIO_TPS65218=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
new file mode 100644
index 000000000..0104290a1
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
@@ -0,0 +1 @@
+# CONFIG_GPIO_TS4900 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
new file mode 100644
index 000000000..301ef0606
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
@@ -0,0 +1 @@
+CONFIG_LEDS_PM8058=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51 b/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51
deleted file mode 100644
index 5abf8b0be..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_NOKIA_RX51 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE b/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE
deleted file mode 100644
index c41914e44..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PM8921_CORE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
new file mode 100644
index 000000000..8a053dc4d
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
@@ -0,0 +1 @@
+CONFIG_SND_SOC_WM8960=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL b/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
new file mode 100644
index 000000000..10dfa04f9
--- /dev/null
+++ b/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
@@ -0,0 +1 @@
+CONFIG_TI_SCI_PROTOCOL=m
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM b/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
new file mode 100644
index 000000000..8d0ade331
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32C_VPMSUM=m
diff --git a/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM b/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM
deleted file mode 100644
index 4ec94e83f..000000000
--- a/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPT_CRC32C_VPMSUM=m
diff --git a/baseconfig/powerpc/CONFIG_MDIO_OCTEON b/baseconfig/powerpc/CONFIG_MDIO_OCTEON
deleted file mode 100644
index 28cd01876..000000000
--- a/baseconfig/powerpc/CONFIG_MDIO_OCTEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_OCTEON=m
diff --git a/baseconfig/powerpc/CONFIG_MFD_SYSCON b/baseconfig/powerpc/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/powerpc/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/CONFIG_AXP288_ADC b/baseconfig/x86/CONFIG_AXP288_ADC
deleted file mode 100644
index 655b9822e..000000000
--- a/baseconfig/x86/CONFIG_AXP288_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_ADC=y
diff --git a/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE
deleted file mode 100644
index e1fc33e1d..000000000
--- a/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_FUEL_GAUGE=y
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT_A b/baseconfig/x86/CONFIG_INTEL_RDT_A
new file mode 100644
index 000000000..8c02d1afc
--- /dev/null
+++ b/baseconfig/x86/CONFIG_INTEL_RDT_A
@@ -0,0 +1 @@
+CONFIG_INTEL_RDT_A=y
diff --git a/baseconfig/x86/CONFIG_REGMAP_I2C b/baseconfig/x86/CONFIG_REGMAP_I2C
new file mode 100644
index 000000000..907c212ef
--- /dev/null
+++ b/baseconfig/x86/CONFIG_REGMAP_I2C
@@ -0,0 +1 @@
+CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/CONFIG_SURFACE3_WMI b/baseconfig/x86/CONFIG_SURFACE3_WMI
new file mode 100644
index 000000000..d2fbd9c7b
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SURFACE3_WMI
@@ -0,0 +1 @@
+CONFIG_SURFACE3_WMI=m
diff --git a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON b/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
new file mode 100644
index 000000000..8ba50033b
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
@@ -0,0 +1 @@
+CONFIG_SURFACE_3_BUTTON=m
diff --git a/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/i686/CONFIG_MFD_SYSCON b/baseconfig/x86/i686/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/x86/i686/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON b/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON b/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON
deleted file mode 100644
index 28cd01876..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_OCTEON=m
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index ed0bb61a1..de039f17f 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -13,4 +13,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi
ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index be07bd91c..863e1aeac 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco d
drmdrvs="amd armada bridge ast exynos i2c imx mgag200 msm omapdrm panel nouveau radeon rockchip tegra tilcdc via"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-i686.sh b/filter-i686.sh
index 01b5bfcb6..6041effae 100644
--- a/filter-i686.sh
+++ b/filter-i686.sh
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick mfd mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-modules.sh b/filter-modules.sh
index 9db3f9d19..f64eb90bc 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -34,7 +34,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215
drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh
diff --git a/filter-ppc64.sh b/filter-ppc64.sh
index 81397fbcf..5bf504063 100644
--- a/filter-ppc64.sh
+++ b/filter-ppc64.sh
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-ppc64le.sh b/filter-ppc64le.sh
index f53af8e5c..70eda9c18 100644
--- a/filter-ppc64le.sh
+++ b/filter-ppc64le.sh
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-ppc64p7.sh b/filter-ppc64p7.sh
index c868ddafb..0d42b4741 100644
--- a/filter-ppc64p7.sh
+++ b/filter-ppc64p7.sh
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/fixes-4.10.patch b/fixes-4.10.patch
new file mode 100644
index 000000000..19e86a1e0
--- /dev/null
+++ b/fixes-4.10.patch
@@ -0,0 +1,359 @@
+From b4b8664d291ac1998e0f0bcdc96b6397f0fe68b3 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Mon, 26 Dec 2016 04:10:19 -0500
+Subject: [PATCH 1/3] arm64: don't pull uaccess.h into *.S
+
+Split asm-only parts of arm64 uaccess.h into a new header and use that
+from *.S.
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+---
+ arch/arm64/include/asm/asm-uaccess.h | 65 ++++++++++++++++++++++++++++++++++++
+ arch/arm64/include/asm/uaccess.h | 64 -----------------------------------
+ arch/arm64/kernel/entry.S | 2 +-
+ arch/arm64/lib/clear_user.S | 2 +-
+ arch/arm64/lib/copy_from_user.S | 2 +-
+ arch/arm64/lib/copy_in_user.S | 2 +-
+ arch/arm64/lib/copy_to_user.S | 2 +-
+ arch/arm64/mm/cache.S | 2 +-
+ arch/arm64/xen/hypercall.S | 2 +-
+ 9 files changed, 72 insertions(+), 71 deletions(-)
+ create mode 100644 arch/arm64/include/asm/asm-uaccess.h
+
+diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h
+new file mode 100644
+index 0000000..df411f3
+--- /dev/null
++++ b/arch/arm64/include/asm/asm-uaccess.h
+@@ -0,0 +1,65 @@
++#ifndef __ASM_ASM_UACCESS_H
++#define __ASM_ASM_UACCESS_H
++
++#include <asm/alternative.h>
++#include <asm/kernel-pgtable.h>
++#include <asm/sysreg.h>
++#include <asm/assembler.h>
++
++/*
++ * User access enabling/disabling macros.
++ */
++#ifdef CONFIG_ARM64_SW_TTBR0_PAN
++ .macro __uaccess_ttbr0_disable, tmp1
++ mrs \tmp1, ttbr1_el1 // swapper_pg_dir
++ add \tmp1, \tmp1, #SWAPPER_DIR_SIZE // reserved_ttbr0 at the end of swapper_pg_dir
++ msr ttbr0_el1, \tmp1 // set reserved TTBR0_EL1
++ isb
++ .endm
++
++ .macro __uaccess_ttbr0_enable, tmp1
++ get_thread_info \tmp1
++ ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1
++ msr ttbr0_el1, \tmp1 // set the non-PAN TTBR0_EL1
++ isb
++ .endm
++
++ .macro uaccess_ttbr0_disable, tmp1
++alternative_if_not ARM64_HAS_PAN
++ __uaccess_ttbr0_disable \tmp1
++alternative_else_nop_endif
++ .endm
++
++ .macro uaccess_ttbr0_enable, tmp1, tmp2
++alternative_if_not ARM64_HAS_PAN
++ save_and_disable_irq \tmp2 // avoid preemption
++ __uaccess_ttbr0_enable \tmp1
++ restore_irq \tmp2
++alternative_else_nop_endif
++ .endm
++#else
++ .macro uaccess_ttbr0_disable, tmp1
++ .endm
++
++ .macro uaccess_ttbr0_enable, tmp1, tmp2
++ .endm
++#endif
++
++/*
++ * These macros are no-ops when UAO is present.
++ */
++ .macro uaccess_disable_not_uao, tmp1
++ uaccess_ttbr0_disable \tmp1
++alternative_if ARM64_ALT_PAN_NOT_UAO
++ SET_PSTATE_PAN(1)
++alternative_else_nop_endif
++ .endm
++
++ .macro uaccess_enable_not_uao, tmp1, tmp2
++ uaccess_ttbr0_enable \tmp1, \tmp2
++alternative_if ARM64_ALT_PAN_NOT_UAO
++ SET_PSTATE_PAN(0)
++alternative_else_nop_endif
++ .endm
++
++#endif
+diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
+index d26750c..46da3ea 100644
+--- a/arch/arm64/include/asm/uaccess.h
++++ b/arch/arm64/include/asm/uaccess.h
+@@ -22,8 +22,6 @@
+ #include <asm/kernel-pgtable.h>
+ #include <asm/sysreg.h>
+
+-#ifndef __ASSEMBLY__
+-
+ /*
+ * User space memory access functions
+ */
+@@ -424,66 +422,4 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count);
+ extern __must_check long strlen_user(const char __user *str);
+ extern __must_check long strnlen_user(const char __user *str, long n);
+
+-#else /* __ASSEMBLY__ */
+-
+-#include <asm/assembler.h>
+-
+-/*
+- * User access enabling/disabling macros.
+- */
+-#ifdef CONFIG_ARM64_SW_TTBR0_PAN
+- .macro __uaccess_ttbr0_disable, tmp1
+- mrs \tmp1, ttbr1_el1 // swapper_pg_dir
+- add \tmp1, \tmp1, #SWAPPER_DIR_SIZE // reserved_ttbr0 at the end of swapper_pg_dir
+- msr ttbr0_el1, \tmp1 // set reserved TTBR0_EL1
+- isb
+- .endm
+-
+- .macro __uaccess_ttbr0_enable, tmp1
+- get_thread_info \tmp1
+- ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1
+- msr ttbr0_el1, \tmp1 // set the non-PAN TTBR0_EL1
+- isb
+- .endm
+-
+- .macro uaccess_ttbr0_disable, tmp1
+-alternative_if_not ARM64_HAS_PAN
+- __uaccess_ttbr0_disable \tmp1
+-alternative_else_nop_endif
+- .endm
+-
+- .macro uaccess_ttbr0_enable, tmp1, tmp2
+-alternative_if_not ARM64_HAS_PAN
+- save_and_disable_irq \tmp2 // avoid preemption
+- __uaccess_ttbr0_enable \tmp1
+- restore_irq \tmp2
+-alternative_else_nop_endif
+- .endm
+-#else
+- .macro uaccess_ttbr0_disable, tmp1
+- .endm
+-
+- .macro uaccess_ttbr0_enable, tmp1, tmp2
+- .endm
+-#endif
+-
+-/*
+- * These macros are no-ops when UAO is present.
+- */
+- .macro uaccess_disable_not_uao, tmp1
+- uaccess_ttbr0_disable \tmp1
+-alternative_if ARM64_ALT_PAN_NOT_UAO
+- SET_PSTATE_PAN(1)
+-alternative_else_nop_endif
+- .endm
+-
+- .macro uaccess_enable_not_uao, tmp1, tmp2
+- uaccess_ttbr0_enable \tmp1, \tmp2
+-alternative_if ARM64_ALT_PAN_NOT_UAO
+- SET_PSTATE_PAN(0)
+-alternative_else_nop_endif
+- .endm
+-
+-#endif /* __ASSEMBLY__ */
+-
+ #endif /* __ASM_UACCESS_H */
+diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
+index a7504f4..923841f 100644
+--- a/arch/arm64/kernel/entry.S
++++ b/arch/arm64/kernel/entry.S
+@@ -31,7 +31,7 @@
+ #include <asm/memory.h>
+ #include <asm/ptrace.h>
+ #include <asm/thread_info.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+ #include <asm/unistd.h>
+
+ /*
+diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S
+index add4a13..e88fb99 100644
+--- a/arch/arm64/lib/clear_user.S
++++ b/arch/arm64/lib/clear_user.S
+@@ -17,7 +17,7 @@
+ */
+ #include <linux/linkage.h>
+
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+
+ .text
+
+diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S
+index fd6cd05..4b5d826 100644
+--- a/arch/arm64/lib/copy_from_user.S
++++ b/arch/arm64/lib/copy_from_user.S
+@@ -17,7 +17,7 @@
+ #include <linux/linkage.h>
+
+ #include <asm/cache.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+
+ /*
+ * Copy from user space to a kernel buffer (alignment handled by the hardware)
+diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S
+index d828540..47184c3 100644
+--- a/arch/arm64/lib/copy_in_user.S
++++ b/arch/arm64/lib/copy_in_user.S
+@@ -19,7 +19,7 @@
+ #include <linux/linkage.h>
+
+ #include <asm/cache.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+
+ /*
+ * Copy from user space to user space (alignment handled by the hardware)
+diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S
+index 3e6ae26..351f076 100644
+--- a/arch/arm64/lib/copy_to_user.S
++++ b/arch/arm64/lib/copy_to_user.S
+@@ -17,7 +17,7 @@
+ #include <linux/linkage.h>
+
+ #include <asm/cache.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+
+ /*
+ * Copy to user space from a kernel buffer (alignment handled by the hardware)
+diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S
+index 17f422a..83c27b6e 100644
+--- a/arch/arm64/mm/cache.S
++++ b/arch/arm64/mm/cache.S
+@@ -23,7 +23,7 @@
+ #include <asm/assembler.h>
+ #include <asm/cpufeature.h>
+ #include <asm/alternative.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+
+ /*
+ * flush_icache_range(start,end)
+diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
+index 47cf3f9..947830a 100644
+--- a/arch/arm64/xen/hypercall.S
++++ b/arch/arm64/xen/hypercall.S
+@@ -49,7 +49,7 @@
+
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+-#include <linux/uaccess.h>
++#include <asm/asm-uaccess.h>
+ #include <xen/interface/xen.h>
+
+
+--
+2.9.3
+
+From b9d9d6911bd5c370ad4b3aa57d758c093d17aed5 Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 26 Dec 2016 22:58:19 +0100
+Subject: [PATCH 2/3] smp/hotplug: Undo tglxs brainfart
+
+The attempt to prevent overwriting an active state resulted in a
+disaster which effectively disables all dynamically allocated hotplug
+states.
+
+Cleanup the mess.
+
+Fixes: dc280d936239 ("cpu/hotplug: Prevent overwriting of callbacks")
+Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
+Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ kernel/cpu.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/cpu.c b/kernel/cpu.c
+index 042fd7e..f75c4d0 100644
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -1471,6 +1471,7 @@ int __cpuhp_setup_state(enum cpuhp_state state,
+ bool multi_instance)
+ {
+ int cpu, ret = 0;
++ bool dynstate;
+
+ if (cpuhp_cb_check(state) || !name)
+ return -EINVAL;
+@@ -1480,6 +1481,12 @@ int __cpuhp_setup_state(enum cpuhp_state state,
+ ret = cpuhp_store_callbacks(state, name, startup, teardown,
+ multi_instance);
+
++ dynstate = state == CPUHP_AP_ONLINE_DYN;
++ if (ret > 0 && dynstate) {
++ state = ret;
++ ret = 0;
++ }
++
+ if (ret || !invoke || !startup)
+ goto out;
+
+@@ -1508,7 +1515,7 @@ int __cpuhp_setup_state(enum cpuhp_state state,
+ * If the requested state is CPUHP_AP_ONLINE_DYN, return the
+ * dynamically allocated state in case of success.
+ */
+- if (!ret && state == CPUHP_AP_ONLINE_DYN)
++ if (!ret && dynstate)
+ return state;
+ return ret;
+ }
+--
+2.9.3
+
+From 0dad3a3014a0b9e72521ff44f17e0054f43dcdea Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 26 Dec 2016 22:58:20 +0100
+Subject: [PATCH 3/3] x86/mce/AMD: Make the init code more robust
+
+If mce_device_init() fails then the mce device pointer is NULL and the
+AMD mce code happily dereferences it.
+
+Add a sanity check.
+
+Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
+Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+index ffacfdc..a5fd137 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
++++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+@@ -1182,6 +1182,9 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ const char *name = get_name(bank, NULL);
+ int err = 0;
+
++ if (!dev)
++ return -ENODEV;
++
+ if (is_shared_bank(bank)) {
+ nb = node_to_amd_nb(amd_get_nb_id(cpu));
+
+--
+2.9.3
+
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index eb1bb40f0..5e2372dfe 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -56,6 +56,7 @@ CONFIG_ACPI_DOCK=y
CONFIG_ACPI_EC_DEBUGFS=y
CONFIG_ACPI_FAN=m
CONFIG_ACPI_HED=y
+CONFIG_ACPI_I2C_OPREGION=y
CONFIG_ACPI_IPMI=m
# CONFIG_ACPI_NFIT_DEBUG is not set
CONFIG_ACPI_NFIT=m
@@ -295,7 +296,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SBSA_WATCHDOG=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -403,7 +404,10 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_ADC=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -713,6 +717,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m
CONFIG_CAN_SLCAN=m
# CONFIG_CAN_SOFTING_CS is not set
CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SUN4I=m
# CONFIG_CAN_TSCAN1 is not set
CONFIG_CAN_VCAN=m
# CONFIG_CAN_XILINXCAN is not set
@@ -781,7 +786,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -848,6 +852,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_HI3519 is not set
# CONFIG_COMMON_CLK_HI3798CV200 is not set
CONFIG_COMMON_CLK_HI6220=y
+CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
@@ -858,7 +863,7 @@ CONFIG_COMMON_CLK_HI6220=y
# CONFIG_COMMON_CLK_MT8135 is not set
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_SCPI=m
@@ -1016,6 +1021,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1120,6 +1126,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFXX is not set
CONFIG_DETECT_HUNG_TASK=y
# CONFIG_DEV_APPLETALK is not set
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
# CONFIG_DEVFREQ_GOV_PASSIVE is not set
# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1205,7 +1212,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_HDLCD=m
@@ -1230,6 +1237,7 @@ CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_MESON=m
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_MSM_DSI is not set
@@ -1364,6 +1372,7 @@ CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DW_WATCHDOG=m
CONFIG_DYNAMIC_DEBUG=y
@@ -1386,7 +1395,7 @@ CONFIG_EDAC=y
CONFIG_EEPROM_93CX6=m
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_AT25=m
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
# CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
@@ -1435,6 +1444,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON=m
# CONFIG_EXTCON_MAX3355 is not set
@@ -1595,6 +1605,8 @@ CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ERRATUM_A008585=y
# CONFIG_FSL_MC_BUS is not set
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1658,6 +1670,7 @@ CONFIG_GIRBIL_DONGLE=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DEVRES=y
@@ -1688,10 +1701,9 @@ CONFIG_GPIO_PL061=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -1894,6 +1906,7 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_CAVIUM=m
CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1943,7 +1956,7 @@ CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
-CONFIG_I2C=m
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -1986,6 +1999,7 @@ CONFIG_I2C_VERSATILE=m
CONFIG_I2C_VIPERBOARD=m
CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
+CONFIG_I2C=y
# CONFIG_I2O is not set
# CONFIG_I40E_DCB is not set
# CONFIG_I40E_FCOE is not set
@@ -2109,6 +2123,7 @@ CONFIG_INPUT_APANEL=m
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+CONFIG_INPUT_AXP20X_PEK=m
# CONFIG_INPUT_BMA150 is not set
CONFIG_INPUT_CM109=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -2346,6 +2361,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2606,7 +2622,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2738,6 +2753,8 @@ CONFIG_MAX30100=m
# CONFIG_MAX5487 is not set
# CONFIG_MAX5821 is not set
# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_MAX77620_WATCHDOG=m
# CONFIG_MAXIM_THERMOCOUPLE is not set
CONFIG_MAX_RAW_DEVS=8192
CONFIG_MAXSMP=y
@@ -2757,9 +2774,10 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_GPIO=m
CONFIG_MDIO_HISI_FEMAC=m
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_SUN4I is not set
@@ -2779,7 +2797,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2812,27 +2829,36 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
+CONFIG_MESON_EFUSE=m
+CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_SM=y
+# CONFIG_MESON_WATCHDOG is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
CONFIG_MFD_AC100=m
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+CONFIG_MFD_AXP20X_I2C=y
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_AXP20X=y
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2844,6 +2870,7 @@ CONFIG_MFD_HI655X_PMIC=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
CONFIG_MFD_MAX77620=y
# CONFIG_MFD_MAX77686 is not set
@@ -2860,8 +2887,9 @@ CONFIG_MFD_MAX77620=y
# CONFIG_MFD_NVEC is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_PM8XXX is not set
CONFIG_MFD_QCOM_RPM=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
CONFIG_MFD_RK808=m
@@ -2869,10 +2897,12 @@ CONFIG_MFD_RK808=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
@@ -2965,7 +2995,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
# CONFIG_MMC_QCOM_DML is not set
CONFIG_MMC_REALTEK_PCI=m
@@ -3840,6 +3871,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
# CONFIG_PHONET is not set
CONFIG_PHY_HI6220_USB=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -3893,7 +3925,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
# CONFIG_PKCS7_TEST_KEY is not set
# CONFIG_PL320_MBOX is not set
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLIP is not set
CONFIG_PLX_HERMES=m
@@ -3901,9 +3933,11 @@ CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_AUTOSLEEP is not set
CONFIG_PMBUS=m
CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_PM_DEVFREQ=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
# CONFIG_PMIC_OPREGION is not set
CONFIG_PM_OPP=y
CONFIG_PM_STD_PARTITION=""
@@ -3983,6 +4017,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PWM_BCM2835=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
+CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SUN4I=m
@@ -4017,6 +4052,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_QCOM_WDT=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4108,12 +4144,13 @@ CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
CONFIG_REGULATOR_ACT8865=m
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_AXP20X=m
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4716,6 +4753,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MVEBU_CONSOLE=y
@@ -4966,6 +5005,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5035,6 +5075,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
+CONFIG_SND_SUN4I_CODEC=m
CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
@@ -5093,6 +5134,7 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5102,7 +5144,7 @@ CONFIG_SPI_ROCKCHIP=m
# CONFIG_SPI_SC18IS602 is not set
CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
CONFIG_SPI_TEGRA114=m
# CONFIG_SPI_TEGRA20_SFLASH is not set
# CONFIG_SPI_TEGRA20_SLINK is not set
@@ -5261,9 +5303,11 @@ CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_TEGRA_ACONNECT=m
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
CONFIG_TEGRA_MC=y
@@ -5651,6 +5695,7 @@ CONFIG_USB_MSM_OTG=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_SUNXI=m
# CONFIG_USB_MUSB_TUSB6010 is not set
# CONFIG_USB_MV_U3D is not set
CONFIG_USB_MV_UDC=m
@@ -6006,7 +6051,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index e7112c917..c33da88ca 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -56,6 +56,7 @@ CONFIG_ACPI_DOCK=y
CONFIG_ACPI_EC_DEBUGFS=y
CONFIG_ACPI_FAN=m
CONFIG_ACPI_HED=y
+CONFIG_ACPI_I2C_OPREGION=y
CONFIG_ACPI_IPMI=m
# CONFIG_ACPI_NFIT_DEBUG is not set
CONFIG_ACPI_NFIT=m
@@ -295,7 +296,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SBSA_WATCHDOG=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -403,7 +404,10 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_ADC=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -713,6 +717,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m
CONFIG_CAN_SLCAN=m
# CONFIG_CAN_SOFTING_CS is not set
CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SUN4I=m
# CONFIG_CAN_TSCAN1 is not set
CONFIG_CAN_VCAN=m
# CONFIG_CAN_XILINXCAN is not set
@@ -781,7 +786,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -848,6 +852,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_HI3519 is not set
# CONFIG_COMMON_CLK_HI3798CV200 is not set
CONFIG_COMMON_CLK_HI6220=y
+CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
@@ -858,7 +863,7 @@ CONFIG_COMMON_CLK_HI6220=y
# CONFIG_COMMON_CLK_MT8135 is not set
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_SCPI=m
@@ -1015,6 +1020,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1111,6 +1117,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_DEFXX is not set
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_DEV_APPLETALK is not set
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
# CONFIG_DEVFREQ_GOV_PASSIVE is not set
# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1195,7 +1202,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_HDLCD=m
@@ -1220,6 +1227,7 @@ CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_MESON=m
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_MSM_DSI is not set
@@ -1354,6 +1362,7 @@ CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DW_WATCHDOG=m
CONFIG_DYNAMIC_DEBUG=y
@@ -1376,7 +1385,7 @@ CONFIG_EDAC=y
CONFIG_EEPROM_93CX6=m
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_AT25=m
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
# CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
@@ -1425,6 +1434,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_AXP288=m
CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON=m
# CONFIG_EXTCON_MAX3355 is not set
@@ -1578,6 +1588,8 @@ CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ERRATUM_A008585=y
# CONFIG_FSL_MC_BUS is not set
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1641,6 +1653,7 @@ CONFIG_GIRBIL_DONGLE=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DEVRES=y
@@ -1671,10 +1684,9 @@ CONFIG_GPIO_PL061=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -1877,6 +1889,7 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_CAVIUM=m
CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1926,7 +1939,7 @@ CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
-CONFIG_I2C=m
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -1969,6 +1982,7 @@ CONFIG_I2C_VERSATILE=m
CONFIG_I2C_VIPERBOARD=m
CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
+CONFIG_I2C=y
# CONFIG_I2O is not set
# CONFIG_I40E_DCB is not set
# CONFIG_I40E_FCOE is not set
@@ -2092,6 +2106,7 @@ CONFIG_INPUT_APANEL=m
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+CONFIG_INPUT_AXP20X_PEK=m
# CONFIG_INPUT_BMA150 is not set
CONFIG_INPUT_CM109=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -2329,6 +2344,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2587,7 +2603,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2719,6 +2734,8 @@ CONFIG_MAX30100=m
# CONFIG_MAX5487 is not set
# CONFIG_MAX5821 is not set
# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_MAX77620_WATCHDOG=m
# CONFIG_MAXIM_THERMOCOUPLE is not set
CONFIG_MAX_RAW_DEVS=8192
# CONFIG_MC3230 is not set
@@ -2737,9 +2754,10 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_GPIO=m
CONFIG_MDIO_HISI_FEMAC=m
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_SUN4I is not set
@@ -2759,7 +2777,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2792,27 +2809,36 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
+CONFIG_MESON_EFUSE=m
+CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_SM=y
+# CONFIG_MESON_WATCHDOG is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
CONFIG_MFD_AC100=m
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+CONFIG_MFD_AXP20X_I2C=y
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_AXP20X=y
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2824,6 +2850,7 @@ CONFIG_MFD_HI655X_PMIC=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
CONFIG_MFD_MAX77620=y
# CONFIG_MFD_MAX77686 is not set
@@ -2840,8 +2867,9 @@ CONFIG_MFD_MAX77620=y
# CONFIG_MFD_NVEC is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_PM8XXX is not set
CONFIG_MFD_QCOM_RPM=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
CONFIG_MFD_RK808=m
@@ -2849,10 +2877,12 @@ CONFIG_MFD_RK808=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
@@ -2945,7 +2975,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
# CONFIG_MMC_QCOM_DML is not set
CONFIG_MMC_REALTEK_PCI=m
@@ -3819,6 +3850,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
# CONFIG_PHONET is not set
CONFIG_PHY_HI6220_USB=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -3872,7 +3904,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
# CONFIG_PKCS7_TEST_KEY is not set
# CONFIG_PL320_MBOX is not set
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLIP is not set
CONFIG_PLX_HERMES=m
@@ -3880,9 +3912,11 @@ CONFIG_PLX_HERMES=m
# CONFIG_PM_AUTOSLEEP is not set
CONFIG_PMBUS=m
CONFIG_PM_DEBUG=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_PM_DEVFREQ=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
# CONFIG_PMIC_OPREGION is not set
CONFIG_PM_OPP=y
CONFIG_PM_STD_PARTITION=""
@@ -3961,6 +3995,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PWM_BCM2835=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
+CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SUN4I=m
@@ -3995,6 +4030,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_QCOM_WDT=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4086,12 +4122,13 @@ CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
CONFIG_REGULATOR_ACT8865=m
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_AXP20X=m
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4694,6 +4731,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MVEBU_CONSOLE=y
@@ -4943,6 +4982,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5012,6 +5052,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
+CONFIG_SND_SUN4I_CODEC=m
CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
@@ -5070,6 +5111,7 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5079,7 +5121,7 @@ CONFIG_SPI_ROCKCHIP=m
# CONFIG_SPI_SC18IS602 is not set
CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
CONFIG_SPI_TEGRA114=m
# CONFIG_SPI_TEGRA20_SFLASH is not set
# CONFIG_SPI_TEGRA20_SLINK is not set
@@ -5238,9 +5280,11 @@ CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_TEGRA_ACONNECT=m
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
CONFIG_TEGRA_MC=y
@@ -5628,6 +5672,7 @@ CONFIG_USB_MSM_OTG=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_SUNXI=m
# CONFIG_USB_MUSB_TUSB6010 is not set
# CONFIG_USB_MV_U3D is not set
CONFIG_USB_MV_UDC=m
@@ -5983,7 +6028,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index fc0cea365..850784886 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -302,7 +302,7 @@ CONFIG_ARM_ERRATA_825619=y
CONFIG_ARM_ERRATA_852421=y
CONFIG_ARM_ERRATA_852423=y
CONFIG_ARM_EXYNOS5440_CPUFREQ=m
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
CONFIG_ARM_EXYNOS_CPUIDLE=y
CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3_ITS=y
@@ -324,7 +324,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -917,7 +917,7 @@ CONFIG_COMMON_CLK_MAX77802=m
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
CONFIG_COMMON_CLK_PALMAS=m
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
@@ -1093,6 +1093,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1203,14 +1204,14 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
CONFIG_DETECT_HUNG_TASK=y
# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_DEVKMEM is not set
CONFIG_DEVMEM=y
@@ -1294,7 +1295,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_DW_HDMI=m
@@ -1346,6 +1347,7 @@ CONFIG_DRM_IMX_TVE=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MESON is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_MSM_DSI is not set
@@ -1501,6 +1503,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
CONFIG_DWMAC_GENERIC=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUNXI=m
CONFIG_DW_WATCHDOG=m
@@ -1591,9 +1594,7 @@ CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
# CONFIG_EXYNOS_IOMMU is not set
-CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZNPS_GIC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
@@ -1815,7 +1816,7 @@ CONFIG_GPIO_74X164=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DA9052=m
@@ -1851,10 +1852,10 @@ CONFIG_GPIO_PL061=y
CONFIG_GPIO_STMPE=y
# CONFIG_GPIO_SX150X is not set
CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
+CONFIG_GPIO_TPS65218=m
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
@@ -2064,6 +2065,7 @@ CONFIG_HW_PERF_EVENTS=y
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_MXC_RNGA=m
CONFIG_HW_RANDOM_OMAP3_ROM=m
@@ -2115,6 +2117,7 @@ CONFIG_I2C_HID=m
CONFIG_I2C_IMX_LPI2C=m
CONFIG_I2C_IMX=m
# CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -2537,6 +2540,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2822,7 +2826,7 @@ CONFIG_LEDS_NS2=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
+CONFIG_LEDS_PM8058=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2942,7 +2946,6 @@ CONFIG_MACH_DOVE=y
# CONFIG_MACH_FLINT is not set
# CONFIG_MACH_MARVELL_JASPER is not set
CONFIG_MACH_MMP2_DT=y
-# CONFIG_MACH_NOKIA_RX51 is not set
# CONFIG_MACH_OMAP3517EVM is not set
# CONFIG_MACH_OMAP3_PANDORA is not set
# CONFIG_MACH_OMAP_LDP is not set
@@ -2996,8 +2999,9 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
CONFIG_MDIO_SUN4I=m
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
@@ -3014,7 +3018,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -3047,7 +3050,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
-CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SM=y
+CONFIG_MESON_WATCHDOG=m
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_88PM800=m
CONFIG_MFD_88PM805=m
@@ -3103,7 +3110,7 @@ CONFIG_MFD_NVEC=y
CONFIG_MFD_OMAP_USB_HOST=y
CONFIG_MFD_PALMAS=y
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8921_CORE=m
+# CONFIG_MFD_PM8921_CORE is not set
CONFIG_MFD_PM8XXX=m
CONFIG_MFD_QCOM_RPM=m
# CONFIG_MFD_RC5T583 is not set
@@ -3214,7 +3221,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_MXC=m
CONFIG_MMC_OMAP_HS=m
@@ -4180,6 +4188,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_EXYNOS_DP_VIDEO=m
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4244,7 +4253,7 @@ CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
CONFIG_PL320_MBOX=y
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
@@ -4341,6 +4350,7 @@ CONFIG_PWM_CROS_EC=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
CONFIG_PWM_IMX=m
+CONFIG_PWM_MESON=m
CONFIG_PWM_OMAP_DMTIMER=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
@@ -4385,6 +4395,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_QCOM_WDT=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -5137,6 +5148,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
# CONFIG_SERIAL_MPS2_UART is not set
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_MSM=y
@@ -5434,6 +5447,7 @@ CONFIG_SND_SOC_FSL_SSI=m
CONFIG_SND_SOC_FSL_UTILS=m
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_IMG is not set
CONFIG_SND_SOC_IMX_AUDMUX=m
@@ -5532,7 +5546,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
CONFIG_SND_SOC_WM8903=m
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
@@ -5632,6 +5646,7 @@ CONFIG_SPI_IMX=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_MXS=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=m
@@ -5804,9 +5819,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_MC=y
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
@@ -6539,7 +6556,7 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -6612,7 +6629,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_GPIO=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cb311957b..59619fe55 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -294,7 +294,7 @@ CONFIG_ARM_ERRATA_825619=y
CONFIG_ARM_ERRATA_852421=y
CONFIG_ARM_ERRATA_852423=y
CONFIG_ARM_EXYNOS5440_CPUFREQ=m
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
CONFIG_ARM_EXYNOS_CPUIDLE=y
CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3_ITS=y
@@ -314,7 +314,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -817,7 +817,6 @@ CONFIG_CHARGER_MAX8997=m
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
CONFIG_CHARGER_TPS65090=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -894,7 +893,7 @@ CONFIG_COMMON_CLK_MAX77802=m
# CONFIG_COMMON_CLK_MT8135 is not set
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_COMMON_CLK_SCPI=m
@@ -1049,6 +1048,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1158,14 +1158,14 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
CONFIG_DETECT_HUNG_TASK=y
# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_DEVKMEM is not set
CONFIG_DEVMEM=y
@@ -1248,7 +1248,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_DW_HDMI=m
@@ -1293,6 +1293,7 @@ CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MESON is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
CONFIG_DRM_MXSFB=m
@@ -1428,6 +1429,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
CONFIG_DWMAC_GENERIC=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUNXI=m
CONFIG_DW_WATCHDOG=m
@@ -1516,9 +1518,7 @@ CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
# CONFIG_EXYNOS_IOMMU is not set
-CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZNPS_GIC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
@@ -1671,6 +1671,8 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1733,7 +1735,7 @@ CONFIG_GPIO_74X164=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DAVINCI=y
@@ -1765,10 +1767,9 @@ CONFIG_GPIO_PL061=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
# CONFIG_GPIO_TS4900 is not set
@@ -1975,6 +1976,7 @@ CONFIG_HW_PERF_EVENTS=y
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=m
@@ -2021,6 +2023,7 @@ CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -2238,7 +2241,6 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
CONFIG_INPUT_SPARSEKMAP=m
CONFIG_INPUT_TABLET=y
CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_WISTRON_BTNS=m
CONFIG_INPUT_WM831X_ON=m
@@ -2427,6 +2429,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2707,7 +2710,6 @@ CONFIG_LEDS_NS2=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_PWM=m
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2873,8 +2875,9 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
CONFIG_MDIO_SUN4I=m
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
@@ -2889,7 +2892,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2922,7 +2924,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
-CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SM=y
+CONFIG_MESON_WATCHDOG=m
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
@@ -2978,7 +2984,7 @@ CONFIG_MFD_MAX8997=y
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_MFD_PM8921_CORE is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_PM8XXX is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -3087,7 +3093,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_OMAP_HS=m
# CONFIG_MMC_QCOM_DML is not set
@@ -3982,6 +3989,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_EXYNOS_DP_VIDEO=m
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4033,7 +4041,7 @@ CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
CONFIG_PL320_MBOX=y
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
@@ -4126,6 +4134,7 @@ CONFIG_PWM_BCM2835=m
CONFIG_PWM_CROS_EC=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
+CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SAMSUNG=m
@@ -4147,6 +4156,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
# CONFIG_QCOM_SPMI_VADC is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4246,7 +4256,7 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_ACT8865 is not set
CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
+# CONFIG_REGULATOR_ANATOP is not set
CONFIG_REGULATOR_AS3722=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_DA9210=m
@@ -4868,6 +4878,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
# CONFIG_SERIAL_MPS2_UART is not set
CONFIG_SERIAL_MVEBU_CONSOLE=y
CONFIG_SERIAL_MVEBU_UART=y
@@ -5130,6 +5142,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5294,6 +5307,7 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5460,9 +5474,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
# CONFIG_TEGRA20_MC is not set
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
# CONFIG_TEGRA_IOMMU_GART is not set
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
@@ -6155,7 +6171,7 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -6228,7 +6244,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_GPIO=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8ae8baab4..56aa69084 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -294,7 +294,7 @@ CONFIG_ARM_ERRATA_825619=y
CONFIG_ARM_ERRATA_852421=y
CONFIG_ARM_ERRATA_852423=y
CONFIG_ARM_EXYNOS5440_CPUFREQ=m
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
CONFIG_ARM_EXYNOS_CPUIDLE=y
CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3_ITS=y
@@ -314,7 +314,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -817,7 +817,6 @@ CONFIG_CHARGER_MAX8997=m
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
CONFIG_CHARGER_TPS65090=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -894,7 +893,7 @@ CONFIG_COMMON_CLK_MAX77802=m
# CONFIG_COMMON_CLK_MT8135 is not set
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_COMMON_CLK_SCPI=m
@@ -1048,6 +1047,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1149,14 +1149,14 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_DEVKMEM is not set
CONFIG_DEVMEM=y
@@ -1239,7 +1239,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_DW_HDMI=m
@@ -1284,6 +1284,7 @@ CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MESON is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
CONFIG_DRM_MXSFB=m
@@ -1419,6 +1420,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
CONFIG_DWMAC_GENERIC=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUNXI=m
CONFIG_DW_WATCHDOG=m
@@ -1507,9 +1509,7 @@ CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
# CONFIG_EXYNOS_IOMMU is not set
-CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZNPS_GIC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
@@ -1655,6 +1655,8 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1717,7 +1719,7 @@ CONFIG_GPIO_74X164=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DAVINCI=y
@@ -1749,10 +1751,9 @@ CONFIG_GPIO_PL061=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
# CONFIG_GPIO_TS4900 is not set
@@ -1959,6 +1960,7 @@ CONFIG_HW_PERF_EVENTS=y
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=m
@@ -2005,6 +2007,7 @@ CONFIG_I2C_HID=m
# CONFIG_I2C_I801 is not set
CONFIG_I2C_IMX_LPI2C=m
# CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -2222,7 +2225,6 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
CONFIG_INPUT_SPARSEKMAP=m
CONFIG_INPUT_TABLET=y
CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_WISTRON_BTNS=m
CONFIG_INPUT_WM831X_ON=m
@@ -2411,6 +2413,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2689,7 +2692,6 @@ CONFIG_LEDS_NS2=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_PWM=m
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2854,8 +2856,9 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
CONFIG_MDIO_SUN4I=m
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
@@ -2870,7 +2873,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2903,7 +2905,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
-CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SM=y
+CONFIG_MESON_WATCHDOG=m
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
@@ -2959,7 +2965,7 @@ CONFIG_MFD_MAX8997=y
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_MFD_PM8921_CORE is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_PM8XXX is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -3068,7 +3074,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_OMAP_HS=m
# CONFIG_MMC_QCOM_DML is not set
@@ -3962,6 +3969,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_EXYNOS_DP_VIDEO=m
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4013,7 +4021,7 @@ CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
CONFIG_PL320_MBOX=y
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
@@ -4105,6 +4113,7 @@ CONFIG_PWM_BCM2835=m
CONFIG_PWM_CROS_EC=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
+CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SAMSUNG=m
@@ -4126,6 +4135,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
# CONFIG_QCOM_SPMI_VADC is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4225,7 +4235,7 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_ACT8865 is not set
CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
+# CONFIG_REGULATOR_ANATOP is not set
CONFIG_REGULATOR_AS3722=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_DA9210=m
@@ -4847,6 +4857,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
# CONFIG_SERIAL_MPS2_UART is not set
CONFIG_SERIAL_MVEBU_CONSOLE=y
CONFIG_SERIAL_MVEBU_UART=y
@@ -5108,6 +5120,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5272,6 +5285,7 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5438,9 +5452,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
# CONFIG_TEGRA20_MC is not set
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
# CONFIG_TEGRA_IOMMU_GART is not set
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
@@ -6133,7 +6149,7 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -6206,7 +6222,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_GPIO=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index c3754a380..3c354b26b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -302,7 +302,7 @@ CONFIG_ARM_ERRATA_825619=y
CONFIG_ARM_ERRATA_852421=y
CONFIG_ARM_ERRATA_852423=y
CONFIG_ARM_EXYNOS5440_CPUFREQ=m
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
CONFIG_ARM_EXYNOS_CPUIDLE=y
CONFIG_ARM_GIC_V2M=y
CONFIG_ARM_GIC_V3_ITS=y
@@ -324,7 +324,7 @@ CONFIG_ARM_PMU=y
CONFIG_ARM_PSCI_CHECKER=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -917,7 +917,7 @@ CONFIG_COMMON_CLK_MAX77802=m
# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_COMMON_CLK_OXNAS is not set
CONFIG_COMMON_CLK_PALMAS=m
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
CONFIG_COMMON_CLK_QCOM=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_S2MPS11=m
@@ -1092,6 +1092,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1194,14 +1195,14 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_DEVKMEM is not set
CONFIG_DEVMEM=y
@@ -1285,7 +1286,7 @@ CONFIG_DRM_AST=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
CONFIG_DRM_DW_HDMI=m
@@ -1337,6 +1338,7 @@ CONFIG_DRM_IMX_TVE=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MESON is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_MSM_DSI is not set
@@ -1492,6 +1494,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
CONFIG_DWMAC_GENERIC=m
# CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUNXI=m
CONFIG_DW_WATCHDOG=m
@@ -1582,9 +1585,7 @@ CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
# CONFIG_EXYNOS_IOMMU is not set
-CONFIG_EXYNOS_MIPI_DSI=y
CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZNPS_GIC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
@@ -1799,7 +1800,7 @@ CONFIG_GPIO_74X164=m
# CONFIG_GPIO_ALTERA is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DA9052=m
@@ -1835,10 +1836,10 @@ CONFIG_GPIO_PL061=y
CONFIG_GPIO_STMPE=y
# CONFIG_GPIO_SX150X is not set
CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
+CONFIG_GPIO_TPS65218=m
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
@@ -2048,6 +2049,7 @@ CONFIG_HW_PERF_EVENTS=y
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_MXC_RNGA=m
CONFIG_HW_RANDOM_OMAP3_ROM=m
@@ -2099,6 +2101,7 @@ CONFIG_I2C_HID=m
CONFIG_I2C_IMX_LPI2C=m
CONFIG_I2C_IMX=m
# CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
CONFIG_I2C_MLXCPLD=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX=m
@@ -2521,6 +2524,7 @@ CONFIG_IRLAN=m
CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IRNET=m
CONFIG_IR_NUVOTON=m
@@ -2804,7 +2808,7 @@ CONFIG_LEDS_NS2=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
+CONFIG_LEDS_PM8058=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2924,7 +2928,6 @@ CONFIG_MACH_DOVE=y
# CONFIG_MACH_FLINT is not set
# CONFIG_MACH_MARVELL_JASPER is not set
CONFIG_MACH_MMP2_DT=y
-# CONFIG_MACH_NOKIA_RX51 is not set
# CONFIG_MACH_OMAP3517EVM is not set
# CONFIG_MACH_OMAP3_PANDORA is not set
# CONFIG_MACH_OMAP_LDP is not set
@@ -2977,8 +2980,9 @@ CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
CONFIG_MDIO_SUN4I=m
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
@@ -2995,7 +2999,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -3028,7 +3031,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
# CONFIG_MEMTEST is not set
# CONFIG_MEN_A21_WDT is not set
-CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SM=y
+CONFIG_MESON_WATCHDOG=m
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_88PM800=m
CONFIG_MFD_88PM805=m
@@ -3084,7 +3091,7 @@ CONFIG_MFD_NVEC=y
CONFIG_MFD_OMAP_USB_HOST=y
CONFIG_MFD_PALMAS=y
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8921_CORE=m
+# CONFIG_MFD_PM8921_CORE is not set
CONFIG_MFD_PM8XXX=m
CONFIG_MFD_QCOM_RPM=m
# CONFIG_MFD_RC5T583 is not set
@@ -3195,7 +3202,8 @@ CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_MXC=m
CONFIG_MMC_OMAP_HS=m
@@ -4160,6 +4168,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_EXYNOS_DP_VIDEO=m
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4224,7 +4233,7 @@ CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
CONFIG_PL320_MBOX=y
CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
# CONFIG_PLATFORM_SI4713 is not set
# CONFIG_PLAT_SPEAR is not set
# CONFIG_PLIP is not set
@@ -4320,6 +4329,7 @@ CONFIG_PWM_CROS_EC=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
CONFIG_PWM_IMX=m
+CONFIG_PWM_MESON=m
CONFIG_PWM_OMAP_DMTIMER=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
@@ -4364,6 +4374,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_QCOM_WDT=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -5116,6 +5127,8 @@ CONFIG_SERIAL_JSM=m
# CONFIG_SERIAL_KGDB_NMI is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
# CONFIG_SERIAL_MPS2_UART is not set
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_MSM=y
@@ -5412,6 +5425,7 @@ CONFIG_SND_SOC_FSL_SSI=m
CONFIG_SND_SOC_FSL_UTILS=m
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_IMG is not set
CONFIG_SND_SOC_IMX_AUDMUX=m
@@ -5510,7 +5524,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
CONFIG_SND_SOC_WM8903=m
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
@@ -5610,6 +5624,7 @@ CONFIG_SPI_IMX=m
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_MXS=m
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=m
@@ -5782,9 +5797,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_MC=y
CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
@@ -6517,7 +6534,7 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -6590,7 +6607,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_GPIO=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f219d940f..f51a2a39d 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -329,9 +328,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -484,7 +480,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -699,7 +695,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -908,6 +903,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1493,6 +1489,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1592,9 +1589,8 @@ CONFIG_GPIO_SCH=m
# CONFIG_GPIO_SODAVILLE is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2545,7 +2541,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2707,9 +2702,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2723,7 +2720,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2773,7 +2769,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2810,7 +2805,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2913,7 +2907,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3893,6 +3887,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4772,6 +4767,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5743,7 +5739,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5924,8 +5920,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XO15_EBOOK=m
CONFIG_XO1_RFKILL=m
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index e19841305..9005abf21 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -329,9 +328,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -484,7 +480,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -699,7 +695,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -909,6 +904,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1510,6 +1506,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1609,9 +1606,8 @@ CONFIG_GPIO_SCH=m
# CONFIG_GPIO_SODAVILLE is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2564,7 +2560,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2726,9 +2721,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2742,7 +2739,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2792,7 +2788,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2829,7 +2824,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2932,7 +2926,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3913,6 +3907,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4793,6 +4788,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5764,7 +5760,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5945,8 +5941,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XO15_EBOOK=m
CONFIG_XO1_RFKILL=m
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 149533f9e..fa12551d7 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -329,9 +328,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -484,7 +480,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -699,7 +695,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -909,6 +904,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1510,6 +1506,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1609,9 +1606,8 @@ CONFIG_GPIO_SCH=m
# CONFIG_GPIO_SODAVILLE is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2564,7 +2560,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2726,9 +2721,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2742,7 +2739,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2792,7 +2788,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2829,7 +2824,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2932,7 +2926,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3913,6 +3907,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4793,6 +4788,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5764,7 +5760,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5943,8 +5939,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XO15_EBOOK=m
CONFIG_XO1_RFKILL=m
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-i686.config b/kernel-i686.config
index b53011eb6..7b81384a7 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -226,7 +226,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -329,9 +328,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -484,7 +480,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -699,7 +695,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -908,6 +903,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1493,6 +1489,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1592,9 +1589,8 @@ CONFIG_GPIO_SCH=m
# CONFIG_GPIO_SODAVILLE is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2545,7 +2541,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2707,9 +2702,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2723,7 +2720,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2773,7 +2769,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2810,7 +2805,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2913,7 +2907,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3893,6 +3887,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4772,6 +4767,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5743,7 +5739,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5922,8 +5918,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XO15_EBOOK=m
CONFIG_XO1_RFKILL=m
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index f891126db..36ba0fd4a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -188,7 +188,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -289,7 +288,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -477,7 +475,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -693,7 +691,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -809,7 +806,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -899,6 +895,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1543,9 +1540,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2457,7 +2453,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2613,10 +2608,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2630,7 +2626,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2677,17 +2672,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2698,6 +2696,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2713,7 +2712,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2721,10 +2720,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2808,7 +2809,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3772,6 +3773,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4657,6 +4659,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5590,7 +5593,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5702,8 +5705,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index e51658b13..31b17d1db 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -188,7 +188,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -289,7 +288,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -477,7 +475,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -693,7 +691,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -808,7 +805,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -898,6 +894,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1526,9 +1523,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2438,7 +2434,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2593,10 +2588,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2610,7 +2606,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2657,17 +2652,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2678,6 +2676,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2693,7 +2692,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2701,10 +2700,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2788,7 +2789,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3750,6 +3751,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4634,6 +4636,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5567,7 +5570,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5679,8 +5682,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 7dad46452..6742c8fe4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -283,7 +282,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -650,7 +648,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -764,7 +761,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -854,6 +850,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1497,9 +1494,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2403,7 +2399,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2559,10 +2554,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2576,7 +2572,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2623,17 +2618,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2644,6 +2642,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2659,7 +2658,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2667,10 +2666,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2754,7 +2755,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3712,6 +3713,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4586,6 +4588,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5519,7 +5522,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5625,8 +5628,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 4ed063d24..368fd3342 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -283,7 +282,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -650,7 +648,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -763,7 +760,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -853,6 +849,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1480,9 +1477,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2384,7 +2380,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2539,10 +2534,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2556,7 +2552,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2603,17 +2598,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2624,6 +2622,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2639,7 +2638,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2647,10 +2646,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2734,7 +2735,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3690,6 +3691,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4563,6 +4565,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5496,7 +5499,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5602,8 +5605,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index a07f9f944..ca5b410c3 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -283,7 +282,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -650,7 +648,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -764,7 +761,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -854,6 +850,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1496,9 +1493,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2402,7 +2398,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2558,10 +2553,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2575,7 +2571,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2622,17 +2617,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2643,6 +2641,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2658,7 +2657,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2666,10 +2665,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2753,7 +2754,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3711,6 +3712,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4585,6 +4587,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5518,7 +5521,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5624,8 +5627,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index e4258bb0a..bf35338c1 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -182,7 +182,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -283,7 +282,6 @@ CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
# CONFIG_AXON_RAM is not set
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -650,7 +648,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -763,7 +760,6 @@ CONFIG_CRC_T10DIF=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPT_CRC32C_VPMSUM=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -853,6 +849,7 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1479,9 +1476,8 @@ CONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
# CONFIG_GPIO_UCB1400 is not set
@@ -2383,7 +2379,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
@@ -2538,10 +2533,11 @@ CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
CONFIG_MDIO_GPIO=m
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2555,7 +2551,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2602,17 +2597,20 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2623,6 +2621,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2638,7 +2637,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2646,10 +2645,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_PCI=m
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2733,7 +2734,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3689,6 +3690,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4562,6 +4564,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5495,7 +5498,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5601,8 +5604,6 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XMON_DISASSEMBLY=y
CONFIG_XMON=y
# CONFIG_XPS_USB_HCD_XILINX is not set
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 7ea174ef1..1926b2bac 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -184,7 +184,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -284,7 +283,6 @@ CONFIG_AUTOFS4_FS=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -649,7 +647,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHECK_STACK=y
CONFIG_CHELSIO_T1_1G=y
@@ -846,6 +843,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1384,6 +1382,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1468,9 +1467,8 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2343,7 +2341,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2496,6 +2493,9 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
# CONFIG_MDIO_OCTEON is not set
@@ -2512,7 +2512,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2553,21 +2552,25 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2578,6 +2581,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2593,7 +2597,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2601,10 +2605,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
# CONFIG_MFD_RTSX_PCI is not set
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2687,7 +2693,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC is not set
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3508,6 +3514,8 @@ CONFIG_PMBUS=m
CONFIG_PM_DEBUG=y
# CONFIG_PM_DEVFREQ_EVENT is not set
CONFIG_PM_DEVFREQ=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
# CONFIG_PM_OPP is not set
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_TEST_SUSPEND=y
@@ -3592,6 +3600,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QDIO=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
CONFIG_QETH_IPV6=y
@@ -4472,6 +4481,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5401,7 +5411,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
# CONFIG_W1 is not set
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5500,8 +5510,6 @@ CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 8a24c28a3..07d4fcc91 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -184,7 +184,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -284,7 +283,6 @@ CONFIG_AUTOFS4_FS=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -434,7 +432,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -649,7 +647,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CHECK_STACK=y
CONFIG_CHELSIO_T1_1G=y
@@ -845,6 +842,7 @@ CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
@@ -1367,6 +1365,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1451,9 +1450,8 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2324,7 +2322,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2476,6 +2473,9 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
# CONFIG_MDIO_OCTEON is not set
@@ -2492,7 +2492,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2533,21 +2532,25 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_88PM800 is not set
# CONFIG_MFD_88PM805 is not set
# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
@@ -2558,6 +2561,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_KEMPLD is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
# CONFIG_MFD_MAX14577 is not set
# CONFIG_MFD_MAX77620 is not set
# CONFIG_MFD_MAX77686 is not set
@@ -2573,7 +2577,7 @@ CONFIG_MFD_CORE=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_RK808 is not set
@@ -2581,10 +2585,12 @@ CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RT5033 is not set
# CONFIG_MFD_RTSX_PCI is not set
CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SKY81452 is not set
CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
@@ -2667,7 +2673,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC is not set
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3487,6 +3493,8 @@ CONFIG_PMBUS=m
CONFIG_PM_DEBUG=y
# CONFIG_PM_DEVFREQ_EVENT is not set
CONFIG_PM_DEVFREQ=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
# CONFIG_PM_OPP is not set
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_TEST_SUSPEND=y
@@ -3570,6 +3578,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QDIO=m
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
CONFIG_QETH_IPV6=y
@@ -4449,6 +4458,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5378,7 +5388,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
# CONFIG_W1 is not set
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5477,8 +5487,6 @@ CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 8a30bd467..9b8f340ff 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
CONFIG_ARM64_PTDUMP=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -328,9 +327,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -487,7 +483,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -703,7 +699,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -936,6 +931,7 @@ CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_MB=m
CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SKEIN is not set
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -1538,6 +1534,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1635,9 +1632,8 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2599,7 +2595,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2752,9 +2747,12 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2768,7 +2766,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2822,7 +2819,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2859,7 +2855,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2962,7 +2957,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3933,6 +3928,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4820,6 +4816,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5798,7 +5795,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5971,8 +5968,6 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_XO15_EBOOK is not set
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index ff1f08e47..63e064ac5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -225,7 +225,6 @@ CONFIG_AR5523=m
# CONFIG_ARCNET is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
CONFIG_ARM_PSCI_CHECKER=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_AS3935 is not set
@@ -328,9 +327,6 @@ CONFIG_AUXDISPLAY=y
# CONFIG_AVERAGE is not set
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_AX25=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=y
-CONFIG_AXP288_FUEL_GAUGE=y
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_DEBUG=y
@@ -487,7 +483,7 @@ CONFIG_BMC150_ACCEL=m
# CONFIG_BMG160 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
CONFIG_BNA=m
CONFIG_BNX2=m
CONFIG_BNX2X=m
@@ -703,7 +699,6 @@ CONFIG_CGROUPS=y
# CONFIG_CHARGER_QCOM_SMBB is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1=m
@@ -935,6 +930,7 @@ CONFIG_CRYPTO_SHA512_ARM64=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA512_MB=m
CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SKEIN is not set
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -1521,6 +1517,7 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
CONFIG_FS_ENCRYPTION=y
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
@@ -1618,9 +1615,8 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_SCH is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_VIPERBOARD=m
@@ -2580,7 +2576,6 @@ CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_S3C24XX is not set
@@ -2733,9 +2728,12 @@ CONFIG_MD_AUTODETECT=y
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_THUNDER is not set
CONFIG_MD_LINEAR=m
CONFIG_MD_MULTIPATH=m
@@ -2749,7 +2747,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_MEDIA_CONTROLLER=y
@@ -2803,7 +2800,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_ATMEL_HLCDC is not set
# CONFIG_MFD_AXP20X_I2C is not set
# CONFIG_MFD_AXP20X is not set
-# CONFIG_MFD_AXP20X_RSB is not set
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_CORE=y
# CONFIG_MFD_CROS_EC is not set
@@ -2840,7 +2836,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
# CONFIG_MFD_MT6397 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_PCF50633 is not set
-CONFIG_MFD_PM8XXX=m
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RDC321X is not set
# CONFIG_MFD_RETU is not set
@@ -2943,7 +2938,7 @@ CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3913,6 +3908,7 @@ CONFIG_QCOM_ADSP_PIL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QEDE=m
+CONFIG_QEDI=m
CONFIG_QED=m
CONFIG_QED_SRIOV=y
# CONFIG_QFMT_V1 is not set
@@ -4799,6 +4795,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_FSL_SSI is not set
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5777,7 +5774,7 @@ CONFIG_VXLAN=m
# CONFIG_VZ89X is not set
CONFIG_W1_CON=y
CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
CONFIG_W1_MASTER_DS2482=m
CONFIG_W1_MASTER_DS2490=m
# CONFIG_W1_MASTER_GPIO is not set
@@ -5950,8 +5947,6 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_XO15_EBOOK is not set
CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_SPARC=y
diff --git a/kernel.spec b/kernel.spec
index dcf6dad97..16cf218b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 0
+%global rcrev 1
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -513,6 +513,8 @@ Source5005: kbuild-AFTER_LINK.patch
# Standalone patches
+Patch100: fixes-4.10.patch
+
# a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA
Patch421: qcom-QDF2432-tmp-errata.patch
@@ -2172,6 +2174,11 @@ fi
#
#
%changelog
+* Tue Dec 27 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Linux v4.10-rc1
+- ARM config updates, minor general config cleanups
+- Enable Amlogic (meson) SoCs for ARMv7/aarch64
+
* Fri Dec 23 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git9.1
- Linux v4.9-11999-g50f6584
diff --git a/sources b/sources
index 8070ca52f..a38774a6e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
-SHA512 (patch-4.9-git9.xz) = a8e52348e5cfbb6cf5d44f6523cfb22a1db73dffe67bcbb6d161256d75fd7e2e0adfbb03a8c5f634d862743ba4f2b603e8847695ee4c54fd0a6b0b88d1f55f05
+SHA512 (patch-4.10-rc1.xz) = 1ea3cb9e808c8ad0ca28bf430c5ed1e6b8039f195b1ebe42429bddad0b0afcf1a1a619cb20eb0da614f2180cc94e9658a94d45432f8a4d402a955c7f0b0c5289