diff --git a/include/soc/internal.h b/include/soc/internal.h
index 2bc065526d..6e646f606e 120000
--- a/include/soc/internal.h
+++ b/include/soc/internal.h
@@ -1 +1 @@
-../../../../drivers/base/regmap/internal.h
\ No newline at end of file
+../../../../../../kernel_platform/common/drivers/base/regmap/internal.h
\ No newline at end of file
diff --git a/soc/Kbuild b/soc/Kbuild
index a04022f445..a0b5c8f076 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -41,6 +41,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/konaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/konaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_WAIPIO), y)
+		include $(AUDIO_ROOT)/config/waipioauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/waipioautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export
@@ -176,9 +180,6 @@ CDEFINES +=	-DANI_LITTLE_BYTE_ENDIAN \
 
 KBUILD_CPPFLAGS += $(CDEFINES)
 
-ifeq ($(KERNEL_BUILD), 0)
-KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
-endif
 
 # Currently, for versions of gcc which support it, the kernel Makefile
 # is disabling the maybe-uninitialized warning.  Re-enable it for the
diff --git a/soc/core.h b/soc/core.h
index 8a2fa90df8..1693681817 120000
--- a/soc/core.h
+++ b/soc/core.h
@@ -1 +1 @@
-../../../drivers/pinctrl/core.h
\ No newline at end of file
+../../../../../kernel_platform/common/drivers/pinctrl/core.h
\ No newline at end of file
diff --git a/soc/pinctrl-utils.h b/soc/pinctrl-utils.h
index 9aab5f24bd..164bf0aa4b 120000
--- a/soc/pinctrl-utils.h
+++ b/soc/pinctrl-utils.h
@@ -1 +1 @@
-../../../drivers/pinctrl/pinctrl-utils.h
\ No newline at end of file
+../../../../../kernel_platform/common/drivers/pinctrl/pinctrl-utils.h
\ No newline at end of file
diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c
index 0a9e55de28..b28e6e1d29 100644
--- a/soc/swr-mstr-ctrl.c
+++ b/soc/swr-mstr-ctrl.c
@@ -82,6 +82,8 @@
 
 #define SWR_OVERFLOW_RETRY_COUNT 30
 
+#define CPU_IDLE_LATENCY 10
+
 /* pm runtime auto suspend timer in msecs */
 static int auto_suspend_timer = 500;
 module_param(auto_suspend_timer, int, 0664);
@@ -2795,8 +2797,7 @@ static int swrm_probe(struct platform_device *pdev)
 	swrm->wlock_holders = 0;
 	swrm->pm_state = SWRM_PM_SLEEPABLE;
 	init_waitqueue_head(&swrm->pm_wq);
-	pm_qos_add_request(&swrm->pm_qos_req,
-			   PM_QOS_CPU_DMA_LATENCY,
+	cpu_latency_qos_add_request(&swrm->pm_qos_req,
 			   PM_QOS_DEFAULT_VALUE);
 
 	for (i = 0 ; i < SWR_MSTR_PORT_LEN; i++)
@@ -2984,7 +2985,7 @@ err_irq_fail:
 	mutex_destroy(&swrm->iolock);
 	mutex_destroy(&swrm->clklock);
 	mutex_destroy(&swrm->pm_lock);
-	pm_qos_remove_request(&swrm->pm_qos_req);
+	cpu_latency_qos_remove_request(&swrm->pm_qos_req);
 
 err_pdata_fail:
 err_memory_fail:
@@ -3022,7 +3023,7 @@ static int swrm_remove(struct platform_device *pdev)
 	mutex_destroy(&swrm->clklock);
 	mutex_destroy(&swrm->force_down_lock);
 	mutex_destroy(&swrm->pm_lock);
-	pm_qos_remove_request(&swrm->pm_qos_req);
+	cpu_latency_qos_remove_request(&swrm->pm_qos_req);
 	devm_kfree(&pdev->dev, swrm);
 	return 0;
 }
@@ -3717,8 +3718,8 @@ static bool swrm_lock_sleep(struct swr_mstr_ctrl *swrm)
 	mutex_lock(&swrm->pm_lock);
 	if (swrm->wlock_holders++ == 0) {
 		dev_dbg(swrm->dev, "%s: holding wake lock\n", __func__);
-		pm_qos_update_request(&swrm->pm_qos_req,
-					  msm_cpuidle_get_deep_idle_latency());
+		cpu_latency_qos_update_request(&swrm->pm_qos_req,
+					 CPU_IDLE_LATENCY);
 		pm_stay_awake(swrm->dev);
 	}
 	mutex_unlock(&swrm->pm_lock);
@@ -3753,8 +3754,8 @@ static void swrm_unlock_sleep(struct swr_mstr_ctrl *swrm)
 		 */
 		if (likely(swrm->pm_state == SWRM_PM_AWAKE))
 			swrm->pm_state = SWRM_PM_SLEEPABLE;
-		pm_qos_update_request(&swrm->pm_qos_req,
-				  PM_QOS_DEFAULT_VALUE);
+		cpu_latency_qos_update_request(&swrm->pm_qos_req,
+				PM_QOS_DEFAULT_VALUE);
 		pm_relax(swrm->dev);
 	}
 	mutex_unlock(&swrm->pm_lock);
diff --git a/soc/swr-mstr-ctrl.h b/soc/swr-mstr-ctrl.h
index 8664ec637b..874b97a589 100644
--- a/soc/swr-mstr-ctrl.h
+++ b/soc/swr-mstr-ctrl.h
@@ -8,7 +8,7 @@
 #include <linux/module.h>
 #include <soc/swr-wcd.h>
 #include <linux/pm_qos.h>
-#include <soc/qcom/pm.h>
+#include <linux/pm.h>
 #include <soc/swr-common.h>
 
 #ifdef CONFIG_DEBUG_FS