Arm config updates and fixes, fixes for Jetson TX series

41 files changed, 97 insertions, 119 deletions

diff --git a/configs/fedora/generic/CONFIG_COMMON_RESET_HI3660 b/configs/fedora/generic/CONFIG_COMMON_RESET_HI3660
deleted file mode 100644
index 0d13136e0..000000000
--- a/configs/fedora/generic/CONFIG_COMMON_RESET_HI3660
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_COMMON_RESET_HI3660 is not set
diff --git a/configs/fedora/generic/CONFIG_RENESAS_PHY b/configs/fedora/generic/CONFIG_RENESAS_PHY
index 2314e0cf2..928c67e0e 100644
--- a/configs/fedora/generic/CONFIG_RENESAS_PHY
+++ b/configs/fedora/generic/CONFIG_RENESAS_PHY
@@ -1 +1 @@
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MEMORY b/configs/fedora/generic/arm/CONFIG_MEMORY
index e69bfe7d7..e69bfe7d7 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_MEMORY
+++ b/configs/fedora/generic/arm/CONFIG_MEMORY
diff --git a/configs/fedora/generic/CONFIG_MESON_GX_PM_DOMAINS b/configs/fedora/generic/arm/CONFIG_MESON_GX_PM_DOMAINS
index 5d71bc0bc..5d71bc0bc 100644
--- a/configs/fedora/generic/CONFIG_MESON_GX_PM_DOMAINS
+++ b/configs/fedora/generic/arm/CONFIG_MESON_GX_PM_DOMAINS
diff --git a/configs/fedora/generic/CONFIG_MESON_MX_EFUSE b/configs/fedora/generic/arm/CONFIG_MESON_MX_EFUSE
index b289cb9dd..b289cb9dd 100644
--- a/configs/fedora/generic/CONFIG_MESON_MX_EFUSE
+++ b/configs/fedora/generic/arm/CONFIG_MESON_MX_EFUSE
diff --git a/configs/fedora/generic/CONFIG_MESON_MX_SOCINFO b/configs/fedora/generic/arm/CONFIG_MESON_MX_SOCINFO
index 63f558a2c..63f558a2c 100644
--- a/configs/fedora/generic/CONFIG_MESON_MX_SOCINFO
+++ b/configs/fedora/generic/arm/CONFIG_MESON_MX_SOCINFO
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
new file mode 100644
index 000000000..88cf51247
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
@@ -0,0 +1 @@
+# CONFIG_PCIE_ROCKCHIP is not set
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_GPIO b/configs/fedora/generic/arm/CONFIG_REGULATOR_GPIO
index fb17a24d4..892e748c7 100644
--- a/configs/fedora/generic/arm/CONFIG_REGULATOR_GPIO
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_GPIO
@@ -1 +1 @@
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
diff --git a/configs/fedora/generic/arm/CONFIG_RESET_MESON_AUDIO_ARB b/configs/fedora/generic/arm/CONFIG_RESET_MESON_AUDIO_ARB
index c42072aca..cde7e598a 100644
--- a/configs/fedora/generic/arm/CONFIG_RESET_MESON_AUDIO_ARB
+++ b/configs/fedora/generic/arm/CONFIG_RESET_MESON_AUDIO_ARB
@@ -1 +1 @@
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
diff --git a/configs/fedora/generic/arm/CONFIG_USB_UHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_UHCI_HCD
new file mode 100644
index 000000000..dd02de6c2
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_UHCI_HCD
@@ -0,0 +1 @@
+CONFIG_USB_UHCI_HCD=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BUTTON b/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BUTTON
index e40dff40b..1f552016b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BUTTON
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BUTTON
@@ -1 +1 @@
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FAN b/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FAN
index f45a96673..0feefba7b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FAN
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FAN
@@ -1 +1 @@
-CONFIG_ACPI_FAN=m
+CONFIG_ACPI_FAN=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_RESET_HI3660 b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_RESET_HI3660
new file mode 100644
index 000000000..7ec9367ef
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_RESET_HI3660
@@ -0,0 +1 @@
+CONFIG_COMMON_RESET_HI3660=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186
index 90765ac52..55ab719f6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186
@@ -1 +1 @@
-CONFIG_GPIO_TEGRA186=m
+CONFIG_GPIO_TEGRA186=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY b/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
index bd59856f3..9b3783d1c 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
@@ -1 +1 @@
-CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_HISI_POWERKEY=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_HI6421_PMIC b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_HI6421_PMIC
new file mode 100644
index 000000000..f739f9149
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_HI6421_PMIC
@@ -0,0 +1 @@
+CONFIG_MFD_HI6421_PMIC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MSM_GCC_8998 b/configs/fedora/generic/arm/aarch64/CONFIG_MSM_GCC_8998
new file mode 100644
index 000000000..929475554
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MSM_GCC_8998
@@ -0,0 +1 @@
+CONFIG_MSM_GCC_8998=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE
index 40adfb485..59ff340e0 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE
@@ -1 +1 @@
-CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_GENI_SE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421 b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421
new file mode 100644
index 000000000..754fb7167
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421
@@ -0,0 +1 @@
+CONFIG_REGULATOR_HI6421=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421V530 b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421V530
new file mode 100644
index 000000000..bde61fdcb
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_HI6421V530
@@ -0,0 +1 @@
+CONFIG_REGULATOR_HI6421V530=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI
index 64dbc4cc8..3ac4f29f1 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI
@@ -1 +1 @@
-CONFIG_SERIAL_QCOM_GENI=m
+CONFIG_SERIAL_QCOM_GENI=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI_CONSOLE b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI_CONSOLE
new file mode 100644
index 000000000..8ac7b102f
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA210_ADMA b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA210_ADMA
index 7f82adad1..5ee894341 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA210_ADMA
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA210_ADMA
@@ -1 +1 @@
-CONFIG_TEGRA210_ADMA=y
+CONFIG_TEGRA210_ADMA=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_EFUSE b/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_EFUSE
new file mode 100644
index 000000000..3241e9487
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_EFUSE
@@ -0,0 +1 @@
+CONFIG_MESON_MX_EFUSE=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_SOCINFO b/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_SOCINFO
new file mode 100644
index 000000000..103199b26
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_MESON_MX_SOCINFO
@@ -0,0 +1 @@
+CONFIG_MESON_MX_SOCINFO=y
diff --git a/configs/fedora/generic/CONFIG_RAS_CEC b/configs/fedora/generic/x86/CONFIG_RAS_CEC
index 7b0901ca1..7b0901ca1 100644
--- a/configs/fedora/generic/CONFIG_RAS_CEC
+++ b/configs/fedora/generic/x86/CONFIG_RAS_CEC
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 50513ce1a..8a458839e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -45,7 +45,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_SEA=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
@@ -54,7 +54,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_FAN=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_I2C_OPREGION=y
@@ -974,7 +974,7 @@ CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_ZYNQMP=y
-# CONFIG_COMMON_RESET_HI3660 is not set
+CONFIG_COMMON_RESET_HI3660=m
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
@@ -1952,7 +1952,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SCH311X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-CONFIG_GPIO_TEGRA186=m
+CONFIG_GPIO_TEGRA186=y
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
@@ -2457,7 +2457,7 @@ CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_HISI_POWERKEY=y
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_JOYDEV=m
@@ -3175,7 +3175,7 @@ CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY is not set
+CONFIG_MEMORY=y
 # CONFIG_MEMSTICK_DEBUG is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK=m
@@ -3231,7 +3231,7 @@ CONFIG_MFD_CROS_EC=m
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_HI6421_PMIC is not set
+CONFIG_MFD_HI6421_PMIC=m
 CONFIG_MFD_HI655X_PMIC=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3479,7 +3479,7 @@ CONFIG_MSM_GCC_8960=y
 CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSM_GCC_8996=y
-# CONFIG_MSM_GCC_8998 is not set
+CONFIG_MSM_GCC_8998=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -4269,6 +4269,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
@@ -4567,7 +4568,7 @@ CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 # CONFIG_QCOM_FASTRPC is not set
-CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_GLINK_SSR=m
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HFPLL=m
@@ -4668,7 +4669,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4718,7 +4718,9 @@ CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
 CONFIG_REGULATOR_HI655X=m
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_ISL9305 is not set
@@ -4771,11 +4773,11 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_HISI=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -5388,7 +5390,8 @@ CONFIG_SERIAL_MVEBU_UART=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_PCH_UART is not set
-CONFIG_SERIAL_QCOM_GENI=m
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
+CONFIG_SERIAL_QCOM_GENI=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
@@ -6074,7 +6077,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-CONFIG_TEGRA210_ADMA=y
+CONFIG_TEGRA210_ADMA=m
 CONFIG_TEGRA_ACONNECT=m
 CONFIG_TEGRA_AHB=y
 CONFIG_TEGRA_BPMP_THERMAL=m
@@ -6709,7 +6712,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2d1cb5c24..4bf1d94ad 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -45,7 +45,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_SEA=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
@@ -54,7 +54,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_FAN=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_I2C_OPREGION=y
@@ -974,7 +974,7 @@ CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_ZYNQMP=y
-# CONFIG_COMMON_RESET_HI3660 is not set
+CONFIG_COMMON_RESET_HI3660=m
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
@@ -1936,7 +1936,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 # CONFIG_GPIO_SCH311X is not set
 CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
-CONFIG_GPIO_TEGRA186=m
+CONFIG_GPIO_TEGRA186=y
 CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
@@ -2441,7 +2441,7 @@ CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_INPUT_HISI_POWERKEY=y
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_JOYDEV=m
@@ -3156,7 +3156,7 @@ CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY is not set
+CONFIG_MEMORY=y
 # CONFIG_MEMSTICK_DEBUG is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK=m
@@ -3212,7 +3212,7 @@ CONFIG_MFD_CROS_EC=m
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_HI6421_PMIC is not set
+CONFIG_MFD_HI6421_PMIC=m
 CONFIG_MFD_HI655X_PMIC=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3459,7 +3459,7 @@ CONFIG_MSM_GCC_8960=y
 CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSM_GCC_8996=y
-# CONFIG_MSM_GCC_8998 is not set
+CONFIG_MSM_GCC_8998=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -4249,6 +4249,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
@@ -4546,7 +4547,7 @@ CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 # CONFIG_QCOM_FASTRPC is not set
-CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_GLINK_SSR=m
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HFPLL=m
@@ -4647,7 +4648,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4697,7 +4697,9 @@ CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
 CONFIG_REGULATOR_HI655X=m
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_ISL9305 is not set
@@ -4750,11 +4752,11 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_HISI=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -5367,7 +5369,8 @@ CONFIG_SERIAL_MVEBU_UART=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_PCH_UART is not set
-CONFIG_SERIAL_QCOM_GENI=m
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
+CONFIG_SERIAL_QCOM_GENI=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
@@ -6052,7 +6055,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-CONFIG_TEGRA210_ADMA=y
+CONFIG_TEGRA210_ADMA=m
 CONFIG_TEGRA_ACONNECT=m
 CONFIG_TEGRA_AHB=y
 CONFIG_TEGRA_BPMP_THERMAL=m
@@ -6687,7 +6690,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4bfc9e9c5..7d148623d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -984,7 +984,6 @@ CONFIG_COMMON_CLK_TI_ADPLL=m
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -3291,8 +3290,8 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
+CONFIG_MESON_MX_EFUSE=m
+CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -4432,6 +4431,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4833,7 +4833,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4891,7 +4890,7 @@ CONFIG_REGULATOR_DA9211=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_LM363X=m
@@ -4959,10 +4958,10 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -7051,7 +7050,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5c7fab83a..4515cadfa 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -950,7 +950,6 @@ CONFIG_COMMON_CLK_SI544=m
 CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -3162,8 +3161,8 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
+CONFIG_MESON_MX_EFUSE=m
+CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -4240,6 +4239,7 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4588,7 +4588,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4640,7 +4639,7 @@ CONFIG_REGULATOR_DA9211=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_LP3971=m
@@ -4695,10 +4694,10 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -6652,7 +6651,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 9f033a0ce..e849f9f6f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -950,7 +950,6 @@ CONFIG_COMMON_CLK_SI544=m
 CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -3144,8 +3143,8 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
+CONFIG_MESON_MX_EFUSE=m
+CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -4221,6 +4220,7 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4568,7 +4568,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4620,7 +4619,7 @@ CONFIG_REGULATOR_DA9211=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_LP3971=m
@@ -4675,10 +4674,10 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -6631,7 +6630,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index a2c238f50..5ef6ecea7 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -984,7 +984,6 @@ CONFIG_COMMON_CLK_TI_ADPLL=m
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -3273,8 +3272,8 @@ CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_IRQ_GPIO=y
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
+CONFIG_MESON_MX_EFUSE=m
+CONFIG_MESON_MX_SOCINFO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
@@ -4413,6 +4412,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
+# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4813,7 +4813,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVE_SP_CORE is not set
@@ -4871,7 +4870,7 @@ CONFIG_REGULATOR_DA9211=m
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_LM363X=m
@@ -4939,10 +4938,10 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_MESON_AUDIO_ARB is not set
+CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
@@ -7030,7 +7029,7 @@ CONFIG_USB_TRANCEVIBRATOR=m
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 6a19fc396..f9ea40c09 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -805,7 +805,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_BRK is not set
@@ -3004,9 +3003,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4409,7 +4405,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 3f1510b4c..e2af46448 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -804,7 +804,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_BRK is not set
@@ -2985,9 +2984,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4389,7 +4385,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 75e60c603..d37b206d9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -746,7 +746,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -2756,9 +2755,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4024,7 +4020,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
@@ -4109,7 +4104,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 9d7cdfe23..0146228cc 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -745,7 +745,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
@@ -2736,9 +2735,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4002,7 +3998,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
@@ -4087,7 +4082,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD77402 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 306992413..a626fed68 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -753,7 +753,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT=y
@@ -2730,9 +2729,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -3961,7 +3957,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
@@ -4045,7 +4040,7 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 195c220fa..878e3c16f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -752,7 +752,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT=y
@@ -2710,9 +2709,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -3939,7 +3935,6 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
-CONFIG_RAS_CEC=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
 # CONFIG_RBTREE_TEST is not set
@@ -4023,7 +4018,7 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 446621c77..1600d7c67 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -818,7 +818,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_BRK is not set
@@ -3056,9 +3055,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4452,7 +4448,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7ed2597c6..52dc50ee3 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -817,7 +817,6 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_COMMON_RESET_HI3660 is not set
 CONFIG_COMPACTION=y
 CONFIG_COMPAL_LAPTOP=m
 # CONFIG_COMPAT_BRK is not set
@@ -3037,9 +3036,6 @@ 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_GX_PM_DOMAINS is not set
-# CONFIG_MESON_MX_EFUSE is not set
-# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -4432,7 +4428,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
-CONFIG_RENESAS_PHY=m
+# CONFIG_RENESAS_PHY is not set
 CONFIG_RESCTRL=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_RESET_TI_SYSCON is not set
diff --git a/kernel.spec b/kernel.spec
index 7238f021d..d7e5eef3e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1859,6 +1859,9 @@ fi
 #
 #
 %changelog
+* Tue Mar 12 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- Arm config updates and fixes
+
 * Mon Mar 11 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git5.1
 - Linux v5.0-10360-g12ad143e1b80