diff --git a/config/lahainadataipa.h b/config/dataipa.h
similarity index 100%
rename from config/lahainadataipa.h
rename to config/dataipa.h
diff --git a/config/lahainadataipa_GKI.conf b/config/dataipa_GKI.conf
similarity index 100%
rename from config/lahainadataipa_GKI.conf
rename to config/dataipa_GKI.conf
diff --git a/config/lahainadataipa_QGKI.conf b/config/dataipa_QGKI.conf
similarity index 100%
rename from config/lahainadataipa_QGKI.conf
rename to config/dataipa_QGKI.conf
diff --git a/config/lahainadataipa_debug.conf b/config/dataipa_debug.conf
similarity index 100%
rename from config/lahainadataipa_debug.conf
rename to config/dataipa_debug.conf
diff --git a/config/lahainadataipa_debug.h b/config/dataipa_debug.h
similarity index 100%
rename from config/lahainadataipa_debug.h
rename to config/dataipa_debug.h
diff --git a/drivers/platform/msm/Makefile b/drivers/platform/msm/Makefile
index 95b07e1347e4..f6c9f5c191dd 100644
--- a/drivers/platform/msm/Makefile
+++ b/drivers/platform/msm/Makefile
@@ -1,15 +1,28 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
-LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/lahainadataipa.h
+LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa.h
 ifeq ($(CONFIG_QGKI),y)
-include $(srctree)/techpack/dataipa/config/lahainadataipa_QGKI.conf
+include $(srctree)/techpack/dataipa/config/dataipa_QGKI.conf
 ifeq ($(CONFIG_DEBUG_KERNEL), y)
-include $(srctree)/techpack/dataipa/config/lahainadataipa_debug.conf
-LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/lahainadataipa_debug.h
+include $(srctree)/techpack/dataipa/config/dataipa_debug.conf
+LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa_debug.h
 endif
 else
-include $(srctree)/techpack/dataipa/config/lahainadataipa_GKI.conf
+include $(srctree)/techpack/dataipa/config/dataipa_GKI.conf
+endif
+endif
+
+ifeq ($(CONFIG_ARCH_HOLI), y)
+LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa.h
+ifeq ($(CONFIG_QGKI),y)
+include $(srctree)/techpack/dataipa/config/dataipa_QGKI.conf
+ifeq ($(CONFIG_DEBUG_KERNEL), y)
+include $(srctree)/techpack/dataipa/config/dataipa_debug.conf
+LINUXINCLUDE    += -include $(srctree)/techpack/dataipa/config/dataipa_debug.h
+endif
+else
+include $(srctree)/techpack/dataipa/config/dataipa_GKI.conf
 endif
 endif