diff --git a/iris/Kconfig b/drivers/media/platform/qcom/iris/Kconfig
similarity index 100%
rename from iris/Kconfig
rename to drivers/media/platform/qcom/iris/Kconfig
diff --git a/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
similarity index 100%
rename from iris/Makefile
rename to drivers/media/platform/qcom/iris/Makefile
diff --git a/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
similarity index 100%
rename from iris/iris_buffer.c
rename to drivers/media/platform/qcom/iris/iris_buffer.c
diff --git a/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
similarity index 100%
rename from iris/iris_buffer.h
rename to drivers/media/platform/qcom/iris/iris_buffer.h
diff --git a/iris/iris_common.c b/drivers/media/platform/qcom/iris/iris_common.c
similarity index 100%
rename from iris/iris_common.c
rename to drivers/media/platform/qcom/iris/iris_common.c
diff --git a/iris/iris_common.h b/drivers/media/platform/qcom/iris/iris_common.h
similarity index 100%
rename from iris/iris_common.h
rename to drivers/media/platform/qcom/iris/iris_common.h
diff --git a/iris/iris_core.c b/drivers/media/platform/qcom/iris/iris_core.c
similarity index 100%
rename from iris/iris_core.c
rename to drivers/media/platform/qcom/iris/iris_core.c
diff --git a/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h
similarity index 100%
rename from iris/iris_core.h
rename to drivers/media/platform/qcom/iris/iris_core.h
diff --git a/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
similarity index 100%
rename from iris/iris_ctrls.c
rename to drivers/media/platform/qcom/iris/iris_ctrls.c
diff --git a/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h
similarity index 100%
rename from iris/iris_ctrls.h
rename to drivers/media/platform/qcom/iris/iris_ctrls.h
diff --git a/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
similarity index 100%
rename from iris/iris_firmware.c
rename to drivers/media/platform/qcom/iris/iris_firmware.c
diff --git a/iris/iris_firmware.h b/drivers/media/platform/qcom/iris/iris_firmware.h
similarity index 100%
rename from iris/iris_firmware.h
rename to drivers/media/platform/qcom/iris/iris_firmware.h
diff --git a/iris/iris_hfi_common.c b/drivers/media/platform/qcom/iris/iris_hfi_common.c
similarity index 100%
rename from iris/iris_hfi_common.c
rename to drivers/media/platform/qcom/iris/iris_hfi_common.c
diff --git a/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h
similarity index 100%
rename from iris/iris_hfi_common.h
rename to drivers/media/platform/qcom/iris/iris_hfi_common.h
diff --git a/iris/iris_hfi_gen1.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
similarity index 100%
rename from iris/iris_hfi_gen1.h
rename to drivers/media/platform/qcom/iris/iris_hfi_gen1.h
diff --git a/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
similarity index 100%
rename from iris/iris_hfi_gen1_command.c
rename to drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
diff --git a/iris/iris_hfi_gen1_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
similarity index 100%
rename from iris/iris_hfi_gen1_defines.h
rename to drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
diff --git a/iris/iris_hfi_gen1_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
similarity index 100%
rename from iris/iris_hfi_gen1_response.c
rename to drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
diff --git a/iris/iris_hfi_gen2.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
similarity index 100%
rename from iris/iris_hfi_gen2.h
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2.h
diff --git a/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
similarity index 100%
rename from iris/iris_hfi_gen2_command.c
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
diff --git a/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
similarity index 100%
rename from iris/iris_hfi_gen2_defines.h
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
diff --git a/iris/iris_hfi_gen2_packet.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
similarity index 100%
rename from iris/iris_hfi_gen2_packet.c
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
diff --git a/iris/iris_hfi_gen2_packet.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h
similarity index 100%
rename from iris/iris_hfi_gen2_packet.h
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h
diff --git a/iris/iris_hfi_gen2_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
similarity index 100%
rename from iris/iris_hfi_gen2_response.c
rename to drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
diff --git a/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
similarity index 100%
rename from iris/iris_hfi_queue.c
rename to drivers/media/platform/qcom/iris/iris_hfi_queue.c
diff --git a/iris/iris_hfi_queue.h b/drivers/media/platform/qcom/iris/iris_hfi_queue.h
similarity index 100%
rename from iris/iris_hfi_queue.h
rename to drivers/media/platform/qcom/iris/iris_hfi_queue.h
diff --git a/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
similarity index 100%
rename from iris/iris_instance.h
rename to drivers/media/platform/qcom/iris/iris_instance.h
diff --git a/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
similarity index 100%
rename from iris/iris_platform_common.h
rename to drivers/media/platform/qcom/iris/iris_platform_common.h
diff --git a/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
similarity index 100%
rename from iris/iris_platform_gen1.c
rename to drivers/media/platform/qcom/iris/iris_platform_gen1.c
diff --git a/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
similarity index 100%
rename from iris/iris_platform_gen2.c
rename to drivers/media/platform/qcom/iris/iris_platform_gen2.c
diff --git a/iris/iris_platform_qcs8300.h b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
similarity index 100%
rename from iris/iris_platform_qcs8300.h
rename to drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
diff --git a/iris/iris_platform_sc7280.h b/drivers/media/platform/qcom/iris/iris_platform_sc7280.h
similarity index 100%
rename from iris/iris_platform_sc7280.h
rename to drivers/media/platform/qcom/iris/iris_platform_sc7280.h
diff --git a/iris/iris_platform_sm8650.h b/drivers/media/platform/qcom/iris/iris_platform_sm8650.h
similarity index 100%
rename from iris/iris_platform_sm8650.h
rename to drivers/media/platform/qcom/iris/iris_platform_sm8650.h
diff --git a/iris/iris_platform_sm8750.h b/drivers/media/platform/qcom/iris/iris_platform_sm8750.h
similarity index 100%
rename from iris/iris_platform_sm8750.h
rename to drivers/media/platform/qcom/iris/iris_platform_sm8750.h
diff --git a/iris/iris_power.c b/drivers/media/platform/qcom/iris/iris_power.c
similarity index 100%
rename from iris/iris_power.c
rename to drivers/media/platform/qcom/iris/iris_power.c
diff --git a/iris/iris_power.h b/drivers/media/platform/qcom/iris/iris_power.h
similarity index 100%
rename from iris/iris_power.h
rename to drivers/media/platform/qcom/iris/iris_power.h
diff --git a/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
similarity index 100%
rename from iris/iris_probe.c
rename to drivers/media/platform/qcom/iris/iris_probe.c
diff --git a/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
similarity index 100%
rename from iris/iris_resources.c
rename to drivers/media/platform/qcom/iris/iris_resources.c
diff --git a/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
similarity index 100%
rename from iris/iris_resources.h
rename to drivers/media/platform/qcom/iris/iris_resources.h
diff --git a/iris/iris_state.c b/drivers/media/platform/qcom/iris/iris_state.c
similarity index 100%
rename from iris/iris_state.c
rename to drivers/media/platform/qcom/iris/iris_state.c
diff --git a/iris/iris_state.h b/drivers/media/platform/qcom/iris/iris_state.h
similarity index 100%
rename from iris/iris_state.h
rename to drivers/media/platform/qcom/iris/iris_state.h
diff --git a/iris/iris_utils.c b/drivers/media/platform/qcom/iris/iris_utils.c
similarity index 100%
rename from iris/iris_utils.c
rename to drivers/media/platform/qcom/iris/iris_utils.c
diff --git a/iris/iris_utils.h b/drivers/media/platform/qcom/iris/iris_utils.h
similarity index 100%
rename from iris/iris_utils.h
rename to drivers/media/platform/qcom/iris/iris_utils.h
diff --git a/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c
similarity index 100%
rename from iris/iris_vb2.c
rename to drivers/media/platform/qcom/iris/iris_vb2.c
diff --git a/iris/iris_vb2.h b/drivers/media/platform/qcom/iris/iris_vb2.h
similarity index 100%
rename from iris/iris_vb2.h
rename to drivers/media/platform/qcom/iris/iris_vb2.h
diff --git a/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
similarity index 100%
rename from iris/iris_vdec.c
rename to drivers/media/platform/qcom/iris/iris_vdec.c
diff --git a/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
similarity index 100%
rename from iris/iris_vdec.h
rename to drivers/media/platform/qcom/iris/iris_vdec.h
diff --git a/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
similarity index 100%
rename from iris/iris_venc.c
rename to drivers/media/platform/qcom/iris/iris_venc.c
diff --git a/iris/iris_venc.h b/drivers/media/platform/qcom/iris/iris_venc.h
similarity index 100%
rename from iris/iris_venc.h
rename to drivers/media/platform/qcom/iris/iris_venc.h
diff --git a/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
similarity index 100%
rename from iris/iris_vidc.c
rename to drivers/media/platform/qcom/iris/iris_vidc.c
diff --git a/iris/iris_vidc.h b/drivers/media/platform/qcom/iris/iris_vidc.h
similarity index 100%
rename from iris/iris_vidc.h
rename to drivers/media/platform/qcom/iris/iris_vidc.h
diff --git a/iris/iris_vpu2.c b/drivers/media/platform/qcom/iris/iris_vpu2.c
similarity index 100%
rename from iris/iris_vpu2.c
rename to drivers/media/platform/qcom/iris/iris_vpu2.c
diff --git a/iris/iris_vpu3x.c b/drivers/media/platform/qcom/iris/iris_vpu3x.c
similarity index 100%
rename from iris/iris_vpu3x.c
rename to drivers/media/platform/qcom/iris/iris_vpu3x.c
diff --git a/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
similarity index 100%
rename from iris/iris_vpu_buffer.c
rename to drivers/media/platform/qcom/iris/iris_vpu_buffer.c
diff --git a/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
similarity index 100%
rename from iris/iris_vpu_buffer.h
rename to drivers/media/platform/qcom/iris/iris_vpu_buffer.h
diff --git a/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c
similarity index 100%
rename from iris/iris_vpu_common.c
rename to drivers/media/platform/qcom/iris/iris_vpu_common.c
diff --git a/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h
similarity index 100%
rename from iris/iris_vpu_common.h
rename to drivers/media/platform/qcom/iris/iris_vpu_common.h
diff --git a/iris/iris_vpu_register_defines.h b/drivers/media/platform/qcom/iris/iris_vpu_register_defines.h
similarity index 100%
rename from iris/iris_vpu_register_defines.h
rename to drivers/media/platform/qcom/iris/iris_vpu_register_defines.h
diff --git a/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig
similarity index 100%
rename from venus/Kconfig
rename to drivers/media/platform/qcom/venus/Kconfig
diff --git a/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile
similarity index 100%
rename from venus/Makefile
rename to drivers/media/platform/qcom/venus/Makefile
diff --git a/venus/core.c b/drivers/media/platform/qcom/venus/core.c
similarity index 100%
rename from venus/core.c
rename to drivers/media/platform/qcom/venus/core.c
diff --git a/venus/core.h b/drivers/media/platform/qcom/venus/core.h
similarity index 100%
rename from venus/core.h
rename to drivers/media/platform/qcom/venus/core.h
diff --git a/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c
similarity index 100%
rename from venus/dbgfs.c
rename to drivers/media/platform/qcom/venus/dbgfs.c
diff --git a/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h
similarity index 100%
rename from venus/dbgfs.h
rename to drivers/media/platform/qcom/venus/dbgfs.h
diff --git a/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
similarity index 100%
rename from venus/firmware.c
rename to drivers/media/platform/qcom/venus/firmware.c
diff --git a/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h
similarity index 100%
rename from venus/firmware.h
rename to drivers/media/platform/qcom/venus/firmware.h
diff --git a/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
similarity index 100%
rename from venus/helpers.c
rename to drivers/media/platform/qcom/venus/helpers.c
diff --git a/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h
similarity index 100%
rename from venus/helpers.h
rename to drivers/media/platform/qcom/venus/helpers.h
diff --git a/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c
similarity index 100%
rename from venus/hfi.c
rename to drivers/media/platform/qcom/venus/hfi.c
diff --git a/venus/hfi.h b/drivers/media/platform/qcom/venus/hfi.h
similarity index 100%
rename from venus/hfi.h
rename to drivers/media/platform/qcom/venus/hfi.h
diff --git a/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
similarity index 100%
rename from venus/hfi_cmds.c
rename to drivers/media/platform/qcom/venus/hfi_cmds.c
diff --git a/venus/hfi_cmds.h b/drivers/media/platform/qcom/venus/hfi_cmds.h
similarity index 100%
rename from venus/hfi_cmds.h
rename to drivers/media/platform/qcom/venus/hfi_cmds.h
diff --git a/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h
similarity index 100%
rename from venus/hfi_helper.h
rename to drivers/media/platform/qcom/venus/hfi_helper.h
diff --git a/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c
similarity index 100%
rename from venus/hfi_msgs.c
rename to drivers/media/platform/qcom/venus/hfi_msgs.c
diff --git a/venus/hfi_msgs.h b/drivers/media/platform/qcom/venus/hfi_msgs.h
similarity index 100%
rename from venus/hfi_msgs.h
rename to drivers/media/platform/qcom/venus/hfi_msgs.h
diff --git a/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c
similarity index 100%
rename from venus/hfi_parser.c
rename to drivers/media/platform/qcom/venus/hfi_parser.c
diff --git a/venus/hfi_parser.h b/drivers/media/platform/qcom/venus/hfi_parser.h
similarity index 100%
rename from venus/hfi_parser.h
rename to drivers/media/platform/qcom/venus/hfi_parser.h
diff --git a/venus/hfi_plat_bufs.h b/drivers/media/platform/qcom/venus/hfi_plat_bufs.h
similarity index 100%
rename from venus/hfi_plat_bufs.h
rename to drivers/media/platform/qcom/venus/hfi_plat_bufs.h
diff --git a/venus/hfi_plat_bufs_v6.c b/drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
similarity index 100%
rename from venus/hfi_plat_bufs_v6.c
rename to drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
diff --git a/venus/hfi_platform.c b/drivers/media/platform/qcom/venus/hfi_platform.c
similarity index 100%
rename from venus/hfi_platform.c
rename to drivers/media/platform/qcom/venus/hfi_platform.c
diff --git a/venus/hfi_platform.h b/drivers/media/platform/qcom/venus/hfi_platform.h
similarity index 100%
rename from venus/hfi_platform.h
rename to drivers/media/platform/qcom/venus/hfi_platform.h
diff --git a/venus/hfi_platform_v4.c b/drivers/media/platform/qcom/venus/hfi_platform_v4.c
similarity index 100%
rename from venus/hfi_platform_v4.c
rename to drivers/media/platform/qcom/venus/hfi_platform_v4.c
diff --git a/venus/hfi_platform_v6.c b/drivers/media/platform/qcom/venus/hfi_platform_v6.c
similarity index 100%
rename from venus/hfi_platform_v6.c
rename to drivers/media/platform/qcom/venus/hfi_platform_v6.c
diff --git a/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
similarity index 100%
rename from venus/hfi_venus.c
rename to drivers/media/platform/qcom/venus/hfi_venus.c
diff --git a/venus/hfi_venus.h b/drivers/media/platform/qcom/venus/hfi_venus.h
similarity index 100%
rename from venus/hfi_venus.h
rename to drivers/media/platform/qcom/venus/hfi_venus.h
diff --git a/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h
similarity index 100%
rename from venus/hfi_venus_io.h
rename to drivers/media/platform/qcom/venus/hfi_venus_io.h
diff --git a/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
similarity index 100%
rename from venus/pm_helpers.c
rename to drivers/media/platform/qcom/venus/pm_helpers.c
diff --git a/venus/pm_helpers.h b/drivers/media/platform/qcom/venus/pm_helpers.h
similarity index 100%
rename from venus/pm_helpers.h
rename to drivers/media/platform/qcom/venus/pm_helpers.h
diff --git a/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
similarity index 100%
rename from venus/vdec.c
rename to drivers/media/platform/qcom/venus/vdec.c
diff --git a/venus/vdec.h b/drivers/media/platform/qcom/venus/vdec.h
similarity index 100%
rename from venus/vdec.h
rename to drivers/media/platform/qcom/venus/vdec.h
diff --git a/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c
similarity index 100%
rename from venus/vdec_ctrls.c
rename to drivers/media/platform/qcom/venus/vdec_ctrls.c
diff --git a/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
similarity index 100%
rename from venus/venc.c
rename to drivers/media/platform/qcom/venus/venc.c
diff --git a/venus/venc.h b/drivers/media/platform/qcom/venus/venc.h
similarity index 100%
rename from venus/venc.h
rename to drivers/media/platform/qcom/venus/venc.h
diff --git a/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
similarity index 100%
rename from venus/venc_ctrls.c
rename to drivers/media/platform/qcom/venus/venc_ctrls.c