From 97b24ff295359ae402c10bc4e0710d877eb7f5dc Mon Sep 17 00:00:00 2001
From: Nick <nick@khadas.com>
Date: Tue, 4 Jun 2019 09:51:54 +0800
Subject: [PATCH] arm64: dts: VIM1/VIM2: add remote support

---
 arch/arm64/boot/dts/amlogic/mesongxl.dtsi | 211 +++++++++++-------------------
 arch/arm64/boot/dts/amlogic/mesongxm.dtsi | 205 +++++++++++------------------
 2 files changed, 156 insertions(+), 260 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
index bad3e044..0e79063 100644
--- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
@@ -1222,147 +1222,92 @@
 	};
 
 	custom_maps:custom_maps {
-		mapnum = <3>;
+		mapnum = <2>;
 		map0 = <&map_0>;
 		map1 = <&map_1>;
-		map2 = <&map_2>;
 		map_0: map_0{
-			mapname = "amlogic-remote-1";
-			customcode = <0xfb04>;
+			mapname = "khadas-ir";
+			customcode = <0xff00>;
 			release_delay = <80>;
-			size  = <50>;   /*keymap size*/
-			keymap = <REMOTE_KEY(0x47, KEY_0)
-				REMOTE_KEY(0x13, KEY_1)
-				REMOTE_KEY(0x10, KEY_2)
-				REMOTE_KEY(0x11, KEY_3)
-				REMOTE_KEY(0x0F, KEY_4)
-				REMOTE_KEY(0x0C, KEY_5)
-				REMOTE_KEY(0x0D, KEY_6)
-				REMOTE_KEY(0x0B, KEY_7)
-				REMOTE_KEY(0x08, KEY_8)
-				REMOTE_KEY(0x09, KEY_9)
-				REMOTE_KEY(0x5C, KEY_RIGHTCTRL)
-				REMOTE_KEY(0x51, KEY_F3)
-				REMOTE_KEY(0x50, KEY_F4)
-				REMOTE_KEY(0x40, KEY_F5)
-				REMOTE_KEY(0x4d, KEY_F6)
-				REMOTE_KEY(0x43, KEY_F7)
-				REMOTE_KEY(0x17, KEY_F8)
-				REMOTE_KEY(0x00, KEY_F9)
-				REMOTE_KEY(0x01, KEY_F10)
-				REMOTE_KEY(0x16, KEY_F11)
-				REMOTE_KEY(0x49, KEY_BACKSPACE)
-				REMOTE_KEY(0x06, KEY_PROPS)
-				REMOTE_KEY(0x14, KEY_UNDO)
-				REMOTE_KEY(0x44, KEY_UP)
-				REMOTE_KEY(0x1D, KEY_DOWN)
-				REMOTE_KEY(0x1C, KEY_LEFT)
-				REMOTE_KEY(0x48, KEY_RIGHT)
-				REMOTE_KEY(0x53, KEY_LEFTMETA)
-				REMOTE_KEY(0x45, KEY_PAGEUP)
-				REMOTE_KEY(0x19, KEY_PAGEDOWN)
-				REMOTE_KEY(0x52, KEY_PAUSE)
-				REMOTE_KEY(0x05, KEY_HANGEUL)
-				REMOTE_KEY(0x59, KEY_HANJA)
-				REMOTE_KEY(0x1b, KEY_SCALE)
-				REMOTE_KEY(0x04, KEY_KPCOMMA)
-				REMOTE_KEY(0x1A, KEY_POWER)
-				REMOTE_KEY(0x0A, KEY_TAB)
-				REMOTE_KEY(0x0e, KEY_MUTE)
-				REMOTE_KEY(0x1F, KEY_HOME)
-				REMOTE_KEY(0x1e, KEY_FRONT)
-				REMOTE_KEY(0x07, KEY_COPY)
-				REMOTE_KEY(0x12, KEY_OPEN)
-				REMOTE_KEY(0x54, KEY_PASTE)
-				REMOTE_KEY(0x02, KEY_FIND)
-				REMOTE_KEY(0x4f, KEY_A)
-				REMOTE_KEY(0x42, KEY_B)
-				REMOTE_KEY(0x5d, KEY_C)
-				REMOTE_KEY(0x4c, KEY_D)
-				REMOTE_KEY(0x58, KEY_CUT)
-				REMOTE_KEY(0x55, KEY_CALC)>;
+			fn_key_scancode = <0x5c>;
+			fn_key_scancode_other = <0x5b>;
+			cursor_left_scancode = <0x0e>;
+			cursor_right_scancode = <0x1a>;
+			cursor_up_scancode = <0x03>;
+			cursor_down_scancode = <0x02>;
+			cursor_ok_scancode = <0x07>;
+			size  = <13>;
+			keymap = <REMOTE_KEY(0x14,116)
+				REMOTE_KEY(0x13,139)
+				REMOTE_KEY(0x03,103)
+				REMOTE_KEY(0x02,108)
+				REMOTE_KEY(0x0e,105)
+				REMOTE_KEY(0x1a,106)
+				REMOTE_KEY(0x07,232)
+				REMOTE_KEY(0x58,114)
+				REMOTE_KEY(0x5c,63)
+				REMOTE_KEY(0x5b,63)
+				REMOTE_KEY(0x0b,115)
+				REMOTE_KEY(0x01,158)
+				REMOTE_KEY(0x48,102)>;
 		};
+
 		map_1: map_1{
-			mapname = "amlogic-remote-2";
+			mapname = "dvb-ir";
 			customcode = <0xfe01>;
 			release_delay = <80>;
-			size  = <53>;
-			keymap = <REMOTE_KEY(0x01, KEY_1)
-				REMOTE_KEY(0x02, KEY_2)
-				REMOTE_KEY(0x03, KEY_3)
-				REMOTE_KEY(0x04, KEY_4)
-				REMOTE_KEY(0x05, KEY_5)
-				REMOTE_KEY(0x06, KEY_6)
-				REMOTE_KEY(0x07, KEY_7)
-				REMOTE_KEY(0x08, KEY_8)
-				REMOTE_KEY(0x09, KEY_9)
-				REMOTE_KEY(0x0a, KEY_0)
-				REMOTE_KEY(0x1F, KEY_FN_F1)
-				REMOTE_KEY(0x15, KEY_MENU)
-				REMOTE_KEY(0x16, KEY_TAB)
-				REMOTE_KEY(0x0c, KEY_CHANNELUP)
-				REMOTE_KEY(0x0d, KEY_CHANNELDOWN)
-				REMOTE_KEY(0x0e, KEY_VOLUMEUP)
-				REMOTE_KEY(0x0f, KEY_VOLUMEDOWN)
-				REMOTE_KEY(0x11, KEY_HOME)
-				REMOTE_KEY(0x1c, KEY_RIGHT)
-				REMOTE_KEY(0x1b, KEY_LEFT)
-				REMOTE_KEY(0x19, KEY_UP)
-				REMOTE_KEY(0x1a, KEY_DOWN)
-				REMOTE_KEY(0x1d, KEY_ENTER)
-				REMOTE_KEY(0x17, KEY_MUTE)
-				REMOTE_KEY(0x49, KEY_FINANCE)
-				REMOTE_KEY(0x43, KEY_BACK)
-				REMOTE_KEY(0x12, KEY_FN_F4)
-				REMOTE_KEY(0x14, KEY_FN_F5)
-				REMOTE_KEY(0x18, KEY_FN_F6)
-				REMOTE_KEY(0x59, KEY_INFO)
-				REMOTE_KEY(0x5a, KEY_STOPCD)
-				REMOTE_KEY(0x10, KEY_POWER)
-				REMOTE_KEY(0x42, KEY_PREVIOUSSONG)
-				REMOTE_KEY(0x44, KEY_NEXTSONG)
-				REMOTE_KEY(0x1e, KEY_REWIND)
-				REMOTE_KEY(0x4b, KEY_FASTFORWARD)
-				REMOTE_KEY(0x58, KEY_PLAYPAUSE)
-				REMOTE_KEY(0x46, KEY_PROPS)
-				REMOTE_KEY(0x40, KEY_UNDO)
-				REMOTE_KEY(0x38, KEY_SCROLLLOCK)
-				REMOTE_KEY(0x57, KEY_FN)
-				REMOTE_KEY(0x5b, KEY_FN_ESC)
-				REMOTE_KEY(0x54, KEY_RED)
-				REMOTE_KEY(0x4c, KEY_GREEN)
-				REMOTE_KEY(0x4e, KEY_YELLOW)
-				REMOTE_KEY(0x55, KEY_BLUE)
-				REMOTE_KEY(0x53, KEY_BLUETOOTH)
-				REMOTE_KEY(0x52, KEY_WLAN)
-				REMOTE_KEY(0x39, KEY_CAMERA)
-				REMOTE_KEY(0x41, KEY_SOUND)
-				REMOTE_KEY(0x0b, KEY_QUESTION)
-				REMOTE_KEY(0x00, KEY_CHAT)
-				REMOTE_KEY(0x13, KEY_SEARCH)>;
-		};
-		map_2: map_2{
-			mapname = "amlogic-remote-3";
-			customcode = <0xbd02>;
-			release_delay = <80>;
-			size  = <17>;
-			keymap = <REMOTE_KEY(0xca,103)
-				REMOTE_KEY(0xd2,108)
-				REMOTE_KEY(0x99,105)
-				REMOTE_KEY(0xc1,106)
-				REMOTE_KEY(0xce,97)
-				REMOTE_KEY(0x45,116)
-				REMOTE_KEY(0xc5,133)
-				REMOTE_KEY(0x80,113)
-				REMOTE_KEY(0xd0,15)
-				REMOTE_KEY(0xd6,125)
-				REMOTE_KEY(0x95,102)
-				REMOTE_KEY(0xdd,104)
-				REMOTE_KEY(0x8c,109)
-				REMOTE_KEY(0x89,131)
-				REMOTE_KEY(0x9c,130)
-				REMOTE_KEY(0x9a,120)
-				REMOTE_KEY(0xcd,121)>;
+			fn_key_scancode = <0x0d>;
+			cursor_left_scancode = <0x54>;
+			cursor_right_scancode = <0x15>;
+			cursor_up_scancode = <0x59>;
+			cursor_down_scancode = <0x51>;
+			cursor_ok_scancode = <0x55>;
+			size  = <45>;
+			keymap = <REMOTE_KEY(0x0d,272)
+				REMOTE_KEY(0x00,116)
+				REMOTE_KEY(0x50,102)
+				REMOTE_KEY(0x41,113)
+				REMOTE_KEY(0x48,115)
+				REMOTE_KEY(0x0b,114)
+				REMOTE_KEY(0x58,139)
+				REMOTE_KEY(0x59,103)
+				REMOTE_KEY(0x51,108)
+				REMOTE_KEY(0x54,105)
+				REMOTE_KEY(0x15,106)
+				REMOTE_KEY(0x55,232)
+				REMOTE_KEY(0x1e,11)
+				REMOTE_KEY(0x13,2)
+				REMOTE_KEY(0x12,3)
+				REMOTE_KEY(0x10,4)
+				REMOTE_KEY(0x17,5)
+				REMOTE_KEY(0x16,6)
+				REMOTE_KEY(0x14,7)
+				REMOTE_KEY(0x1b,8)
+				REMOTE_KEY(0x1a,9)
+				REMOTE_KEY(0x18,10)
+				REMOTE_KEY(0x11,14)
+				REMOTE_KEY(0x07,128)
+				REMOTE_KEY(0x40,121)
+				REMOTE_KEY(0x03,120)
+				REMOTE_KEY(0x01,123)
+				REMOTE_KEY(0x05,122)
+				REMOTE_KEY(0x44,119)
+				REMOTE_KEY(0x19,158)
+				REMOTE_KEY(0x04,104)
+				REMOTE_KEY(0x06,109)
+				REMOTE_KEY(0x5c,365)
+				REMOTE_KEY(0x1d,358)
+				REMOTE_KEY(0x0a,398)
+				REMOTE_KEY(0x4d,399)
+				REMOTE_KEY(0x0e,400)
+				REMOTE_KEY(0x0c,401)
+				REMOTE_KEY(0x1c,750)
+				REMOTE_KEY(0x08,751)
+				REMOTE_KEY(0x45,752)
+				REMOTE_KEY(0x1f,753)
+				REMOTE_KEY(0x4c,754)
+				REMOTE_KEY(0x49,755)
+				REMOTE_KEY(0x09,756)>;
 		};
 	};
 	aml_reboot{
diff --git a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
index 92bd78b..d2355f3 100644
--- a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
@@ -1300,141 +1300,92 @@
 	};
 
 	custom_maps:custom_maps {
-		mapnum = <3>;
+		mapnum = <2>;
 		map0 = <&map_0>;
 		map1 = <&map_1>;
-		map2 = <&map_2>;
 		map_0: map_0{
-			mapname = "amlogic-remote-1";
-			customcode = <0xfb04>;
+			mapname = "khadas-ir";
+			customcode = <0xff00>;
 			release_delay = <80>;
-			size  = <44>;   /*keymap size*/
-			keymap = <REMOTE_KEY(0x47, KEY_0)
-				REMOTE_KEY(0x13, KEY_1)
-				REMOTE_KEY(0x10, KEY_2)
-				REMOTE_KEY(0x11, KEY_3)
-				REMOTE_KEY(0x0F, KEY_4)
-				REMOTE_KEY(0x0C, KEY_5)
-				REMOTE_KEY(0x0D, KEY_6)
-				REMOTE_KEY(0x0B, KEY_7)
-				REMOTE_KEY(0x08, KEY_8)
-				REMOTE_KEY(0x09, KEY_9)
-				REMOTE_KEY(0x5C, KEY_RIGHTCTRL)
-				REMOTE_KEY(0x51, KEY_F7)
-				REMOTE_KEY(0x49, KEY_BACKSPACE)
-				REMOTE_KEY(0x06, KEY_PROPS)
-				REMOTE_KEY(0x14, KEY_UNDO)
-				REMOTE_KEY(0x44, KEY_UP)
-				REMOTE_KEY(0x1D, KEY_DOWN)
-				REMOTE_KEY(0x1C, KEY_LEFT)
-				REMOTE_KEY(0x48, KEY_RIGHT)
-				REMOTE_KEY(0x53, KEY_LEFTMETA)
-				REMOTE_KEY(0x45, KEY_PAGEUP)
-				REMOTE_KEY(0x19, KEY_PAGEDOWN)
-				REMOTE_KEY(0x16, KEY_HOME)//
-				REMOTE_KEY(0x52, KEY_PAUSE)
-				REMOTE_KEY(0x05, KEY_HANGEUL)
-				REMOTE_KEY(0x59, KEY_HANJA)
-				REMOTE_KEY(0x1b, KEY_SCALE)
-				REMOTE_KEY(0x04, KEY_KPCOMMA)
-				REMOTE_KEY(0x1A, KEY_POWER)
-				REMOTE_KEY(0x0A, KEY_TAB)
-				REMOTE_KEY(0x0e, KEY_MUTE)
-				REMOTE_KEY(0x15, KEY_F5)
-				REMOTE_KEY(0x1F, KEY_HOME)
-				REMOTE_KEY(0x1e, KEY_FRONT)
-				REMOTE_KEY(0x07, KEY_COPY)
-				REMOTE_KEY(0x12, KEY_OPEN)
-				REMOTE_KEY(0x54, KEY_PASTE)
-				REMOTE_KEY(0x02, KEY_FIND)
-				REMOTE_KEY(0x4f, KEY_A)
-				REMOTE_KEY(0x42, KEY_B)
-				REMOTE_KEY(0x5d, KEY_C)
-				REMOTE_KEY(0x4c, KEY_D)
-				REMOTE_KEY(0x58, KEY_CUT)
-				REMOTE_KEY(0x55, KEY_CALC)>;
+			fn_key_scancode = <0x5c>;
+			fn_key_scancode_other = <0x5b>;
+			cursor_left_scancode = <0x0e>;
+			cursor_right_scancode = <0x1a>;
+			cursor_up_scancode = <0x03>;
+			cursor_down_scancode = <0x02>;
+			cursor_ok_scancode = <0x07>;
+			size  = <13>;
+			keymap = <REMOTE_KEY(0x14,116)
+				REMOTE_KEY(0x13,139)
+				REMOTE_KEY(0x03,103)
+				REMOTE_KEY(0x02,108)
+				REMOTE_KEY(0x0e,105)
+				REMOTE_KEY(0x1a,106)
+				REMOTE_KEY(0x07,232)
+				REMOTE_KEY(0x58,114)
+				REMOTE_KEY(0x5c,63)
+				REMOTE_KEY(0x5b,63)
+				REMOTE_KEY(0x0b,115)
+				REMOTE_KEY(0x01,158)
+				REMOTE_KEY(0x48,102)>;
 		};
+
 		map_1: map_1{
-			mapname = "amlogic-remote-2";
+			mapname = "dvb-ir";
 			customcode = <0xfe01>;
 			release_delay = <80>;
-			size  = <53>;
-			keymap = <REMOTE_KEY(0x01, KEY_1)
-				REMOTE_KEY(0x02, KEY_2)
-				REMOTE_KEY(0x03, KEY_3)
-				REMOTE_KEY(0x04, KEY_4)
-				REMOTE_KEY(0x05, KEY_5)
-				REMOTE_KEY(0x06, KEY_6)
-				REMOTE_KEY(0x07, KEY_7)
-				REMOTE_KEY(0x08, KEY_8)
-				REMOTE_KEY(0x09, KEY_9)
-				REMOTE_KEY(0x0a, KEY_0)
-				REMOTE_KEY(0x1F, KEY_FN_F1)
-				REMOTE_KEY(0x15, KEY_MENU)
-				REMOTE_KEY(0x16, KEY_TAB)
-				REMOTE_KEY(0x0c, KEY_CHANNELUP)
-				REMOTE_KEY(0x0d, KEY_CHANNELDOWN)
-				REMOTE_KEY(0x0e, KEY_VOLUMEUP)
-				REMOTE_KEY(0x0f, KEY_VOLUMEDOWN)
-				REMOTE_KEY(0x11, KEY_HOME)
-				REMOTE_KEY(0x1c, KEY_RIGHT)
-				REMOTE_KEY(0x1b, KEY_LEFT)
-				REMOTE_KEY(0x19, KEY_UP)
-				REMOTE_KEY(0x1a, KEY_DOWN)
-				REMOTE_KEY(0x1d, KEY_ENTER)
-				REMOTE_KEY(0x17, KEY_MUTE)
-				REMOTE_KEY(0x49, KEY_FINANCE)
-				REMOTE_KEY(0x43, KEY_BACK)
-				REMOTE_KEY(0x12, KEY_FN_F4)
-				REMOTE_KEY(0x14, KEY_FN_F5)
-				REMOTE_KEY(0x18, KEY_FN_F6)
-				REMOTE_KEY(0x59, KEY_INFO)
-				REMOTE_KEY(0x5a, KEY_STOPCD)
-				REMOTE_KEY(0x10, KEY_POWER)
-				REMOTE_KEY(0x42, KEY_PREVIOUSSONG)
-				REMOTE_KEY(0x44, KEY_NEXTSONG)
-				REMOTE_KEY(0x1e, KEY_REWIND)
-				REMOTE_KEY(0x4b, KEY_FASTFORWARD)
-				REMOTE_KEY(0x58, KEY_PLAYPAUSE)
-				REMOTE_KEY(0x46, KEY_PROPS)
-				REMOTE_KEY(0x40, KEY_UNDO)
-				REMOTE_KEY(0x38, KEY_SCROLLLOCK)
-				REMOTE_KEY(0x57, KEY_FN)
-				REMOTE_KEY(0x5b, KEY_FN_ESC)
-				REMOTE_KEY(0x54, KEY_RED)
-				REMOTE_KEY(0x4c, KEY_GREEN)
-				REMOTE_KEY(0x4e, KEY_YELLOW)
-				REMOTE_KEY(0x55, KEY_BLUE)
-				REMOTE_KEY(0x53, KEY_BLUETOOTH)
-				REMOTE_KEY(0x52, KEY_WLAN)
-				REMOTE_KEY(0x39, KEY_CAMERA)
-				REMOTE_KEY(0x41, KEY_SOUND)
-				REMOTE_KEY(0x0b, KEY_QUESTION)
-				REMOTE_KEY(0x00, KEY_CHAT)
-				REMOTE_KEY(0x13, KEY_SEARCH)>;
-		};
-		map_2: map_2{
-			mapname = "amlogic-remote-3";
-			customcode = <0xbd02>;
-			release_delay = <80>;
-			size  = <17>;
-			keymap = <REMOTE_KEY(0xca,103)
-				REMOTE_KEY(0xd2,108)
-				REMOTE_KEY(0x99,105)
-				REMOTE_KEY(0xc1,106)
-				REMOTE_KEY(0xce,97)
-				REMOTE_KEY(0x45,116)
-				REMOTE_KEY(0xc5,133)
-				REMOTE_KEY(0x80,113)
-				REMOTE_KEY(0xd0,15)
-				REMOTE_KEY(0xd6,125)
-				REMOTE_KEY(0x95,102)
-				REMOTE_KEY(0xdd,104)
-				REMOTE_KEY(0x8c,109)
-				REMOTE_KEY(0x89,131)
-				REMOTE_KEY(0x9c,130)
-				REMOTE_KEY(0x9a,120)
-				REMOTE_KEY(0xcd,121)>;
+			fn_key_scancode = <0x0d>;
+			cursor_left_scancode = <0x54>;
+			cursor_right_scancode = <0x15>;
+			cursor_up_scancode = <0x59>;
+			cursor_down_scancode = <0x51>;
+			cursor_ok_scancode = <0x55>;
+			size  = <45>;
+			keymap = <REMOTE_KEY(0x0d,272)
+				REMOTE_KEY(0x00,116)
+				REMOTE_KEY(0x50,102)
+				REMOTE_KEY(0x41,113)
+				REMOTE_KEY(0x48,115)
+				REMOTE_KEY(0x0b,114)
+				REMOTE_KEY(0x58,139)
+				REMOTE_KEY(0x59,103)
+				REMOTE_KEY(0x51,108)
+				REMOTE_KEY(0x54,105)
+				REMOTE_KEY(0x15,106)
+				REMOTE_KEY(0x55,232)
+				REMOTE_KEY(0x1e,11)
+				REMOTE_KEY(0x13,2)
+				REMOTE_KEY(0x12,3)
+				REMOTE_KEY(0x10,4)
+				REMOTE_KEY(0x17,5)
+				REMOTE_KEY(0x16,6)
+				REMOTE_KEY(0x14,7)
+				REMOTE_KEY(0x1b,8)
+				REMOTE_KEY(0x1a,9)
+				REMOTE_KEY(0x18,10)
+				REMOTE_KEY(0x11,14)
+				REMOTE_KEY(0x07,128)
+				REMOTE_KEY(0x40,121)
+				REMOTE_KEY(0x03,120)
+				REMOTE_KEY(0x01,123)
+				REMOTE_KEY(0x05,122)
+				REMOTE_KEY(0x44,119)
+				REMOTE_KEY(0x19,158)
+				REMOTE_KEY(0x04,104)
+				REMOTE_KEY(0x06,109)
+				REMOTE_KEY(0x5c,365)
+				REMOTE_KEY(0x1d,358)
+				REMOTE_KEY(0x0a,398)
+				REMOTE_KEY(0x4d,399)
+				REMOTE_KEY(0x0e,400)
+				REMOTE_KEY(0x0c,401)
+				REMOTE_KEY(0x1c,750)
+				REMOTE_KEY(0x08,751)
+				REMOTE_KEY(0x45,752)
+				REMOTE_KEY(0x1f,753)
+				REMOTE_KEY(0x4c,754)
+				REMOTE_KEY(0x49,755)
+				REMOTE_KEY(0x09,756)>;
 		};
 	};
 	aml_reboot{
-- 
2.7.4