diff --git a/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dts b/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dts
index 99342867dcbb..fc7e93ba2874 100644
--- a/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dts
+++ b/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dts
@@ -21,3 +21,20 @@
 	qcom,pmic-name = "PM8195";
 	qcom,board-id = <0x1000002 0>;
 };
+
+&soc {
+	sde_kms_hyp1: qcom,sde_kms_hyp@ae10000 {
+		compatible = "qcom,sde-kms-hyp";
+		qcom,client-id = "7815";
+	};
+
+	sde_kms_hyp2: qcom,sde_kms_hyp@ae20000 {
+		compatible = "qcom,sde-kms-hyp";
+		qcom,client-id = "7818";
+	};
+
+	sde_kms_hyp3: qcom,sde_kms_hyp@ae30000 {
+		compatible = "qcom,sde-kms-hyp";
+		qcom,client-id = "7819";
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dtsi b/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dtsi
index d2eceb74af93..98522181a703 100644
--- a/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8195-vm-lv-lxc.dtsi
@@ -19,6 +19,7 @@
 		};
 	};
 
+	/delete-node/ rename_blk;
 };
 
 &hab {
diff --git a/arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig b/arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig
index c1281e9efb76..1aeade82c3bc 100644
--- a/arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig
+++ b/arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig
@@ -457,7 +457,6 @@ CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_BOOT_STATS=y
 CONFIG_MSM_BOOT_TIME_MARKER=y
-CONFIG_QCOM_SECURE_BUFFER=y
 CONFIG_QCOM_GLINK=y
 CONFIG_MEM_SHARE_QMI_SERVICE=y
 CONFIG_MSM_HAB=y
diff --git a/arch/arm64/configs/vendor/qti-quin-gvm_defconfig b/arch/arm64/configs/vendor/qti-quin-gvm_defconfig
index 22a036e1a74e..050f57e87abc 100644
--- a/arch/arm64/configs/vendor/qti-quin-gvm_defconfig
+++ b/arch/arm64/configs/vendor/qti-quin-gvm_defconfig
@@ -468,7 +468,6 @@ CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_BOOT_STATS=y
 CONFIG_MSM_BOOT_TIME_MARKER=y
-CONFIG_QCOM_SECURE_BUFFER=y
 CONFIG_QCOM_GLINK=y
 CONFIG_MEM_SHARE_QMI_SERVICE=y
 CONFIG_MSM_HAB=y
diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c
index c25ab8bc8b4b..bfdbc9c640ff 100644
--- a/drivers/android/binderfs.c
+++ b/drivers/android/binderfs.c
@@ -448,6 +448,7 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
 	inode->i_uid = info->root_uid;
 	inode->i_gid = info->root_gid;
 
+	refcount_set(&device->ref, 1);
 	device->binderfs_inode = inode;
 	device->miscdev.minor = minor;
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 21f5c139988d..fe4e4bfd88d6 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -870,7 +870,6 @@ static int selinux_set_mnt_opts(struct super_block *sb,
 	    !strcmp(sb->s_type->name, "tracefs") ||
 	    !strcmp(sb->s_type->name, "sysfs") ||
 	    !strcmp(sb->s_type->name, "pstore") ||
-	    !strcmp(sb->s_type->name, "binder") ||
 	    !strcmp(sb->s_type->name, "cgroup") ||
 	    !strcmp(sb->s_type->name, "cgroup2"))
 		sbsec->flags |= SE_SBGENFS;