From 63268f641adec9118b59dd03faa5edccb706c467 Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Wed, 24 Jul 2019 12:32:54 +0900
Subject: [PATCH] ODROID-N2: drm: bump kernel config (v4.9.185)

Change-Id: Ifa5d8997cbc5e56467beefdb7669e45e41699159
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
---
 arch/arm64/configs/odroidn2_drm_defconfig | 29 +++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/configs/odroidn2_drm_defconfig b/arch/arm64/configs/odroidn2_drm_defconfig
index c8210722d1af..dcad9c8eb840 100644
--- a/arch/arm64/configs/odroidn2_drm_defconfig
+++ b/arch/arm64/configs/odroidn2_drm_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.177 Kernel Configuration
+# Linux/arm64 4.9.185 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -249,7 +249,8 @@ CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_CC_STACKPROTECTOR_STRONG_AMLOGIC=y
 # CONFIG_LTO is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_LTO_NONE=y
@@ -1413,6 +1414,7 @@ CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y
 # CONFIG_AMLOGIC_PRINTK_NOBLOCK_MODE is not set
 CONFIG_AMLOGIC_IOMAP=y
 CONFIG_AMLOGIC_PINCTRL=y
+# CONFIG_AMLOGIC_PINCTRL_MESON_GXBB is not set
 CONFIG_AMLOGIC_PINCTRL_MESON_GXL=y
 CONFIG_AMLOGIC_PINCTRL_MESON_AXG=y
 CONFIG_AMLOGIC_PINCTRL_MESON_TXLX=y
@@ -1659,6 +1661,11 @@ CONFIG_AMLOGIC_IONVIDEO=y
 #
 CONFIG_AMLOGIC_PIC_DEC=y
 
+#
+# Amlogic videosync support
+#
+CONFIG_AMLOGIC_VIDEOSYNC=y
+
 #
 # Amlogic Enhancement drivers
 #
@@ -1681,6 +1688,15 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
 # Amlogic amdolby_vision Driver
 #
 # CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION is not set
+
+#
+# Amlogic amprime_sl Drivers
+#
+
+#
+# Amlogic amprime_sl Driver
+#
+# CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_PRIME_SL is not set
 CONFIG_AMLOGIC_MEDIA_GDC=y
 
 #
@@ -1782,11 +1798,12 @@ CONFIG_AMLOGIC_ESM=y
 #
 # DVB COMPAT support
 #
+# CONFIG_AMLOGIC_POWER is not set
 
 #
 # Multimedia Card support
 #
-CONFIG_AMLOGIC_IRBLASTER=y
+# CONFIG_AMLOGIC_IRBLASTER_CORE is not set
 CONFIG_AMLOGIC_IIO=y
 
 #
@@ -1811,14 +1828,16 @@ CONFIG_AMLOGIC_MEMORY_EXTEND=y
 CONFIG_AMLOGIC_RAMDUMP=y
 CONFIG_AMLOGIC_CMA=y
 # CONFIG_AMLOGIC_VMAP is not set
+CONFIG_AMLOGIC_WATCHPOINT=y
 CONFIG_AMLOGIC_GPIO_IRQ=y
 
 #
 # Amlogic ATV driver
 #
-CONFIG_AMLOGIC_ATV_DEMOD=y
+# CONFIG_AMLOGIC_ATV_DEMOD is not set
 CONFIG_AMLOGIC_DEBUG=y
 CONFIG_AMLOGIC_DEBUG_LOCKUP=y
+CONFIG_AMLOGIC_DEBUG_ATRACE=y
 
 #
 # Amlogic defend img file update support
@@ -3389,6 +3408,7 @@ CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_RC_CORE=y
 CONFIG_RC_MAP=y
 CONFIG_RC_DECODERS=y
+CONFIG_IR_IRMP_DECODER=y
 CONFIG_LIRC=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
@@ -4149,6 +4169,7 @@ CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y
 # CONFIG_AMLOGIC_SND_SOC_TAS5805 is not set
 CONFIG_AMLOGIC_SND_CODEC_TXLX_ACODEC=y
 # CONFIG_AMLOGIC_SND_CODEC_TL1_ACODEC is not set
+# CONFIG_AMLOGIC_SND_SOC_TAS5782M is not set
 CONFIG_AMLOGIC_SND_SOC_TAS5707=y
 CONFIG_AMLOGIC_SND_SOC_TLV320ADC3101=y
 CONFIG_AMLOGIC_SND_SOC_PCM186X=y