diff --git a/arch/arm64/configs/vendor/quinvmauto_GKI.config b/arch/arm64/configs/vendor/quinvmauto_GKI.config
new file mode 100644
index 000000000000..9ac370bcddee
--- /dev/null
+++ b/arch/arm64/configs/vendor/quinvmauto_GKI.config
@@ -0,0 +1,18 @@
+CONFIG_QTI_QUIN_GVM=y
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_PROXY_CONSUMER=m
+CONFIG_REGULATOR_STUB=m
+CONFIG_TRIM_UNUSED_KSYMS=y
+CONFIG_UNUSED_KSYMS_WHITELIST="android/abi_gki_aarch64_qcom android/abi_gki_aarch64_qcom_internal"
+CONFIG_UNUSED_KSYMS_WHITELIST_ONLY=y
+CONFIG_PINCTRL_SM8150=m
+CONFIG_PINCTRL_SDMSHRIKE=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_CLK=m
+CONFIG_VIRTIO_REGULATOR=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_HEADERS_INSTALL=y
+CONFIG_UAPI_HEADER_TEST=y
diff --git a/arch/arm64/configs/vendor/quinvmauto_QGKI.config b/arch/arm64/configs/vendor/quinvmauto_QGKI.config
new file mode 100644
index 000000000000..bdfedce805ff
--- /dev/null
+++ b/arch/arm64/configs/vendor/quinvmauto_QGKI.config
@@ -0,0 +1,19 @@
+CONFIG_QGKI=y
+CONFIG_LOCALVERSION="-qgki"
+CONFIG_DEBUG_FS=y
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_REGULATOR_QTI_DEBUG=y
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_ZONE_DMA32 is not set
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+# CONFIG_ARM_PSCI_CPUIDLE is not set
+# CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_FAST_PROVE_TLB is not set
+# CONFIG_ZONE_DEVICE is not set
+# CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL is not set
+# CONFIG_CORESIGHT_CATU is not set
+# CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set
+# CONFIG_DEBUG_DMA_BUF_REF is not set
+# CONFIG_PAGE_OWNER_ENABLE_DEFAULT is not set
+# CONFIG_PAGE_EXTENSION_PAGE_FREE is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
diff --git a/arch/arm64/configs/vendor/quinvmauto_debug.config b/arch/arm64/configs/vendor/quinvmauto_debug.config
new file mode 100644
index 000000000000..6455ef5c4b7a
--- /dev/null
+++ b/arch/arm64/configs/vendor/quinvmauto_debug.config
@@ -0,0 +1,8 @@
+CONFIG_LOCALVERSION="-qgki-debug"
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_LKDTM=m
+CONFIG_ATOMIC64_SELFTEST=m
+CONFIG_RCU_TORTURE_TEST=m
diff --git a/drivers/clk/qcom/virtio_clk.c b/drivers/clk/qcom/virtio_clk.c
index c40208df7f91..68fbbd12efa5 100644
--- a/drivers/clk/qcom/virtio_clk.c
+++ b/drivers/clk/qcom/virtio_clk.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  */
 
 #define pr_fmt(fmt) "%s: " fmt, __func__
@@ -553,7 +553,7 @@ static int virtio_clk_probe(struct virtio_device *vdev)
 		}
 	}
 
-	ret = of_clk_add_hw_provider(vdev->dev.parent->of_node,
+	ret = devm_of_clk_add_hw_provider(vdev->dev.parent,
 			of_clk_hw_virtio_get, vclk);
 	if (ret) {
 		dev_err(&vdev->dev, "failed to add clock provider\n");
@@ -577,7 +577,6 @@ static int virtio_clk_probe(struct virtio_device *vdev)
 	return 0;
 
 err_rst_register:
-	of_clk_del_provider(vdev->dev.parent->of_node);
 err_clk_register:
 err_kcalloc:
 err_find_desc: