diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 45e58eefbffd..3c60dd7ecfcf 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -160,8 +160,8 @@
   cond_synchronize_rcu_expedited
   config_ep_by_speed
   configfs_register_group
-  configfs_unregister_group
   configfs_register_subsystem
+  configfs_unregister_group
   configfs_unregister_subsystem
   config_group_init
   config_group_init_type_name
@@ -290,6 +290,7 @@
   device_link_add
   device_match_fwnode
   device_match_name
+  device_match_of_node
   device_property_present
   device_property_read_string
   device_property_read_u16_array
@@ -1381,8 +1382,8 @@
   __rcu_read_unlock
   rcu_read_unlock_trace_special
   rcu_tasks_trace_qs_blkd
-  rcu_trc_cmpxchg_need_qs
   rcutorture_get_gp_data
+  rcu_trc_cmpxchg_need_qs
   rcu_unexpedite_gp
   rcuwait_wake_up
   rdev_get_drvdata
diff --git a/include/linux/gunyah/gh_mem_notifier.h b/include/linux/gunyah/gh_mem_notifier.h
index 92973e8d335e..dd483d21fa33 100644
--- a/include/linux/gunyah/gh_mem_notifier.h
+++ b/include/linux/gunyah/gh_mem_notifier.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- *
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef __GH_MEM_NOTIFIER_H
@@ -33,14 +33,14 @@ void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
 			       void *data);
 void gh_mem_notifier_unregister(void *cookie);
 #else
-static void *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
+static void __maybe_unused *gh_mem_notifier_register(enum gh_mem_notifier_tag tag,
 				      gh_mem_notifier_handler notif_handler,
 				      void *data)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-static void gh_mem_notifier_unregister(void *cookie)
+static void __maybe_unused gh_mem_notifier_unregister(void *cookie)
 {
 }
 #endif
diff --git a/include/linux/soc/qcom/llcc-qcom.h b/include/linux/soc/qcom/llcc-qcom.h
index 0a0ce7ab5abd..8eab6006c3bc 100644
--- a/include/linux/soc/qcom/llcc-qcom.h
+++ b/include/linux/soc/qcom/llcc-qcom.h
@@ -54,7 +54,7 @@
 #define LLCC_CAMEXP4     52
 #define LLCC_DISP_WB     53
 #define LLCC_DISP_1      54
-#define LLCC_VIDVSP      55
+#define LLCC_VIDVSP      64
 
 /**
  * llcc_slice_desc - Cache slice descriptor