diff --git a/projects/Odroid_C2/linux/linux.aarch64.conf b/projects/Odroid_C2/linux/linux.aarch64.conf
index 8fd3e42e8e..9622282cc3 100644
--- a/projects/Odroid_C2/linux/linux.aarch64.conf
+++ b/projects/Odroid_C2/linux/linux.aarch64.conf
@@ -8,7 +8,7 @@ CONFIG_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=24
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_NO_IOPORT=y
@@ -889,8 +889,8 @@ CONFIG_I2C_AML=y
 # CONFIG_I2C_SLAVE_AML is not set
 # CONFIG_I2C_SW_AML is not set
 # CONFIG_BCM2079X_I2C is not set
-# CONFIG_AML_PWM is not set
-# CONFIG_MESON_PWM is not set
+CONFIG_AMLOGIC_PWM=y
+CONFIG_PWM_MESON=y
 
 #
 # HDMI TX Support
@@ -963,7 +963,9 @@ CONFIG_AML_DISPLAY=y
 CONFIG_AM_VOUT=y
 CONFIG_AM_TV_OUTPUT=y
 CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y
+# CONFIG_AML_VOUT_CC_BYPASS is not set
 # CONFIG_AML_VDAC_HW_SWITCH is not set
+CONFIG_AML_WSS=y
 
 #
 # Amlogic OSD Module
@@ -984,7 +986,12 @@ CONFIG_FB_OSD2_CURSOR=y
 # Amlogic OSD_EXT Module
 #
 # CONFIG_AM_FB_EXT is not set
+
+#
+# Amlogic GE2D Module
+#
 CONFIG_AM_GE2D=y
+# CONFIG_AM_GE2D_MORE_SECURITY is not set
 CONFIG_AM_LOGO=y
 
 #
@@ -1018,21 +1025,26 @@ CONFIG_GE2D_KEEP_FRAME=y
 #
 # Video Decoders
 #
+CONFIG_MULTI_DEC=y
+CONFIG_AM_VDEC_DV=y
 CONFIG_AM_VDEC_MPEG12=y
 CONFIG_AM_VDEC_MPEG4=y
+CONFIG_AM_VDEC_MMPEG4=y
 CONFIG_AM_VDEC_VC1=y
 CONFIG_AM_VDEC_H264=y
+CONFIG_AM_VDEC_MH264=y
 CONFIG_AM_VDEC_H264MVC=y
 CONFIG_AM_VDEC_H264_4K2K=y
 CONFIG_AM_VDEC_H265=y
 CONFIG_AM_VDEC_VP9=y
 CONFIG_AM_VDEC_MJPEG=y
+CONFIG_AM_VDEC_MMJPEG=y
 CONFIG_AM_ENCODER=y
 CONFIG_AM_JPEG_ENCODER=y
 CONFIG_AM_PIC_DEC=y
 CONFIG_AM_VDEC_REAL=y
 CONFIG_AM_VDEC_AVS=y
-# CONFIG_AM_JPEGDEC is not set
+CONFIG_AM_JPEGDEC=y
 CONFIG_AM_TIMESYNC=y
 CONFIG_AM_STREAMING=y
 CONFIG_AM_SUBTITLE=y
@@ -1065,7 +1077,7 @@ CONFIG_AMAUDIO=y
 #
 # Amlogic Audio Interface V2
 #
-# CONFIG_AMAUDIO2 is not set
+CONFIG_AMAUDIO2=y
 
 #
 # Audio dsp process
@@ -1083,7 +1095,6 @@ CONFIG_POST_PROCESS_MANAGER_PPSCALER=y
 # Amlogic Wifi Driver
 #
 # CONFIG_AM_WIFI is not set
-# CONFIG_AM_WIFI_DUMMY is not set
 CONFIG_AML_POWER_RESET=y
 # CONFIG_M8_POWER_RESET is not set
 CONFIG_GXBB_POWER_RESET=y
@@ -1096,8 +1107,8 @@ CONFIG_GXBB_POWER_RESET=y
 #
 # Amlogic ion video support
 #
-# CONFIG_VIDEOBUF2_ION is not set
-# CONFIG_AMLOGIC_IONVIDEO is not set
+CONFIG_VIDEOBUF2_ION=y
+CONFIG_AMLOGIC_IONVIDEO=y
 
 #
 # V4L2 Video Support
@@ -1113,6 +1124,7 @@ CONFIG_TVIN=y
 # CONFIG_TVIN_AFE is not set
 CONFIG_TVIN_HDMI=y
 # CONFIG_TVIN_HDMI_CEC is not set
+# CONFIG_TVIN_HDMI_EXT is not set
 # CONFIG_TVIN_BT656 is not set
 # CONFIG_VIUIN is not set
 # CONFIG_TVIN_ISP is not set
@@ -1124,12 +1136,16 @@ CONFIG_TVIN_HDMI=y
 #
 # Amlogic amvecm Driver
 #
-# CONFIG_AM_VECM is not set
+CONFIG_AM_VECM=y
 # CONFIG_AML_NAND is not set
+
+#
+# Meson NAND Device Support
+#
+# CONFIG_AMLOGIC_NAND is not set
 CONFIG_AM_INPUT=y
 CONFIG_AM_SARADC=y
-CONFIG_MESON_NEW_INPUT_REMOTE=y
-CONFIG_NEW_AM_REMOTE=y
+# CONFIG_AMLOGIC_REMOTE is not set
 CONFIG_MESON_INPUT_KEYBOARD=y
 CONFIG_ADC_KEYPADS_AM=y
 CONFIG_AML_GPIO_KEY=y
@@ -1151,7 +1167,7 @@ CONFIG_GXBB_SUSPEND=y
 # AMLOGIC CI Driver
 #
 # CONFIG_AM_PCMCIA is not set
-# CONFIG_AM_IOBUS is not set
+# CONFIG_AM_SPI is not set
 # CONFIG_AML_SMARTCARD is not set
 
 #
@@ -1201,6 +1217,12 @@ CONFIG_AML_AO_CEC=y
 #
 # CONFIG_CRYPTO_AML is not set
 
+#
+# ESM Support
+#
+CONFIG_AML_ESM=y
+# CONFIG_DRM_MESON is not set
+
 #
 # Generic Driver Options
 #
@@ -2276,8 +2298,8 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
@@ -2285,8 +2307,8 @@ CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_RESOURCE=m
 CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_MEMOPS=y
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
@@ -2499,6 +2521,7 @@ CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA827X=m
 CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA18272=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
@@ -2523,6 +2546,7 @@ CONFIG_MEDIA_TUNER_E4000=m
 CONFIG_MEDIA_TUNER_FC2580=m
 CONFIG_MEDIA_TUNER_M88TS2022=m
 CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
 CONFIG_MEDIA_TUNER_IT913X=m
 CONFIG_MEDIA_TUNER_R820T=m
 
@@ -2594,6 +2618,7 @@ CONFIG_DVB_NXT200X=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_AU8522=m
 CONFIG_DVB_AU8522_DTV=m
@@ -2763,6 +2788,7 @@ CONFIG_SND_AML_M8=y
 CONFIG_SND_AML_SPLIT_MODE=y
 # CONFIG_SND_AML_SPLIT_MODE_MMAP is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_TLV320AIC32X4=y
 CONFIG_SND_SOC_DUMMY_CODEC=y
 CONFIG_SND_SOC_TAS5707=y
 CONFIG_SND_SOC_TAS5717=y
@@ -2770,6 +2796,7 @@ CONFIG_SND_SOC_TAS5731=y
 CONFIG_SND_SOC_PCM2BT=y
 CONFIG_SND_SOC_AMLT9015=y
 CONFIG_SND_SOC_AMLT9015S=y
+CONFIG_SND_SOC_AMLTXLX_ACODEC=y
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
@@ -3190,6 +3217,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_AML_HYM8563 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
@@ -3755,6 +3783,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+# CONFIG_AML_USER_FAULT is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
@@ -3890,6 +3919,7 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=y
 CONFIG_BITREVERSE=y
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
diff --git a/projects/Odroid_C2/patches/linux/linux-008-max_freq_dvfs_table.patch b/projects/Odroid_C2/patches/linux/linux-008-max_freq_dvfs_table.patch
index 78c8305a74..3b24ae7b52 100644
--- a/projects/Odroid_C2/patches/linux/linux-008-max_freq_dvfs_table.patch
+++ b/projects/Odroid_C2/patches/linux/linux-008-max_freq_dvfs_table.patch
@@ -1,7 +1,7 @@
-From dee146cbbb8428b073fba85390577590fc365d86 Mon Sep 17 00:00:00 2001
+From 01dc1e32edb25c62f4f5d25161de0d109da860df Mon Sep 17 00:00:00 2001
 From: Joy Cho <joy.cho@hardkernel.com>
 Date: Wed, 31 Aug 2016 16:27:48 +0900
-Subject: [PATCH] ODROID-C2: Add setup routine to set max. cpu frequency of
+Subject: [PATCH 1/1] ODROID-C2: Add setup routine to set max. cpu frequency of
  dvfs table
 
 - set "max_freq" in boot.ini
@@ -10,11 +10,11 @@ ex) setenv max_freq "1656"
 
 Change-Id: I352c9540d0c34d3ec0ba0f470dae9d4e0786c001
 ---
- drivers/amlogic/mailbox/scpi_protocol.c | 53 +++++++++++++++++++++++++++++++++
- 1 file changed, 53 insertions(+)
+ drivers/amlogic/mailbox/scpi_protocol.c | 52 +++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
 
 diff --git a/drivers/amlogic/mailbox/scpi_protocol.c b/drivers/amlogic/mailbox/scpi_protocol.c
-index ec787d2..f3aa3e0 100644
+index 37fd00a48c9d..ee8052aafd0d 100644
 --- a/drivers/amlogic/mailbox/scpi_protocol.c
 +++ b/drivers/amlogic/mailbox/scpi_protocol.c
 @@ -85,6 +85,12 @@ static int high_priority_cmds[] = {
@@ -68,7 +68,7 @@ index ec787d2..f3aa3e0 100644
  	opps_sz = count * sizeof(*(opps->opp));
  
  	opps->count = count;
-@@ -422,3 +452,25 @@ int scpi_send_usr_data(u32 client_id, u32 *val, u32 size)
+@@ -453,6 +453,29 @@ int scpi_send_usr_data(u32 client_id, u32 *val, u32 size)
  }
  EXPORT_SYMBOL_GPL(scpi_send_usr_data);
  
@@ -94,3 +94,10 @@ index ec787d2..f3aa3e0 100644
 +}
 +__setup("max_freq=", get_max_freq);
 +#endif
++
+ int scpi_get_usr_data(u32 client_id, u32 *val, u32 size)
+ {
+ 	struct scpi_data_buf sdata;
+-- 
+2.11.0
+