From 9680a9f5d96ddfc6f4e00866185bfb3e1e1253c8 Mon Sep 17 00:00:00 2001
From: Joy Cho <joy.cho@hardkernel.com>
Date: Mon, 31 Dec 2018 15:31:50 +0900
Subject: [PATCH] ODROID-N2: media: rc: activate meson-ir driver to support
 LIRC

Change-Id: Ibe8c8b1199a5f505665c88c9c40fabfed525fb20
---
 .../boot/dts/amlogic/meson64_odroidn2.dts     | 37 +++++++------------
 arch/arm64/configs/odroidn2_defconfig         | 25 ++++++-------
 drivers/media/rc/Kconfig                      |  1 -
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index 08069c541190..6fbb741fd660 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -194,29 +194,6 @@
 		status = "okay";
 	};
 
-	custom_maps {
-		mapnum = <4>;
-		map3 = <&map_3>;
-		map_3: map_3{
-			mapname = "hardkernel-remote";
-			release_delay = <80>;
-			size  = <12>;
-			customcode = <0x4db2>;
-			keymap = <REMOTE_KEY(0xCA, KEY_UP)
-				REMOTE_KEY(0xD2, KEY_DOWN)
-				REMOTE_KEY(0xC1, KEY_RIGHT)
-				REMOTE_KEY(0x99, KEY_LEFT)
-				REMOTE_KEY(0xCE, KEY_ENTER)
-				REMOTE_KEY(0x82, KEY_HOME)
-				REMOTE_KEY(0x88, KEY_MUTE)
-				REMOTE_KEY(0xC5, KEY_MENU)
-				REMOTE_KEY(0x9A, KEY_BACK)
-				REMOTE_KEY(0x81, KEY_VOLUMEDOWN)
-				REMOTE_KEY(0x80, KEY_VOLUMEUP)
-				REMOTE_KEY(0xDC, KEY_POWER)>;
-		};
-	};
-
 	amlvecm {
 		compatible = "amlogic, vecm";
 		dev_name = "aml_vecm";
@@ -349,6 +326,20 @@
 		status = "okay";
 	};
 
+	remote {
+		status = "disabled";
+	};
+
+	meson-ir {
+		compatible = "amlogic,meson6-ir";
+		/* Multi-format IR controller */
+		reg = <0x0 0xff808040 0x0 0x44>;
+		interrupts = <0 196 1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&remote_pins>;
+		pulse-inverted;
+		status = "ok";
+	};
 
 }; /* end of / */
 
diff --git a/arch/arm64/configs/odroidn2_defconfig b/arch/arm64/configs/odroidn2_defconfig
index f9e80edb3def..d15b4814cc75 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.141 Kernel Configuration
+# Linux/arm64 4.9.156 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1476,8 +1476,7 @@ 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_REMOTE is not set
 CONFIG_AMLOGIC_TOUCHSCREEN=y
 CONFIG_AMLOGIC_TOUCHSCREEN_FTS=y
 CONFIG_AMLOGIC_TOUCHSCREEN_GT1X=y
@@ -3380,20 +3379,21 @@ CONFIG_RC_MAP=y
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
 CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=y
-CONFIG_IR_RC5_DECODER=y
-CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
-CONFIG_IR_SANYO_DECODER=y
-CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
-CONFIG_IR_XMP_DECODER=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_IR_HIX5HD2 is not set
 # CONFIG_IR_IMON is not set
 # CONFIG_IR_MCEUSB is not set
+CONFIG_IR_MESON=m
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_IR_IGORPLUGUSB is not set
@@ -5637,7 +5637,6 @@ CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 370e16e07867..22cea5704e85 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -227,7 +227,6 @@ config IR_FINTEK
 config IR_MESON
 	tristate "Amlogic Meson IR remote receiver"
 	depends on RC_CORE
-	depends on ARCH_MESON || COMPILE_TEST
 	---help---
 	   Say Y if you want to use the IR remote receiver available
 	   on Amlogic Meson SoCs.