diff --git a/arch/arm64/configs/odroidn2_android_defconfig b/arch/arm64/configs/odroidn2_android_defconfig
index f796535a9ea9..7313547824b7 100644
--- a/arch/arm64/configs/odroidn2_android_defconfig
+++ b/arch/arm64/configs/odroidn2_android_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.99 Kernel Configuration
+# Linux/arm64 4.9.113 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -374,6 +374,7 @@ CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -571,7 +572,6 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_SCPI_CPUFREQ=y
-CONFIG_AMLOGIC_MESON_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -1097,6 +1097,7 @@ CONFIG_AMLOGIC_MODIFY=y
 # Amlogic Device Drivers
 #
 # CONFIG_AMLOGIC_CPUFREQ is not set
+CONFIG_AMLOGIC_MESON_CPUFREQ=y
 CONFIG_AMLOGIC_INPUT_BOOST=y
 CONFIG_AMLOGIC_INPUT_BOOST_DURATION=1000
 CONFIG_AMLOGIC_UART=y
@@ -1108,6 +1109,8 @@ CONFIG_AMLOGIC_PINCTRL_MESON_GXL=y
 CONFIG_AMLOGIC_PINCTRL_MESON_AXG=y
 CONFIG_AMLOGIC_PINCTRL_MESON_TXLX=y
 CONFIG_AMLOGIC_PINCTRL_MESON_G12A=y
+CONFIG_AMLOGIC_PINCTRL_MESON_TXL=y
+# CONFIG_AMLOGIC_PINCTRL_MESON_TL1 is not set
 CONFIG_AMLOGIC_PINCONF_MESON_G12A=y
 CONFIG_AMLOGIC_PINCTRL_MESON8_PMX=y
 CONFIG_AMLOGIC_PINCTRL_MESON_AXG_PMX=y
@@ -1468,7 +1471,6 @@ CONFIG_AMLOGIC_BT_DEVICE=y
 #
 # DVB COMPAT support
 #
-CONFIG_AMLOGIC_DVB_COMPAT=y
 CONFIG_AMLOGIC_POWER=y
 # CONFIG_AMLOGIC_PMU_OF is not set
 # CONFIG_AMLOGIC_PMU is not set
@@ -1487,6 +1489,7 @@ CONFIG_AMLOGIC_SARADC=y
 CONFIG_AMLOGIC_DDR_TOOL=y
 # CONFIG_AMLOGIC_DDR_WINDOW_TOOL is not set
 CONFIG_AMLOGIC_DDR_BANDWIDTH=y
+CONFIG_AMLOGIC_DMC_MONITOR=y
 # CONFIG_AMLOGIC_SM is not set
 CONFIG_AMLOGIC_TEE=y
 # CONFIG_AMLOGIC_LEDRING is not set
@@ -2337,12 +2340,6 @@ CONFIG_SERIO_LIBPS2=y
 # Character devices
 #
 CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_VT is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -2950,9 +2947,11 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_V4L2_MEM2MEM_DEV=y
 CONFIG_VIDEOBUF_GEN=y
 CONFIG_VIDEOBUF2_CORE=y
 CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
 CONFIG_VIDEOBUF2_VMALLOC=y
 CONFIG_DVB_CORE=y
 CONFIG_DVB_NET=y
@@ -3262,14 +3261,6 @@ CONFIG_BACKLIGHT_GENERIC=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_VGASTATE is not set
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
@@ -4545,6 +4536,7 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_GPIO_RESET_CONTROLLER=y
 # CONFIG_RESET_ATH79 is not set
 # CONFIG_RESET_BERLIN is not set
 # CONFIG_RESET_LPC18XX is not set