diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-t5.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-t5.dtsi
index c7acad23b4d6..6e36f4199236 100755
--- a/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-t5.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-qrd-skuk-t5.dtsi
@@ -442,7 +442,7 @@
 			label = "home";
 			gpios = <&tlmm 21 0x1>;
 			linux,input-type = <1>;
-			linux,code = <125>;
+			linux,code = <464>;
 			debounce-interval = <15>;
 		};
 
@@ -474,7 +474,7 @@
 			label = "fn_l";
 			gpios = <&tlmm 33 0x1>;
 			linux,input-type = <1>;
-			linux,code = <464>;
+			linux,code = <125>;
 			debounce-interval = <15>;
 		};
 
@@ -482,7 +482,7 @@
 			label = "fn_r";
 			gpios = <&tlmm 32 0x1>;
 			linux,input-type = <1>;
-			linux,code = <464>;
+			linux,code = <125>;
 			debounce-interval = <15>;
 		};
 	};
diff --git a/debian/kernel-info.mk b/debian/kernel-info.mk
index 98f7bfac0375..58ec759be7ee 100644
--- a/debian/kernel-info.mk
+++ b/debian/kernel-info.mk
@@ -1,7 +1,7 @@
 # Info obtained from: https://gitlab.com/ubports/community-ports/android9/fxtec-pro1/fxtec-pro1/-/blob/master/deviceinfo
 
 VARIANT = android
-KERNEL_BASE_VERSION = 4.4-0
+KERNEL_BASE_VERSION = 4.4-0+kabouik
 KERNEL_BOOTIMAGE_CMDLINE = console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc1b0000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=2048 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 console=tty0 systemd.unified_cgroup_hierarchy=0 droidian.lvm.prefer
 DEVICE_VENDOR = fxtec
 DEVICE_MODEL = pro1
diff --git a/drivers/input/keyboard/qx1000.c b/drivers/input/keyboard/qx1000.c
index 9200e04d3dff..d149dff4267b 100755
--- a/drivers/input/keyboard/qx1000.c
+++ b/drivers/input/keyboard/qx1000.c
@@ -265,7 +265,7 @@ static const u16 qwerty_keys[AW9523_NR_KEYS] = {
 	KEY_LEFT,	KEY_G,		KEY_V,		KEY_6,
 	KEY_RIGHT,	KEY_DELETE,	KEY_T,		KEY_DOT,
 	/* 24..31 */
-	KEY_RIGHTALT,	KEY_A,		KEY_RIGHTBRACE,	KEY_RESERVED,
+	KEY_SLASH,	KEY_A,		KEY_RIGHTBRACE,	KEY_RESERVED,
 	KEY_P,		KEY_MINUS,	KEY_Q,		KEY_L,
 	/* 32..39 */
 	KEY_BACKSPACE,	KEY_D,		KEY_X,		KEY_RESERVED,
@@ -282,29 +282,29 @@ static const u16 qwerty_keys[AW9523_NR_KEYS] = {
 };
 static const u16 qwerty_fn_keys[AW9523_NR_KEYS] = {
 	/* 0..7 */
-	KEY_RESERVED,			KEY_H,				KEY_B,				KEY_7 | KF_SHIFT,
-	KEY_PAGEUP,			KEY_ENTER,			KEY_Y,				KEY_COMMA | KF_SHIFT,
+	KEY_RESERVED,			KEY_H,				KEY_B,				KEY_F7,
+	KEY_PAGEUP,			KEY_MENU,			KEY_Y,				KEY_VOLUMEDOWN,
 	/* 8..15 */
-	KEY_3 | KF_SHIFT,		KEY_S,				KEY_Z,				KEY_M,
-	KEY_I,				KEY_9 | KF_SHIFT,		KEY_W,				KEY_J,
+	KEY_F3,				KEY_S,				KEY_Z,				KEY_M,
+	KEY_I,				KEY_F9,				KEY_W,				KEY_J,
 	/* 16..23 */
-	KEY_HOME,			KEY_G,				KEY_V,				KEY_6 | KF_SHIFT,
-	KEY_END,			KEY_INSERT,			KEY_T,				KEY_DOT | KF_SHIFT,
+	KEY_HOME,			KEY_G,				KEY_V,				KEY_F6,
+	KEY_END,			KEY_INSERT,			KEY_T,				KEY_VOLUMEUP,
 	/* 24..31 */
-	KEY_RIGHTALT,			KEY_A,				KEY_RIGHTBRACE | KF_SHIFT,	KEY_RESERVED,
-	KEY_SLASH,			KEY_MINUS | KF_SHIFT,		KEY_Q,				KEY_SLASH | KF_SHIFT,
+	KEY_RIGHTALT,			KEY_A,				KEY_BRIGHTNESSUP,		KEY_RESERVED,
+	KEY_SLASH,			KEY_F11,			KEY_Q,				KEY_SLASH | KF_SHIFT,
 	/* 32..39 */
-	KEY_BACKSPACE,			KEY_D,				KEY_X,				KEY_RESERVED,
-	KEY_SEMICOLON | KF_SHIFT,	KEY_EQUAL | KF_SHIFT,		KEY_E,				KEY_APOSTROPHE | KF_SHIFT,
+	KEY_SCROLLLOCK,			KEY_D,				KEY_X,				KEY_RESERVED,
+	KEY_PLAYPAUSE,			KEY_F12,			KEY_E,				KEY_MUTE,
 	/* 40..47 */
-	KEY_CAPSLOCK,			KEY_BACKSLASH | KF_SHIFT,	KEY_LEFTBRACE | KF_SHIFT,	KEY_PAGEDOWN,
-	KEY_O,				KEY_0 | KF_SHIFT,		KEY_GRAVE | KF_SHIFT,		KEY_K,
+	KEY_CAPSLOCK,			KEY_WLAN,			KEY_BRIGHTNESSDOWN,		KEY_PAGEDOWN,
+	KEY_O,				KEY_F10,			KEY_BLUETOOTH,			KEY_K,
 	/* 48..55 */
 	KEY_WWW,			KEY_F,				KEY_C,				KEY_N,
-	KEY_U,				KEY_8 | KF_SHIFT,		KEY_R,				KEY_5 | KF_SHIFT,
+	KEY_U,				KEY_F8,				KEY_R,				KEY_F5,
 	/* 56..63 */
-	KEY_BACK,			KEY_1 | KF_SHIFT,		KEY_RESERVED,			KEY_RESERVED,
-	KEY_2 | KF_SHIFT,		KEY_4 | KF_SHIFT,		KEY_TAB,			KEY_RESERVED,
+	KEY_BACK,			KEY_F1,				KEY_RESERVED,			KEY_RESERVED,
+	KEY_F2,				KEY_F4,				KEY_TAB,			KEY_RESERVED,
 };
 
 static const u16 qwertz_keys[AW9523_NR_KEYS] = {