diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts b/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
index 99b17e56825d..b5b6251c0d4c 100644
--- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts
@@ -32,6 +32,15 @@
 		#size-cells = <2>;
 		ranges;
 		/* global autoconfigured region for contiguous allocations */
+		ramoops@0x07400000 {
+			compatible = "ramoops";
+			reg = <0x0 0x07400000 0x0 0x00100000>;
+			record-size = <0x8000>;
+			console-size = <0x8000>;
+			ftrace-size = <0x0>;
+			pmsg-size = <0x8000>;
+		};
+
 		secmon_reserved:linux,secmon {
 			compatible = "shared-dma-pool";
 			reusable;
@@ -181,16 +190,6 @@
 		status = "okay";
 	};
 
-	gpio_keypad {
-		compatible = "amlogic, gpio_keypad";
-		status = "okay";
-		scan_period = <20>;
-		key_num = <1>;
-		key_name = "power";
-		key_code = <116>;
-		key_pin = <&gpio_ao  GPIOAO_3  GPIO_ACTIVE_HIGH>;
-	};
-
 	custom_maps {
 		mapnum = <4>;
 		map3 = <&map_3>;
diff --git a/arch/arm64/configs/odroidn2_defconfig b/arch/arm64/configs/odroidn2_defconfig
index cd1f534dacb9..acb6fd0c44b5 100644
--- a/arch/arm64/configs/odroidn2_defconfig
+++ b/arch/arm64/configs/odroidn2_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
@@ -373,6 +373,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
@@ -570,7 +571,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
@@ -1087,7 +1087,8 @@ CONFIG_AMLOGIC_MODIFY=y
 #
 # Amlogic Device Drivers
 #
-# CONFIG_AMLOGIC_CPUFREQ is not set
+CONFIG_AMLOGIC_CPUFREQ=y
+CONFIG_AMLOGIC_MESON_CPUFREQ=y
 CONFIG_AMLOGIC_INPUT_BOOST=y
 CONFIG_AMLOGIC_INPUT_BOOST_DURATION=1000
 CONFIG_AMLOGIC_UART=y
@@ -1099,6 +1100,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
@@ -1152,15 +1155,18 @@ CONFIG_AMLOGIC_CRYPTO=y
 CONFIG_AMLOGIC_CRYPTO_DMA=y
 # CONFIG_AMLOGIC_CRYPTO_BLKMV is not set
 CONFIG_AMLOGIC_INPUT=y
+# CONFIG_AMLOGIC_AVIN_DETECT is not set
 CONFIG_AMLOGIC_INPUT_KEYBOARD=y
 CONFIG_AMLOGIC_ADC_KEYPADS=y
 CONFIG_AMLOGIC_GPIO_KEY=y
+# CONFIG_AMLOGIC_PCA9557_KEYPAD is not set
 CONFIG_AMLOGIC_REMOTE=y
 CONFIG_AMLOGIC_MESON_REMOTE=y
 CONFIG_AMLOGIC_TOUCHSCREEN=y
 CONFIG_AMLOGIC_TOUCHSCREEN_FTS=y
 CONFIG_AMLOGIC_TOUCHSCREEN_GT1X=y
 CONFIG_AMLOGIC_TOUCHSCREEN_GT9XX=y
+# CONFIG_AMLOGIC_SENSOR is not set
 
 #
 # EFUSE Support
@@ -1174,6 +1180,12 @@ CONFIG_AMLOGIC_INTERNAL_PHY=y
 CONFIG_AMLOGIC_CPU_HOTPLUG=y
 CONFIG_AMLOGIC_PWM=y
 
+#
+# Amlogic dvb configuration
+#
+CONFIG_AMLOGIC_DVB=y
+CONFIG_AMLOGIC_DVB_COMPAT=y
+
 #
 # Amlogic multimedia configuration
 #
@@ -1241,9 +1253,9 @@ CONFIG_AMLOGIC_LCD_TV=y
 CONFIG_AMLOGIC_LCD_TABLET=y
 CONFIG_AMLOGIC_LCD_EXTERN=y
 # CONFIG_AMLOGIC_LCD_EXTERN_I2C_T5800Q is not set
+# CONFIG_AMLOGIC_LCD_EXTERN_I2C_ANX6862_7911 is not set
 # CONFIG_AMLOGIC_LCD_EXTERN_I2C_DLPC3439 is not set
 # CONFIG_AMLOGIC_LCD_EXTERN_I2C_ANX6345 is not set
-# CONFIG_AMLOGIC_LCD_EXTERN_I2C_TC101 is not set
 # CONFIG_AMLOGIC_LCD_EXTERN_SPI_LD070WS2 is not set
 # CONFIG_AMLOGIC_LCD_EXTERN_MIPI_KD080D13 is not set
 # CONFIG_AMLOGIC_LCD_EXTERN_MIPI_N070ICN is not set
@@ -1355,6 +1367,11 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
 CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y
 CONFIG_AMLOGIC_MEDIA_GDC=y
 
+#
+# Amlogic multimedia algorithm configuration
+#
+# CONFIG_AMLOGIC_MEDIA_ALGORITHM is not set
+
 #
 # Amlogic DTV driver
 #
@@ -1443,7 +1460,6 @@ CONFIG_AMLOGIC_ESM=y
 #
 # DVB COMPAT support
 #
-CONFIG_AMLOGIC_DVB_COMPAT=y
 
 #
 # Multimedia Card support
@@ -1458,6 +1474,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
@@ -1479,6 +1496,12 @@ CONFIG_AMLOGIC_DEBUG_LOCKUP=y
 # Amlogic defend img file update support
 #
 CONFIG_AMLOGIC_DEFENDKEY=y
+# CONFIG_AMLOGIC_BATTERY_DUMMY is not set
+# CONFIG_AMLOGIC_CHARGER_DUMMY is not set
+
+#
+# Meson SPI NOR Flash Support
+#
 CONFIG_ARM_AMBA=y
 
 #
@@ -1810,7 +1833,9 @@ CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
+# CONFIG_DM_VERITY_AVB is not set
 CONFIG_DM_ANDROID_VERITY=y
+# CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
@@ -2227,7 +2252,7 @@ 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_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=32
@@ -2833,9 +2858,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
@@ -3131,7 +3158,9 @@ CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
@@ -3290,6 +3319,7 @@ CONFIG_AMLOGIC_SND_CODEC_DUMMY_CODEC=y
 CONFIG_AMLOGIC_SND_CODEC_PCM2BT=y
 CONFIG_AMLOGIC_SND_CODEC_PDM_DUMMY_CODEC=y
 CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y
+# CONFIG_AMLOGIC_SND_CODEC_AMLT9015S is not set
 # CONFIG_AMLOGIC_SND_CODEC_PMU3 is not set
 CONFIG_AMLOGIC_SND_CODEC_TXLX_ACODEC=y
 CONFIG_AMLOGIC_SND_SOC_TAS5707=y
@@ -3300,6 +3330,7 @@ CONFIG_AMLOGIC_SND_SOC_SSM3515=y
 CONFIG_AMLOGIC_SND_SOC_TAS575X=y
 # CONFIG_AMLOGIC_SND_SOC_ES7243 is not set
 CONFIG_AMLOGIC_SND_SOC_AD82584F=y
+# CONFIG_AMLOGIC_SND_SOC_CS42528 is not set
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SND_SIMPLE_SCU_CARD is not set
 CONFIG_AMLOGIC_SND_SOC=y
@@ -4368,6 +4399,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
@@ -5149,6 +5181,10 @@ CONFIG_MPILIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y