diff --git a/AGNi_version.sh b/AGNi_version.sh
index 92e2fc8811db6..759b3a6f3dfae 100755
--- a/AGNi_version.sh
+++ b/AGNi_version.sh
@@ -4,9 +4,9 @@
 KERNELDIR=`readlink -f .`
 
 export AGNI_VERSION_PREFIX="stable"
-export AGNI_VERSION="v15.7"
-sed -i 's/v15.6_stable-EAS/v15.7_stable-EAS/' $KERNELDIR/arch/arm64/configs/agni_*
-sed -i 's/ini_set("rom_version",	"v15.6_stable");/ini_set("rom_version",	"v15.7_stable");/' $KERNELDIR/anykernel3/META-INF/com/google/android/aroma-config
+export AGNI_VERSION="v15.8"
+sed -i 's/v15.7_stable-EAS/v15.8_stable-EAS/' $KERNELDIR/arch/arm64/configs/agni_*
+sed -i 's/ini_set("rom_version",	"v15.7_stable");/ini_set("rom_version",	"v15.8_stable");/' $KERNELDIR/anykernel3/META-INF/com/google/android/aroma-config
 
 echo "	AGNi Version info loaded."
 
diff --git a/anykernel3/META-INF/com/google/android/aroma-config b/anykernel3/META-INF/com/google/android/aroma-config
index 19a7bb124e2ee..5de56c1d8d7df 100644
--- a/anykernel3/META-INF/com/google/android/aroma-config
+++ b/anykernel3/META-INF/com/google/android/aroma-config
@@ -26,10 +26,10 @@
 
 # Initializing Rom Information
 ini_set("rom_name",		"AGNi EAS Kernel");
-ini_set("rom_version",	"v15.7 stable");
+ini_set("rom_version",	"v15.8 stable");
 ini_set("rom_author",	"psndna88@xda");
 ini_set("rom_device",	"SETDEVICETYPE");
-ini_set("rom_date",		"December, 24, 2021");
+ini_set("rom_date",		"December, 30, 2021");
 
 # Show Simple Splash
 splash(
@@ -195,6 +195,12 @@ selectbox(
     "Fake-Enforcing",	"Default: Needed for Android 11+ & Ported roms that have boot problems.",   1 	#-- selected.0 = 2
 );
 
+selectbox(
+    "Haptics Mode for AOSP","<@center><b>\nApplicable only for some AOSP roms</b>\n\n</@>","@install","aosphaptics.prop",
+    "Normal Haptics",	"Use for all MIUI roms or most AOSP roms",	1,	#-- selected.0 = 1
+    "QTI haptics",		"Needed for some fancy AOSP roms.",  		0 	#-- selected.0 = 2
+);
+
 setvar("retstatus",
   install(
 	#-- Title
diff --git a/anykernel3/META-INF/com/google/android/update-binary-installer b/anykernel3/META-INF/com/google/android/update-binary-installer
index 092c58a23eafd..d1a6b57630d3d 100644
--- a/anykernel3/META-INF/com/google/android/update-binary-installer
+++ b/anykernel3/META-INF/com/google/android/update-binary-installer
@@ -572,6 +572,12 @@ if [ "`$BB grep selected.0=2 /tmp/aroma-data/sel.prop`" ]; then
 else
 	$BB echo "0" > $AKHOME/SEL_MODE_FAKE;
 fi;
+# QTI haptics mode
+if [ "`$BB grep selected.0=2 /tmp/aroma-data/aosphaptics.prop`" ]; then
+	$BB echo "1" > $AKHOME/QTI_HAPTICS;
+else
+	$BB echo "0" > $AKHOME/QTI_HAPTICS;
+fi;
 
 ### AGNi: Camera Libs type detection
 DEVICE_NATIVE_MIUIQ="NO";
diff --git a/anykernel3/anykernel.sh b/anykernel3/anykernel.sh
index b98c8cc8bfcc0..47a818d92c5f3 100755
--- a/anykernel3/anykernel.sh
+++ b/anykernel3/anykernel.sh
@@ -88,6 +88,7 @@ patch_cmdline wiredbtnaltmode wiredbtnaltmode=0;
 patch_cmdline ledmode ledmode=0;
 patch_cmdline losxattr losxattr=0;
 patch_cmdline selfake selfake=0;
+patch_cmdline qtihaptics qtihaptics=0;
 write_boot;
 ## end install
 
diff --git a/anykernel3/tools/ak3-core.sh b/anykernel3/tools/ak3-core.sh
index b252cd8feeb9e..c069317ad014e 100755
--- a/anykernel3/tools/ak3-core.sh
+++ b/anykernel3/tools/ak3-core.sh
@@ -611,19 +611,13 @@ patch_fstab() {
 
 # patch_cmdline <cmdline entry name> <replacement string>
 patch_cmdline() {
-  local cmdfile cmdtmp match osver miui srgblock cpuoc soundmod wiredbtnmode userled sdfat_xattr_los selselection;
+  local cmdfile cmdtmp match osver miui srgblock cpuoc soundmod wiredbtnmode userled sdfat_xattr_los selselection haptics_selection;
   if [ -f "$split_img/cmdline.txt" ]; then
     cmdfile=$split_img/cmdline.txt;
   else
     cmdfile=$home/cmdtmp;
     grep "^cmdline=" $split_img/header | cut -d= -f2- > $cmdfile;
   fi;
-  sed -i 's/androidboot.version/android.ver/' $cmdfile;
-  sed -i 's/androidboot.miui/miui/' $cmdfile;
-  sed -i 's/androidboot.srgblock/srgblock/' $cmdfile;
-  sed -i 's/androidboot.cpuoc/cpuoc/' $cmdfile;
-  sed -i 's/androidboot.agnisoundmod/agnisoundmod/' $cmdfile;
-  sed -i 's/androidboot.wiredbtnaltmode/wiredbtnaltmode/' $cmdfile;
   if ! grep -q "$1" $cmdfile; then
     cmdtmp=$(cat $cmdfile);
     echo "$cmdtmp $2" > $cmdfile;
@@ -687,6 +681,11 @@ patch_cmdline() {
   if [ "$selselection" == "1" ]; then
 	sed -i 's/selfake=0/selfake=1/' $cmdfile;
   fi;
+  # QTI haptics mode
+  haptics_selection="`cat $home/QTI_HAPTICS`";
+  if [ "$haptics_selection" == "1" ]; then
+	sed -i 's/qtihaptics=0/qtihaptics=1/' $cmdfile;
+  fi;
 
   if [ -f "$home/cmdtmp" ]; then
     sed -i "s|^cmdline=.*|cmdline=$(cat $cmdfile)|" $split_img/header;
diff --git a/arch/arm64/configs/agni_jasmine-MIUI-Q_defconfig b/arch/arm64/configs/agni_jasmine-MIUI-Q_defconfig
index 980aa42debc35..03a633b13c40a 100644
--- a/arch/arm64/configs/agni_jasmine-MIUI-Q_defconfig
+++ b/arch/arm64/configs/agni_jasmine-MIUI-Q_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.7_stable-EAS-jasmine"
+CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.8_stable-EAS-jasmine"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4017,7 +4017,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_jasmine-oldcam_defconfig b/arch/arm64/configs/agni_jasmine-oldcam_defconfig
index 753f0bd513711..271cf21f3bdca 100644
--- a/arch/arm64/configs/agni_jasmine-oldcam_defconfig
+++ b/arch/arm64/configs/agni_jasmine-oldcam_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_OldCam-v15.7_stable-EAS-jasmine"
+CONFIG_LOCALVERSION="_AGNi_OldCam-v15.8_stable-EAS-jasmine"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4017,7 +4017,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_jasmine_defconfig b/arch/arm64/configs/agni_jasmine_defconfig
index d601f4b2a35ad..e5953cc30a30a 100644
--- a/arch/arm64/configs/agni_jasmine_defconfig
+++ b/arch/arm64/configs/agni_jasmine_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_NewCam-v15.7_stable-EAS-jasmine"
+CONFIG_LOCALVERSION="_AGNi_NewCam-v15.8_stable-EAS-jasmine"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4017,7 +4017,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_lavender-MIUI-Q_defconfig b/arch/arm64/configs/agni_lavender-MIUI-Q_defconfig
index d033c30fa742b..ca94f2aaf52d9 100644
--- a/arch/arm64/configs/agni_lavender-MIUI-Q_defconfig
+++ b/arch/arm64/configs/agni_lavender-MIUI-Q_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.7_stable-EAS-lavender"
+CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.8_stable-EAS-lavender"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4023,7 +4023,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_lavender-oldcam_defconfig b/arch/arm64/configs/agni_lavender-oldcam_defconfig
index 7a9c4d8c660cd..60242569ff89a 100644
--- a/arch/arm64/configs/agni_lavender-oldcam_defconfig
+++ b/arch/arm64/configs/agni_lavender-oldcam_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_OldCam-v15.7_stable-EAS-lavender"
+CONFIG_LOCALVERSION="_AGNi_OldCam-v15.8_stable-EAS-lavender"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4023,7 +4023,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_lavender_defconfig b/arch/arm64/configs/agni_lavender_defconfig
index cfc5d9d5b4722..570ee843640b9 100644
--- a/arch/arm64/configs/agni_lavender_defconfig
+++ b/arch/arm64/configs/agni_lavender_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_NewCam-v15.7_stable-EAS-lavender"
+CONFIG_LOCALVERSION="_AGNi_NewCam-v15.8_stable-EAS-lavender"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4023,7 +4023,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_tulip-MIUI-Q_defconfig b/arch/arm64/configs/agni_tulip-MIUI-Q_defconfig
index dba2494f99391..57a46a9be235c 100644
--- a/arch/arm64/configs/agni_tulip-MIUI-Q_defconfig
+++ b/arch/arm64/configs/agni_tulip-MIUI-Q_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.7_stable-EAS-tulip"
+CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.8_stable-EAS-tulip"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4014,7 +4014,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_tulip-oldcam_defconfig b/arch/arm64/configs/agni_tulip-oldcam_defconfig
index 5eb4a0fa3b490..9b96152b8a3a9 100644
--- a/arch/arm64/configs/agni_tulip-oldcam_defconfig
+++ b/arch/arm64/configs/agni_tulip-oldcam_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_OldCam-v15.7_stable-EAS-tulip"
+CONFIG_LOCALVERSION="_AGNi_OldCam-v15.8_stable-EAS-tulip"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4014,7 +4014,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_tulip_defconfig b/arch/arm64/configs/agni_tulip_defconfig
index 7531d38086bc8..7463590f39385 100644
--- a/arch/arm64/configs/agni_tulip_defconfig
+++ b/arch/arm64/configs/agni_tulip_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_NewCam-v15.7_stable-EAS-tulip"
+CONFIG_LOCALVERSION="_AGNi_NewCam-v15.8_stable-EAS-tulip"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4014,7 +4014,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_wayne-MIUI-Q_defconfig b/arch/arm64/configs/agni_wayne-MIUI-Q_defconfig
index 740e30a9607af..9358f0de5317e 100644
--- a/arch/arm64/configs/agni_wayne-MIUI-Q_defconfig
+++ b/arch/arm64/configs/agni_wayne-MIUI-Q_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.7_stable-EAS-wayne"
+CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.8_stable-EAS-wayne"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4013,7 +4013,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_wayne-oldcam_defconfig b/arch/arm64/configs/agni_wayne-oldcam_defconfig
index 0e7d66b65e716..dfa5e0b90d585 100644
--- a/arch/arm64/configs/agni_wayne-oldcam_defconfig
+++ b/arch/arm64/configs/agni_wayne-oldcam_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_OldCam-v15.7_stable-EAS-wayne"
+CONFIG_LOCALVERSION="_AGNi_OldCam-v15.8_stable-EAS-wayne"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4013,7 +4013,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_wayne_defconfig b/arch/arm64/configs/agni_wayne_defconfig
index db25b7f025ad6..50a9789866769 100644
--- a/arch/arm64/configs/agni_wayne_defconfig
+++ b/arch/arm64/configs/agni_wayne_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_NewCam-v15.7_stable-EAS-wayne"
+CONFIG_LOCALVERSION="_AGNi_NewCam-v15.8_stable-EAS-wayne"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4013,7 +4013,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_whyred-MIUI-Q_defconfig b/arch/arm64/configs/agni_whyred-MIUI-Q_defconfig
index b38e6fb10091c..39ce99602af3b 100644
--- a/arch/arm64/configs/agni_whyred-MIUI-Q_defconfig
+++ b/arch/arm64/configs/agni_whyred-MIUI-Q_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.7_stable-EAS-whyred"
+CONFIG_LOCALVERSION="_AGNi_MIUIQcam-v15.8_stable-EAS-whyred"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4019,7 +4019,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_whyred-oldcam_defconfig b/arch/arm64/configs/agni_whyred-oldcam_defconfig
index f7bf40264d40e..dc95513dd7952 100644
--- a/arch/arm64/configs/agni_whyred-oldcam_defconfig
+++ b/arch/arm64/configs/agni_whyred-oldcam_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_OldCam-v15.7_stable-EAS-whyred"
+CONFIG_LOCALVERSION="_AGNi_OldCam-v15.8_stable-EAS-whyred"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4019,7 +4019,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers
diff --git a/arch/arm64/configs/agni_whyred_defconfig b/arch/arm64/configs/agni_whyred_defconfig
index 7f8a9b7e8c32f..50e552b2ed469 100644
--- a/arch/arm64/configs/agni_whyred_defconfig
+++ b/arch/arm64/configs/agni_whyred_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.296 Kernel Configuration
+# Linux/arm64 4.4.297 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -55,7 +55,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_AGNi_NewCam-v15.7_stable-EAS-whyred"
+CONFIG_LOCALVERSION="_AGNi_NewCam-v15.8_stable-EAS-whyred"
 # CONFIG_ROG_SUPPORT is not set
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -4019,7 +4019,7 @@ CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH_V2=y
 CONFIG_LEDS_QPNP_WLED=y
 CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_QPNP_HAPTICS=y
+# CONFIG_LEDS_QPNP_HAPTICS is not set
 
 #
 # LED Triggers