diff --git a/arch/arm64/boot/dts/vendor/qcom/Makefile b/arch/arm64/boot/dts/vendor/qcom/Makefile
index 8c35251fdab9..8800baac035c 100644
--- a/arch/arm64/boot/dts/vendor/qcom/Makefile
+++ b/arch/arm64/boot/dts/vendor/qcom/Makefile
@@ -221,39 +221,9 @@ endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 dtbo-$(CONFIG_ARCH_YUPIK) +=    \
-	yupik-rumi-overlay.dtbo \
-	yupik-idp-overlay.dtbo \
-	yupik-atp-overlay.dtbo \
 	yupik-qrd-overlay.dtbo \
 	yupik-qrd-pm7250b-overlay.dtbo \
-	yupik-idps-amoled-overlay.dtbo \
-	yupik-idp-pm7250b-overlay.dtbo \
-	yupik-idp-hsp-overlay.dtbo \
-	yupikp-idp-overlay.dtbo \
-	yupikp-atp-overlay.dtbo \
 	yupikp-qrd-overlay.dtbo \
-	yupikp-idps-amoled-overlay.dtbo \
-	yupikp-idp-hsp-overlay.dtbo \
-	yupik-iot-idp-overlay.dtbo \
-	yupik-iot-idp-pm7250b-overlay.dtbo \
-	yupik-iot-qrd-overlay.dtbo \
-	yupik-iot-hsp-overlay.dtbo \
-	yupik-iot-hsp-pm7250b-overlay.dtbo \
-	katmai-hsp-overlay.dtbo \
-	katmai-hsp-pm7250b-overlay.dtbo \
-	katmai-fp2-hsp-overlay.dtbo \
-	katmai-fp2-hsp-pm7250b-overlay.dtbo \
-	yupik-iot-idps-amoled-overlay.dtbo \
-	yupikp-iot-idp-overlay.dtbo \
-	yupikp-iot-idp-pm7250b-overlay.dtbo \
-	yupikp-iot-qrd-overlay.dtbo \
-	yupikp-iot-hsp-overlay.dtbo \
-	yupikp-iot-hsp-pm7250b-overlay.dtbo \
-	katmaip-hsp-overlay.dtbo \
-	katmaip-hsp-pm7250b-overlay.dtbo \
-	katmaip-fp2-hsp-overlay.dtbo \
-	katmaip-fp2-hsp-pm7250b-overlay.dtbo \
-	yupikp-iot-idps-amoled-overlay.dtbo
 
 
 yupik-rumi-overlay.dtbo-base := yupik.dtb
diff --git a/drivers/gpu/msm/Kconfig b/drivers/gpu/msm/Kconfig
index fc01862f5641..540a49157d72 100644
--- a/drivers/gpu/msm/Kconfig
+++ b/drivers/gpu/msm/Kconfig
@@ -46,7 +46,7 @@ config QCOM_KGSL_CORESIGHT
 config QCOM_KGSL_IOCOHERENCY_DEFAULT
 	bool "Enable I/O coherency on cached GPU memory by default"
 	depends on QCOM_KGSL
-	default y if ARCH_LAHAINA
+	default y if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK)
 	help
 	 Say 'Y' here to enable I/O cache coherency by default on targets that
 	 support hardware I/O coherency. If enabled all cached GPU memory
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 33674ebaf5da..c7eb0745730c 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -909,13 +909,13 @@ config QTI_HW_MEMLAT
 
 config QTI_HW_NUM_AMU
 	int
-	default 7 if ARCH_LAHAINA && QTI_HW_MEMLAT
+	default 7 if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK) && QTI_HW_MEMLAT
 	default 5 if ARCH_HOLI && QTI_HW_MEMLAT
 	default 5
 
 config QTI_HW_NUM_PMU
 	int
-	default 6 if (ARCH_LAHAINA || ARCH_HOLI) && QTI_HW_MEMLAT
+	default 6 if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK || ARCH_HOLI) && QTI_HW_MEMLAT
 	default 6
 
 config QTI_HW_MEMLAT_SCMI_CLIENT
diff --git a/drivers/staging/qcacld-3.0/configs/default_defconfig b/drivers/staging/qcacld-3.0/configs/default_defconfig
index 45a7d792de57..23ff0bf1bf2e 100644
--- a/drivers/staging/qcacld-3.0/configs/default_defconfig
+++ b/drivers/staging/qcacld-3.0/configs/default_defconfig
@@ -51,7 +51,7 @@ ifeq ($(CONFIG_CNSS_QCA6490), y)
 	CONFIG_WLAN_TWT_SAP_STA_COUNT := y
 	CONFIG_WLAN_TWT_SAP_PDEV_COUNT := y
 	CONFIG_DUMP_REO_QUEUE_INFO_IN_DDR :=y
-	ifeq ($(CONFIG_ARCH_LAHAINA), y)
+	ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 		CONFIG_WLAN_TSF_UPLINK_DELAY := y
 	endif
 endif
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
 	CONFIG_HOST_WAKEUP_OVER_QMI := y
 	CONFIG_WLAN_FEATURE_WMI_DIAG_OVER_CE7 := y
 	CONFIG_WLAN_DP_FEATURE_DEFERRED_REO_QDESC_DESTROY := y
-	ifeq ($(CONFIG_ARCH_LAHAINA), y)
+	ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 		CONFIG_WLAN_TSF_UPLINK_DELAY := y
 	endif
 endif
@@ -302,7 +302,7 @@ endif
 CONFIG_WLAN_SYNC_TSF_TIMER := y
 endif
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 CONFIG_QCACLD_FEATURE_METERING := y
 CONFIG_WDI3_STATS_UPDATE := y
 ifeq ($(CONFIG_CNSS_QCA6490), y)
@@ -863,7 +863,7 @@ CONFIG_SMMU_S1_UNMAP := y
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 CONFIG_SMMU_S1_UNMAP := y
@@ -1203,7 +1203,7 @@ CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
 endif
 
 ifeq ($(CONFIG_CNSS_QCA6490), y)
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
 CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2 := y
 CONFIG_DP_RX_UDP_OVER_PEER_ROAM := y
diff --git a/drivers/staging/qcacld-3.0/configs/wear_defconfig b/drivers/staging/qcacld-3.0/configs/wear_defconfig
index 023893853120..11014ea2d076 100644
--- a/drivers/staging/qcacld-3.0/configs/wear_defconfig
+++ b/drivers/staging/qcacld-3.0/configs/wear_defconfig
@@ -291,7 +291,7 @@ endif
 CONFIG_WLAN_SYNC_TSF_TIMER := y
 endif
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 CONFIG_QCACLD_FEATURE_METERING := y
 CONFIG_WDI3_STATS_UPDATE := y
 ifeq ($(CONFIG_CNSS_QCA6490), y)
@@ -852,7 +852,7 @@ CONFIG_SMMU_S1_UNMAP := y
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 CONFIG_SMMU_S1_UNMAP := y
@@ -1198,7 +1198,7 @@ CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
 endif
 
 ifeq ($(CONFIG_CNSS_QCA6490), y)
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
 CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2 := y
 endif
diff --git a/techpack/audio/Makefile b/techpack/audio/Makefile
index 73ad150b67ec..f7778699c469 100644
--- a/techpack/audio/Makefile
+++ b/techpack/audio/Makefile
@@ -18,7 +18,7 @@ endif
 ifeq ($(CONFIG_ARCH_KONA), y)
 include $(srctree)/techpack/audio/config/konaauto.conf
 endif
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 include $(srctree)/techpack/audio/config/lahainaauto.conf
 endif
 ifeq ($(CONFIG_ARCH_HOLI), y)
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_ARCH_KONA), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/konaautoconf.h
 endif
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/lahainaautoconf.h
 endif
diff --git a/techpack/audio/asoc/codecs/wsa883x/Kbuild b/techpack/audio/asoc/codecs/wsa883x/Kbuild
index dce7e0531da4..786d709bed83 100644
--- a/techpack/audio/asoc/codecs/wsa883x/Kbuild
+++ b/techpack/audio/asoc/codecs/wsa883x/Kbuild
@@ -14,7 +14,7 @@ ifeq ($(KERNEL_BUILD), 1)
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_LAHAINA), y)
+	ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 		include $(AUDIO_ROOT)/config/lahainaauto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/lahainaautoconf.h
diff --git a/techpack/dataipa/drivers/platform/msm/Makefile b/techpack/dataipa/drivers/platform/msm/Makefile
index 66b0b0045ea5..8183e086a0cf 100644
--- a/techpack/dataipa/drivers/platform/msm/Makefile
+++ b/techpack/dataipa/drivers/platform/msm/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa.h
 ifeq ($(CONFIG_QGKI),y)
 include $(srctree)/techpack/dataipa/config/dataipa_QGKI.conf
diff --git a/techpack/display/Makefile b/techpack/display/Makefile
index d51633c64222..06ceed273b42 100644
--- a/techpack/display/Makefile
+++ b/techpack/display/Makefile
@@ -11,7 +11,7 @@ LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_konadispconf.
      endif
 endif
 
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
      ifeq ($(CONFIG_QGKI), y)
 		include $(srctree)/techpack/display/config/lahainadisp.conf
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h
diff --git a/techpack/video/Makefile b/techpack/video/Makefile
index 6216c2266d9b..3e0ab2ff8b59 100644
--- a/techpack/video/Makefile
+++ b/techpack/video/Makefile
@@ -2,7 +2,7 @@
 
 # auto-detect subdirs
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
-ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
 include $(srctree)/techpack/video/config/konavid.conf
 LINUXINCLUDE    += -include $(srctree)/techpack/video/config/konavidconf.h
 endif