diff --git a/Makefile b/Makefile
index 303e0bf6c43e..6806ae85efea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-#obj-$(CONFIG_GSI) += gsi/
-obj-n += gsi/
-#obj-$(CONFIG_IPA3) += ipa/
-obj-n += ipa/
+
+obj-n += drivers/platform/msm/
+#obj-$(CONFIG_ARCH_QCOM) += drivers/platform/msm
diff --git a/drivers/platform/msm/Makefile b/drivers/platform/msm/Makefile
new file mode 100644
index 000000000000..b552b70a0128
--- /dev/null
+++ b/drivers/platform/msm/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_GSI) += gsi/
+obj-$(CONFIG_IPA3) += ipa/
diff --git a/gsi/Makefile b/drivers/platform/msm/gsi/Makefile
similarity index 100%
rename from gsi/Makefile
rename to drivers/platform/msm/gsi/Makefile
diff --git a/gsi/gsi.c b/drivers/platform/msm/gsi/gsi.c
similarity index 100%
rename from gsi/gsi.c
rename to drivers/platform/msm/gsi/gsi.c
diff --git a/gsi/gsi.h b/drivers/platform/msm/gsi/gsi.h
similarity index 100%
rename from gsi/gsi.h
rename to drivers/platform/msm/gsi/gsi.h
diff --git a/gsi/gsi_dbg.c b/drivers/platform/msm/gsi/gsi_dbg.c
similarity index 100%
rename from gsi/gsi_dbg.c
rename to drivers/platform/msm/gsi/gsi_dbg.c
diff --git a/gsi/gsi_emulation.c b/drivers/platform/msm/gsi/gsi_emulation.c
similarity index 100%
rename from gsi/gsi_emulation.c
rename to drivers/platform/msm/gsi/gsi_emulation.c
diff --git a/gsi/gsi_emulation.h b/drivers/platform/msm/gsi/gsi_emulation.h
similarity index 100%
rename from gsi/gsi_emulation.h
rename to drivers/platform/msm/gsi/gsi_emulation.h
diff --git a/gsi/gsi_emulation_stubs.h b/drivers/platform/msm/gsi/gsi_emulation_stubs.h
similarity index 100%
rename from gsi/gsi_emulation_stubs.h
rename to drivers/platform/msm/gsi/gsi_emulation_stubs.h
diff --git a/gsi/gsi_reg.h b/drivers/platform/msm/gsi/gsi_reg.h
similarity index 100%
rename from gsi/gsi_reg.h
rename to drivers/platform/msm/gsi/gsi_reg.h
diff --git a/gsi/gsi_reg_v1.h b/drivers/platform/msm/gsi/gsi_reg_v1.h
similarity index 100%
rename from gsi/gsi_reg_v1.h
rename to drivers/platform/msm/gsi/gsi_reg_v1.h
diff --git a/gsi/gsi_reg_v2.h b/drivers/platform/msm/gsi/gsi_reg_v2.h
similarity index 100%
rename from gsi/gsi_reg_v2.h
rename to drivers/platform/msm/gsi/gsi_reg_v2.h
diff --git a/ipa/Makefile b/drivers/platform/msm/ipa/Makefile
similarity index 100%
rename from ipa/Makefile
rename to drivers/platform/msm/ipa/Makefile
diff --git a/ipa/ipa_api.c b/drivers/platform/msm/ipa/ipa_api.c
similarity index 100%
rename from ipa/ipa_api.c
rename to drivers/platform/msm/ipa/ipa_api.c
diff --git a/ipa/ipa_api.h b/drivers/platform/msm/ipa/ipa_api.h
similarity index 100%
rename from ipa/ipa_api.h
rename to drivers/platform/msm/ipa/ipa_api.h
diff --git a/ipa/ipa_clients/Makefile b/drivers/platform/msm/ipa/ipa_clients/Makefile
similarity index 100%
rename from ipa/ipa_clients/Makefile
rename to drivers/platform/msm/ipa/ipa_clients/Makefile
diff --git a/ipa/ipa_clients/ecm_ipa.c b/drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c
similarity index 100%
rename from ipa/ipa_clients/ecm_ipa.c
rename to drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c
diff --git a/ipa/ipa_clients/ipa_gsb.c b/drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
similarity index 100%
rename from ipa/ipa_clients/ipa_gsb.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
diff --git a/ipa/ipa_clients/ipa_mhi_client.c b/drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
similarity index 100%
rename from ipa/ipa_clients/ipa_mhi_client.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
diff --git a/ipa/ipa_clients/ipa_uc_offload.c b/drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
similarity index 100%
rename from ipa/ipa_clients/ipa_uc_offload.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
diff --git a/ipa/ipa_clients/ipa_usb.c b/drivers/platform/msm/ipa/ipa_clients/ipa_usb.c
similarity index 100%
rename from ipa/ipa_clients/ipa_usb.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_usb.c
diff --git a/ipa/ipa_clients/ipa_wdi3.c b/drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
similarity index 100%
rename from ipa/ipa_clients/ipa_wdi3.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
diff --git a/ipa/ipa_clients/ipa_wigig.c b/drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c
similarity index 100%
rename from ipa/ipa_clients/ipa_wigig.c
rename to drivers/platform/msm/ipa/ipa_clients/ipa_wigig.c
diff --git a/ipa/ipa_clients/odu_bridge.c b/drivers/platform/msm/ipa/ipa_clients/odu_bridge.c
similarity index 100%
rename from ipa/ipa_clients/odu_bridge.c
rename to drivers/platform/msm/ipa/ipa_clients/odu_bridge.c
diff --git a/ipa/ipa_clients/rndis_ipa.c b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
similarity index 100%
rename from ipa/ipa_clients/rndis_ipa.c
rename to drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c
diff --git a/ipa/ipa_clients/rndis_ipa_trace.h b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
similarity index 100%
rename from ipa/ipa_clients/rndis_ipa_trace.h
rename to drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
diff --git a/ipa/ipa_common_i.h b/drivers/platform/msm/ipa/ipa_common_i.h
similarity index 100%
rename from ipa/ipa_common_i.h
rename to drivers/platform/msm/ipa/ipa_common_i.h
diff --git a/ipa/ipa_rm.c b/drivers/platform/msm/ipa/ipa_rm.c
similarity index 100%
rename from ipa/ipa_rm.c
rename to drivers/platform/msm/ipa/ipa_rm.c
diff --git a/ipa/ipa_rm_dependency_graph.c b/drivers/platform/msm/ipa/ipa_rm_dependency_graph.c
similarity index 100%
rename from ipa/ipa_rm_dependency_graph.c
rename to drivers/platform/msm/ipa/ipa_rm_dependency_graph.c
diff --git a/ipa/ipa_rm_dependency_graph.h b/drivers/platform/msm/ipa/ipa_rm_dependency_graph.h
similarity index 100%
rename from ipa/ipa_rm_dependency_graph.h
rename to drivers/platform/msm/ipa/ipa_rm_dependency_graph.h
diff --git a/ipa/ipa_rm_i.h b/drivers/platform/msm/ipa/ipa_rm_i.h
similarity index 100%
rename from ipa/ipa_rm_i.h
rename to drivers/platform/msm/ipa/ipa_rm_i.h
diff --git a/ipa/ipa_rm_inactivity_timer.c b/drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c
similarity index 100%
rename from ipa/ipa_rm_inactivity_timer.c
rename to drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c
diff --git a/ipa/ipa_rm_peers_list.c b/drivers/platform/msm/ipa/ipa_rm_peers_list.c
similarity index 100%
rename from ipa/ipa_rm_peers_list.c
rename to drivers/platform/msm/ipa/ipa_rm_peers_list.c
diff --git a/ipa/ipa_rm_peers_list.h b/drivers/platform/msm/ipa/ipa_rm_peers_list.h
similarity index 100%
rename from ipa/ipa_rm_peers_list.h
rename to drivers/platform/msm/ipa/ipa_rm_peers_list.h
diff --git a/ipa/ipa_rm_resource.c b/drivers/platform/msm/ipa/ipa_rm_resource.c
similarity index 100%
rename from ipa/ipa_rm_resource.c
rename to drivers/platform/msm/ipa/ipa_rm_resource.c
diff --git a/ipa/ipa_rm_resource.h b/drivers/platform/msm/ipa/ipa_rm_resource.h
similarity index 100%
rename from ipa/ipa_rm_resource.h
rename to drivers/platform/msm/ipa/ipa_rm_resource.h
diff --git a/ipa/ipa_uc_offload_common_i.h b/drivers/platform/msm/ipa/ipa_uc_offload_common_i.h
similarity index 100%
rename from ipa/ipa_uc_offload_common_i.h
rename to drivers/platform/msm/ipa/ipa_uc_offload_common_i.h
diff --git a/ipa/ipa_v3/Makefile b/drivers/platform/msm/ipa/ipa_v3/Makefile
similarity index 100%
rename from ipa/ipa_v3/Makefile
rename to drivers/platform/msm/ipa/ipa_v3/Makefile
diff --git a/ipa/ipa_v3/dump/ipa4.5/gsi_hwio.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/gsi_hwio.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/gsi_hwio.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/gsi_hwio.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/gsi_hwio_def.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/gsi_hwio_def.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/gsi_hwio_def.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/gsi_hwio_def.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_access_control.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_access_control.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_access_control.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_access_control.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio_def.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio_def.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio_def.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_gcc_hwio_def.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_hw_common_ex.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hw_common_ex.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_hw_common_ex.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hw_common_ex.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_hwio.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hwio.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_hwio.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hwio.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_hwio_def.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hwio_def.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_hwio_def.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_hwio_def.h
diff --git a/ipa/ipa_v3/dump/ipa4.5/ipa_pkt_cntxt.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_pkt_cntxt.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa4.5/ipa_pkt_cntxt.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa4.5/ipa_pkt_cntxt.h
diff --git a/ipa/ipa_v3/dump/ipa_reg_dump.c b/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.c
similarity index 100%
rename from ipa/ipa_v3/dump/ipa_reg_dump.c
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.c
diff --git a/ipa/ipa_v3/dump/ipa_reg_dump.h b/drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h
similarity index 100%
rename from ipa/ipa_v3/dump/ipa_reg_dump.h
rename to drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h
diff --git a/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c
similarity index 100%
rename from ipa/ipa_v3/ipa.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa.c
diff --git a/ipa/ipa_v3/ipa_client.c b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c
similarity index 100%
rename from ipa/ipa_v3/ipa_client.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_client.c
diff --git a/ipa/ipa_v3/ipa_debugfs.c b/drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
similarity index 100%
rename from ipa/ipa_v3/ipa_debugfs.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
diff --git a/ipa/ipa_v3/ipa_defs.h b/drivers/platform/msm/ipa/ipa_v3/ipa_defs.h
similarity index 100%
rename from ipa/ipa_v3/ipa_defs.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_defs.h
diff --git a/ipa/ipa_v3/ipa_dma.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dma.c
similarity index 100%
rename from ipa/ipa_v3/ipa_dma.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_dma.c
diff --git a/ipa/ipa_v3/ipa_dp.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
similarity index 100%
rename from ipa/ipa_v3/ipa_dp.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
diff --git a/ipa/ipa_v3/ipa_dt_replacement.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dt_replacement.c
similarity index 100%
rename from ipa/ipa_v3/ipa_dt_replacement.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_dt_replacement.c
diff --git a/ipa/ipa_v3/ipa_emulation_stubs.h b/drivers/platform/msm/ipa/ipa_v3/ipa_emulation_stubs.h
similarity index 100%
rename from ipa/ipa_v3/ipa_emulation_stubs.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_emulation_stubs.h
diff --git a/ipa/ipa_v3/ipa_flt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_flt.c
similarity index 100%
rename from ipa/ipa_v3/ipa_flt.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_flt.c
diff --git a/ipa/ipa_v3/ipa_hdr.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
similarity index 100%
rename from ipa/ipa_v3/ipa_hdr.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
diff --git a/ipa/ipa_v3/ipa_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
similarity index 100%
rename from ipa/ipa_v3/ipa_hw_stats.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c
diff --git a/ipa/ipa_v3/ipa_i.h b/drivers/platform/msm/ipa/ipa_v3/ipa_i.h
similarity index 100%
rename from ipa/ipa_v3/ipa_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_i.h
diff --git a/ipa/ipa_v3/ipa_interrupts.c b/drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c
similarity index 100%
rename from ipa/ipa_v3/ipa_interrupts.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_interrupts.c
diff --git a/ipa/ipa_v3/ipa_intf.c b/drivers/platform/msm/ipa/ipa_v3/ipa_intf.c
similarity index 100%
rename from ipa/ipa_v3/ipa_intf.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_intf.c
diff --git a/ipa/ipa_v3/ipa_mhi.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
similarity index 100%
rename from ipa/ipa_v3/ipa_mhi.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
diff --git a/ipa/ipa_v3/ipa_mhi_proxy.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c
similarity index 100%
rename from ipa/ipa_v3/ipa_mhi_proxy.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c
diff --git a/ipa/ipa_v3/ipa_mhi_proxy.h b/drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.h
similarity index 100%
rename from ipa/ipa_v3/ipa_mhi_proxy.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.h
diff --git a/ipa/ipa_v3/ipa_mpm.c b/drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
similarity index 100%
rename from ipa/ipa_v3/ipa_mpm.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
diff --git a/ipa/ipa_v3/ipa_nat.c b/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c
similarity index 100%
rename from ipa/ipa_v3/ipa_nat.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_nat.c
diff --git a/ipa/ipa_v3/ipa_odl.c b/drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
similarity index 100%
rename from ipa/ipa_v3/ipa_odl.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
diff --git a/ipa/ipa_v3/ipa_odl.h b/drivers/platform/msm/ipa/ipa_v3/ipa_odl.h
similarity index 100%
rename from ipa/ipa_v3/ipa_odl.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_odl.h
diff --git a/ipa/ipa_v3/ipa_pm.c b/drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
similarity index 100%
rename from ipa/ipa_v3/ipa_pm.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
diff --git a/ipa/ipa_v3/ipa_pm.h b/drivers/platform/msm/ipa/ipa_v3/ipa_pm.h
similarity index 100%
rename from ipa/ipa_v3/ipa_pm.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_pm.h
diff --git a/ipa/ipa_v3/ipa_qmi_service.c b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
similarity index 100%
rename from ipa/ipa_v3/ipa_qmi_service.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
diff --git a/ipa/ipa_v3/ipa_qmi_service.h b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.h
similarity index 100%
rename from ipa/ipa_v3/ipa_qmi_service.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.h
diff --git a/ipa/ipa_v3/ipa_qmi_service_v01.c b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service_v01.c
similarity index 100%
rename from ipa/ipa_v3/ipa_qmi_service_v01.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service_v01.c
diff --git a/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
similarity index 100%
rename from ipa/ipa_v3/ipa_rt.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
diff --git a/ipa/ipa_v3/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
similarity index 100%
rename from ipa/ipa_v3/ipa_trace.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
diff --git a/ipa/ipa_v3/ipa_uc.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
similarity index 100%
rename from ipa/ipa_v3/ipa_uc.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
diff --git a/ipa/ipa_v3/ipa_uc_mhi.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_mhi.c
similarity index 100%
rename from ipa/ipa_v3/ipa_uc_mhi.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_uc_mhi.c
diff --git a/ipa/ipa_v3/ipa_uc_ntn.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_ntn.c
similarity index 100%
rename from ipa/ipa_v3/ipa_uc_ntn.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_uc_ntn.c
diff --git a/ipa/ipa_v3/ipa_uc_offload_i.h b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_offload_i.h
similarity index 100%
rename from ipa/ipa_v3/ipa_uc_offload_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipa_uc_offload_i.h
diff --git a/ipa/ipa_v3/ipa_uc_wdi.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c
similarity index 100%
rename from ipa/ipa_v3/ipa_uc_wdi.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c
diff --git a/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
similarity index 100%
rename from ipa/ipa_v3/ipa_utils.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
diff --git a/ipa/ipa_v3/ipa_wdi3_i.c b/drivers/platform/msm/ipa/ipa_v3/ipa_wdi3_i.c
similarity index 100%
rename from ipa/ipa_v3/ipa_wdi3_i.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_wdi3_i.c
diff --git a/ipa/ipa_v3/ipa_wigig_i.c b/drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c
similarity index 100%
rename from ipa/ipa_v3/ipa_wigig_i.c
rename to drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c
diff --git a/ipa/ipa_v3/ipahal/ipahal.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal.c
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c
diff --git a/ipa/ipa_v3/ipahal/ipahal.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_fltrt.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_fltrt.c
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
diff --git a/ipa/ipa_v3/ipahal/ipahal_fltrt.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_fltrt.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_fltrt_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt_i.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_fltrt_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt_i.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_hw_stats.c
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
diff --git a/ipa/ipa_v3/ipahal/ipahal_hw_stats.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_hw_stats.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_hw_stats_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats_i.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_hw_stats_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats_i.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_nat.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.c
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_nat.c
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.c
diff --git a/ipa/ipa_v3/ipahal/ipahal_nat.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_nat.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_nat_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat_i.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_nat_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_nat_i.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_reg.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_reg.c
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c
diff --git a/ipa/ipa_v3/ipahal/ipahal_reg.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_reg.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.h
diff --git a/ipa/ipa_v3/ipahal/ipahal_reg_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h
similarity index 100%
rename from ipa/ipa_v3/ipahal/ipahal_reg_i.h
rename to drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h
diff --git a/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
similarity index 100%
rename from ipa/ipa_v3/rmnet_ipa.c
rename to drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
diff --git a/ipa/ipa_v3/rmnet_ipa_fd_ioctl.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa_fd_ioctl.c
similarity index 100%
rename from ipa/ipa_v3/rmnet_ipa_fd_ioctl.c
rename to drivers/platform/msm/ipa/ipa_v3/rmnet_ipa_fd_ioctl.c
diff --git a/ipa/ipa_v3/teth_bridge.c b/drivers/platform/msm/ipa/ipa_v3/teth_bridge.c
similarity index 100%
rename from ipa/ipa_v3/teth_bridge.c
rename to drivers/platform/msm/ipa/ipa_v3/teth_bridge.c
diff --git a/ipa/test/ipa_pm_ut.c b/drivers/platform/msm/ipa/test/ipa_pm_ut.c
similarity index 100%
rename from ipa/test/ipa_pm_ut.c
rename to drivers/platform/msm/ipa/test/ipa_pm_ut.c
diff --git a/ipa/test/ipa_test_dma.c b/drivers/platform/msm/ipa/test/ipa_test_dma.c
similarity index 100%
rename from ipa/test/ipa_test_dma.c
rename to drivers/platform/msm/ipa/test/ipa_test_dma.c
diff --git a/ipa/test/ipa_test_example.c b/drivers/platform/msm/ipa/test/ipa_test_example.c
similarity index 100%
rename from ipa/test/ipa_test_example.c
rename to drivers/platform/msm/ipa/test/ipa_test_example.c
diff --git a/ipa/test/ipa_test_hw_stats.c b/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c
similarity index 100%
rename from ipa/test/ipa_test_hw_stats.c
rename to drivers/platform/msm/ipa/test/ipa_test_hw_stats.c
diff --git a/ipa/test/ipa_test_mhi.c b/drivers/platform/msm/ipa/test/ipa_test_mhi.c
similarity index 100%
rename from ipa/test/ipa_test_mhi.c
rename to drivers/platform/msm/ipa/test/ipa_test_mhi.c
diff --git a/ipa/test/ipa_test_wdi3.c b/drivers/platform/msm/ipa/test/ipa_test_wdi3.c
similarity index 100%
rename from ipa/test/ipa_test_wdi3.c
rename to drivers/platform/msm/ipa/test/ipa_test_wdi3.c
diff --git a/ipa/test/ipa_ut_framework.c b/drivers/platform/msm/ipa/test/ipa_ut_framework.c
similarity index 100%
rename from ipa/test/ipa_ut_framework.c
rename to drivers/platform/msm/ipa/test/ipa_ut_framework.c
diff --git a/ipa/test/ipa_ut_framework.h b/drivers/platform/msm/ipa/test/ipa_ut_framework.h
similarity index 100%
rename from ipa/test/ipa_ut_framework.h
rename to drivers/platform/msm/ipa/test/ipa_ut_framework.h
diff --git a/ipa/test/ipa_ut_i.h b/drivers/platform/msm/ipa/test/ipa_ut_i.h
similarity index 100%
rename from ipa/test/ipa_ut_i.h
rename to drivers/platform/msm/ipa/test/ipa_ut_i.h
diff --git a/ipa/test/ipa_ut_suite_list.h b/drivers/platform/msm/ipa/test/ipa_ut_suite_list.h
similarity index 100%
rename from ipa/test/ipa_ut_suite_list.h
rename to drivers/platform/msm/ipa/test/ipa_ut_suite_list.h