diff --git a/arch/arm64/configs/odroidc5_defconfig b/arch/arm64/configs/odroidc5_defconfig
index c5000247bcc0..65656aec88bc 100644
--- a/arch/arm64/configs/odroidc5_defconfig
+++ b/arch/arm64/configs/odroidc5_defconfig
@@ -3309,7 +3309,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
 # CONFIG_REGULATOR_FAN53880 is not set
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
@@ -3338,7 +3338,7 @@ CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
-CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_PWM=y
 CONFIG_AMLOGIC_PWM_REGULATOR=y
 # CONFIG_REGULATOR_QCOM_SPMI is not set
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
@@ -5060,7 +5060,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_CQHCI=m
+CONFIG_MMC_CQHCI=y
 # CONFIG_MMC_HSQ is not set
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
@@ -5474,7 +5474,7 @@ CONFIG_COMMON_CLK=y
 
 # CONFIG_LMK04832 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
-CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SCMI=y
 CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
@@ -6251,7 +6251,7 @@ CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y
 #
 # Clock support for Amlogic platforms
 #
-CONFIG_AMLOGIC_COMMON_CLK=m
+CONFIG_AMLOGIC_COMMON_CLK=y
 CONFIG_AMLOGIC_COMMON_CLK_MESON_REGMAP=y
 CONFIG_AMLOGIC_COMMON_CLK_MESON_DUALDIV=y
 CONFIG_AMLOGIC_COMMON_CLK_MESON_MPLL=y
@@ -6272,7 +6272,7 @@ CONFIG_AMLOGIC_COMMON_CLK_SC2=m
 CONFIG_AMLOGIC_COMMON_CLK_T3=m
 CONFIG_AMLOGIC_COMMON_CLK_T7=m
 CONFIG_AMLOGIC_COMMON_CLK_T5M=m
-CONFIG_AMLOGIC_COMMON_CLK_G12A=m
+CONFIG_AMLOGIC_COMMON_CLK_G12A=y
 CONFIG_AMLOGIC_COMMON_CLK_S5=m
 CONFIG_AMLOGIC_COMMON_CLK_T5W=m
 CONFIG_AMLOGIC_COMMON_AO_CLK_T5W=m
@@ -6286,11 +6286,12 @@ CONFIG_AMLOGIC_COMMON_CLK_T3X=m
 CONFIG_AMLOGIC_COMMON_CLK_TM2=m
 CONFIG_AMLOGIC_COMMON_AO_CLK_TM2=m
 CONFIG_AMLOGIC_COMMON_CLK_S7=m
-CONFIG_AMLOGIC_COMMON_CLK_S7D=m
-CONFIG_AMLOGIC_COMMON_CLK_S6=m
+CONFIG_AMLOGIC_COMMON_CLK_S7D=y
+# CONFIG_AMLOGIC_COMMON_CLK_S6 is not set
+# CONFIG_AMLOGIC_COMMON_CLK_T6D is not set
 # end of Clock support for Amlogic platforms
 
-CONFIG_AMLOGIC_SECMON=m
+CONFIG_AMLOGIC_SECMON=y
 CONFIG_AMLOGIC_DOLBY_FW=y
 CONFIG_AMLOGIC_DRM=m
 CONFIG_AMLOGIC_DRM_VPU=y
@@ -6710,7 +6711,7 @@ CONFIG_AMLOGIC_DI_V4L=y
 CONFIG_AMLOGIC_POWER=y
 CONFIG_AMLOGIC_POWER_EE=y
 # CONFIG_AMLOGIC_POWER_PMIC is not set
-CONFIG_AMLOGIC_CPU_INFO=m
+CONFIG_AMLOGIC_CPU_INFO=y
 CONFIG_AMLOGIC_SHOW_CPU_CHIPID=y
 
 #
@@ -6722,7 +6723,7 @@ CONFIG_AMLOGIC_LEGACY_EARLY_SUSPEND=y
 CONFIG_AMLOGIC_GX_REBOOT=y
 # end of Meson core pm driver
 
-CONFIG_AMLOGIC_GPIO=m
+CONFIG_AMLOGIC_GPIO=y
 CONFIG_AMLOGIC_GPIOLIB=y
 CONFIG_AMLOGIC_GPIOLIB_SYSFS=y
 CONFIG_AMLOGIC_MESON_IRQ_GPIO=y
@@ -6745,8 +6746,9 @@ CONFIG_AMLOGIC_PINCTRL_MESON_T3X=m
 # CONFIG_AMLOGIC_PINCTRL_MESON_T5D is not set
 CONFIG_AMLOGIC_PINCTRL_MESON_TM2=m
 CONFIG_AMLOGIC_PINCTRL_MESON_S7=m
-CONFIG_AMLOGIC_PINCTRL_MESON_S7D=m
-CONFIG_AMLOGIC_PINCTRL_MESON_S6=m
+CONFIG_AMLOGIC_PINCTRL_MESON_S7D=y
+# CONFIG_AMLOGIC_PINCTRL_MESON_S6 is not set
+# CONFIG_AMLOGIC_PINCTRL_MESON_T6D is not set
 # CONFIG_AMLOGIC_GPIO_PMIC is not set
 CONFIG_AMLOGIC_INPUT=m
 CONFIG_AMLOGIC_GPIO_KEY=y
@@ -6779,12 +6781,12 @@ CONFIG_AMLOGIC_OPTEE=m
 # end of TEE drivers
 
 CONFIG_AMLOGIC_WATERMARK=m
-CONFIG_AMLOGIC_GKI_TOOL=m
-CONFIG_AMLOGIC_PWM=m
+# CONFIG_AMLOGIC_GKI_TOOL is not set
+CONFIG_AMLOGIC_PWM=y
 CONFIG_AMLOGIC_PWM_MESON=y
 CONFIG_AMLOGIC_PWM_MESON_TEE=y
-CONFIG_AMLOGIC_MESON_CPUFREQ=m
-CONFIG_AMLOGIC_EFUSE_UNIFYKEY=m
+CONFIG_AMLOGIC_MESON_CPUFREQ=y
+CONFIG_AMLOGIC_EFUSE_UNIFYKEY=y
 CONFIG_AMLOGIC_EFUSE=y
 CONFIG_AMLOGIC_UNIFYKEY=y
 CONFIG_AMLOGIC_EFUSE_BURN=y
@@ -6793,7 +6795,7 @@ CONFIG_AMLOGIC_DEFENDKEY=y
 #
 # MESON MHU mailbox Support
 #
-CONFIG_AMLOGIC_MHU_MBOX=m
+CONFIG_AMLOGIC_MHU_MBOX=y
 # end of MESON MHU mailbox Support
 
 CONFIG_AMLOGIC_JTAG_MESON=m
@@ -6811,7 +6813,7 @@ CONFIG_AMLOGIC_SLAB_TRACE=y
 CONFIG_AMLOGIC_CMA=y
 CONFIG_AMLOGIC_MEM_DEBUG=y
 # CONFIG_AMLOGIC_STACKPROTECTOR is not set
-CONFIG_AMLOGIC_USER_FAULT=m
+# CONFIG_AMLOGIC_USER_FAULT is not set
 # CONFIG_AMLOGIC_ZSTD is not set
 # CONFIG_AMLOGIC_MEMORY_STAT is not set
 # CONFIG_AMLOGIC_CMA_DIS is not set
@@ -6824,7 +6826,7 @@ CONFIG_AMLOGIC_FAKE_SMMU=m
 #
 # Meson core memory debug driver
 #
-CONFIG_AMLOGIC_MEMORY_DEBUG=m
+# CONFIG_AMLOGIC_MEMORY_DEBUG is not set
 CONFIG_AMLOGIC_FILE_CACHE=y
 CONFIG_AMLOGIC_WATCHPOINT=y
 CONFIG_AMLOGIC_REG_ACCESS=y
@@ -6845,7 +6847,7 @@ CONFIG_AMLOGIC_DDR_BANDWIDTH_T5M=y
 # CONFIG_AMLOGIC_DDR_BANDWIDTH_S1A is not set
 CONFIG_AMLOGIC_DDR_BANDWIDTH_S7=y
 CONFIG_AMLOGIC_DMC_MONITOR=y
-CONFIG_AMLOGIC_DMC_DEV_ACCESS=y
+# CONFIG_AMLOGIC_DMC_DEV_ACCESS is not set
 CONFIG_AMLOGIC_DMC_MONITOR_G12=y
 CONFIG_AMLOGIC_DMC_MONITOR_TM2=y
 # CONFIG_AMLOGIC_DMC_MONITOR_GX is not set
@@ -6880,14 +6882,14 @@ CONFIG_AMLOGIC_HW_RANDOM_MESON=m
 CONFIG_AMLOGIC_GPIOMEM=y
 # end of Character devices
 
-CONFIG_AMLOGIC_SOC_INFO=m
-CONFIG_AMLOGIC_RESET_MESON=m
-CONFIG_AMLOGIC_DOS_RESET_MESON=m
+CONFIG_AMLOGIC_SOC_INFO=y
+CONFIG_AMLOGIC_RESET_MESON=y
+CONFIG_AMLOGIC_DOS_RESET_MESON=y
 
 #
 # RTC drivers
 #
-CONFIG_AMLOGIC_RTC=m
+CONFIG_AMLOGIC_RTC=y
 CONFIG_AMLOGIC_RTC_DRV_MESON_VRTC=y
 CONFIG_AMLOGIC_MESON_RTC=y
 
@@ -6901,7 +6903,7 @@ CONFIG_AMLOGIC_IRBLASTER=m
 #
 # Amlogic Thermal and Cooling devices
 #
-CONFIG_AMLOGIC_AMLOGIC_THERMAL=m
+CONFIG_AMLOGIC_AMLOGIC_THERMAL=y
 CONFIG_AMLOGIC_COOLDEV=y
 CONFIG_AMLOGIC_CPUCORE_THERMAL=y
 CONFIG_AMLOGIC_GPU_THERMAL=y
@@ -6910,32 +6912,20 @@ CONFIG_AMLOGIC_DDR_THERMAL=y
 # CONFIG_AMLOGIC_MEDIA_THERMAL is not set
 # end of Amlogic Thermal and Cooling devices
 
-CONFIG_AMLOGIC_MMC_MESON_GX=m
-CONFIG_AMLOGIC_MMC_CQHCI=m
-CONFIG_AMLOGIC_HOST_DRIVER=m
-CONFIG_AMLOGIC_DEBUG=m
-CONFIG_AMLOGIC_BGKI_DEBUG_MISC=y
-CONFIG_AMLOGIC_DEBUG_ATRACE=y
+CONFIG_AMLOGIC_MMC_MESON_GX=y
+CONFIG_AMLOGIC_MMC_CQHCI=y
+CONFIG_AMLOGIC_HOST_DRIVER=y
+# CONFIG_AMLOGIC_DEBUG is not set
 # CONFIG_AMLOGIC_BOOT_TIME is not set
 CONFIG_AMLOGIC_DEBUG_PRINTK=y
 # CONFIG_AMLOGIC_DEBUG_FILE is not set
-# CONFIG_AMLOGIC_DEBUG_TEST is not set
-CONFIG_AMLOGIC_DEBUG_HLD=y
-CONFIG_AMLOGIC_DEBUG_MHZ=y
 # CONFIG_AMLOGIC_HOTPLUG_ARM_CPU0 is not set
 CONFIG_AMLOGIC_AUDIO_UTILS=m
-CONFIG_AMLOGIC_GKI_CONFIG=y
-CONFIG_AMLOGIC_ENV_DEBUG=y
-# CONFIG_AMLOGIC_ZAPPER_NET_CUT is not set
-# CONFIG_AMLOGIC_ZAPPER_CUT is not set
-# CONFIG_AMLOGIC_ZAPPER_CUT_C1A is not set
-# CONFIG_AMLOGIC_REMOVE_OLD is not set
 # CONFIG_AMLOGIC_C3_REMOVE is not set
-CONFIG_AMLOGIC_DEBUG_IOTRACE=m
+# CONFIG_AMLOGIC_DEBUG_IOTRACE is not set
 # CONFIG_AMLOGIC_ARMV8_AARCH32 is not set
 CONFIG_AMLOGIC_APU=y
 # CONFIG_AMLOGIC_BGKI_SCHED_SYSCTL is not set
-CONFIG_AMLOGIC_DEBUG_ISOLCPUS=y
 CONFIG_AMLOGIC_F2FS_OPTIMIZATION=y
 CONFIG_AMLOGIC_MEDIA_CAMERA=m
 CONFIG_AMLOGIC_FREERTOS=y
@@ -7031,7 +7021,7 @@ CONFIG_AMLOGIC_USBCAM=m
 #
 # MESON hw spin lock Support
 #
-CONFIG_AMLOGIC_HWSPINLOCK=m
+CONFIG_AMLOGIC_HWSPINLOCK=y
 # end of MESON hw spin lock Support
 
 CONFIG_AMLOGIC_ANDROID_LOGGER=y