Camera: Correct makefiles for correct header inclusion

Correct some Makefiles and drivers header inclusion. Change-Id: Iec3e6e0333ae55e8f1cff9780723e0dad954ff83 Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-08-09 12:56:12 -07:00
parent ce61a07996
commit 5b016ad220
86 changed files with 138 additions and 133 deletions
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,13 +1,13 @@
-obj-y += cam_req_mgr/
-obj-y += cam_utils/
-obj-y += cam_core/
-obj-y += cam_sync/
-obj-y += cam_smmu/
-obj-y += cam_cpas/
-obj-y += cam_cdm/
-obj-y += cam_isp/
-obj-y += cam_sensor_module/
-obj-y += cam_icp/
-obj-y += cam_jpeg/
-obj-y += cam_fd/
-obj-y += cam_lrme/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_sync/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_smmu/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cpas/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_module/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_jpeg/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_fd/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme/
--- a/drivers/cam_cdm/Makefile
+++ b/drivers/cam_cdm/Makefile
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

-obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_util.o cam_cdm_intf.o cam_cdm_soc.o\
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_soc.o cam_cdm_util.o cam_cdm_intf.o\
 				cam_cdm_core_common.o cam_cdm_virtual_core.o \
 				cam_cdm_hw_core.o
--- a/drivers/cam_cdm/cam_cdm_hw_core.c
+++ b/drivers/cam_cdm/cam_cdm_hw_core.c
@@ -10,7 +10,7 @@
 #include <linux/timer.h>
 #include <linux/kernel.h>

-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_soc_util.h"
 #include "cam_smmu_api.h"
 #include "cam_cdm_intf_api.h"
--- a/drivers/cam_core/Makefile
+++ b/drivers/cam_core/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
--- a/drivers/cam_core/cam_context_utils.c
+++ b/drivers/cam_core/cam_context_utils.c
@@ -7,8 +7,8 @@
 #include <linux/videodev2.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <cam_sync.h>
-#include <cam_defs.h>
+#include <media/cam_sync.h>
+#include <media/cam_defs.h>

 #include "cam_context.h"
 #include "cam_context_utils.h"
--- a/drivers/cam_cpas/Makefile
+++ b/drivers/cam_cpas/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
--- a/drivers/cam_cpas/cam_cpas_intf.c
+++ b/drivers/cam_cpas/cam_cpas_intf.c
@@ -10,8 +10,8 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>
 #include <dt-bindings/msm/msm-camera.h>

 #include "cam_subdev.h"
--- a/drivers/cam_cpas/camss_top/Makefile
+++ b/drivers/cam_cpas/camss_top/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
--- a/drivers/cam_cpas/cpas_top/Makefile
+++ b/drivers/cam_cpas/cpas_top/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
--- a/drivers/cam_fd/Makefile
+++ b/drivers/cam_fd/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_fd/fd_hw_mgr/Makefile
+++ b/drivers/cam_fd/fd_hw_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
+++ b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
@@ -5,8 +5,8 @@

 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>

 #include "cam_io_util.h"
 #include "cam_soc_util.h"
--- a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
+++ b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
@@ -9,7 +9,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>

-#include <cam_fd.h>
+#include <media/cam_fd.h>
 #include "cam_hw.h"
 #include "cam_hw_intf.h"
 #include "cam_cpas_api.h"
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h
@@ -9,8 +9,8 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_defs.h>
-#include <cam_fd.h>
+#include <media/cam_defs.h>
+#include <media/cam_fd.h>

 #include "cam_common_util.h"
 #include "cam_debug_util.h"
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h
@@ -9,9 +9,9 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
-#include <cam_fd.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_fd.h>

 #include "cam_io_util.h"
 #include "cam_soc_util.h"
--- a/drivers/cam_icp/Makefile
+++ b/drivers/cam_icp/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_icp/cam_icp_context.c
+++ b/drivers/cam_icp/cam_icp_context.c
@@ -7,9 +7,9 @@
 #include <linux/videodev2.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <cam_sync.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_sync.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_node.h"
 #include "cam_context.h"
 #include "cam_context_utils.h"
--- a/drivers/cam_icp/cam_icp_subdev.c
+++ b/drivers/cam_icp/cam_icp_subdev.c
@@ -17,9 +17,9 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_req_mgr.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_req_mgr_dev.h"
 #include "cam_subdev.h"
 #include "cam_node.h"
--- a/drivers/cam_icp/hfi.c
+++ b/drivers/cam_icp/hfi.c
@@ -9,7 +9,7 @@
 #include <linux/random.h>
 #include <asm/errno.h>
 #include <linux/timer.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include <linux/iopoll.h>
 #include <soc/qcom/socinfo.h>

--- a/drivers/cam_icp/icp_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_icp/icp_hw/a5_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/a5_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_icp/icp_hw/a5_hw/a5_core.c
+++ b/drivers/cam_icp/icp_hw/a5_hw/a5_core.c
@@ -13,7 +13,7 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/elf.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include "cam_io_util.h"
 #include "cam_a5_hw_intf.h"
 #include "cam_hw.h"
--- a/drivers/cam_icp/icp_hw/bps_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/bps_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/isp/isp_hw/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/isp/isp_hw/hw_utils/include
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
@@ -16,9 +16,9 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/debugfs.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
-#include <cam_cpas.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
+#include <media/cam_cpas.h>

 #include "cam_sync_api.h"
 #include "cam_packet_util.h"
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
@@ -8,7 +8,7 @@

 #include <linux/types.h>
 #include <linux/completion.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include "cam_icp_hw_intf.h"
 #include "cam_hw_mgr_intf.h"
 #include "cam_hw_intf.h"
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h
@@ -7,8 +7,8 @@
 #define CAM_A5_HW_INTF_H

 #include <linux/timer.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"

--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h
@@ -6,8 +6,8 @@
 #ifndef CAM_BPS_HW_INTF_H
 #define CAM_BPS_HW_INTF_H

-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"

--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h
@@ -6,8 +6,8 @@
 #ifndef CAM_IPE_HW_INTF_H
 #define CAM_IPE_HW_INTF_H

-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"

--- a/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h
+++ b/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h
@@ -7,8 +7,8 @@
 #define CAM_ICP_HW_MGR_INTF_H

 #include <linux/of.h>
-#include <cam_icp.h>
-#include <cam_defs.h>
+#include <media/cam_icp.h>
+#include <media/cam_defs.h>
 #include "cam_cpas_api.h"

 #define ICP_CLK_TURBO_HZ         600000000
--- a/drivers/cam_icp/icp_hw/ipe_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/ipe_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
--- a/drivers/cam_isp/Makefile
+++ b/drivers/cam_isp/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
--- a/drivers/cam_isp/cam_isp_context.h
+++ b/drivers/cam_isp/cam_isp_context.h
@@ -8,8 +8,8 @@


 #include <linux/spinlock.h>
-#include <cam_isp.h>
-#include <cam_defs.h>
+#include <media/cam_isp.h>
+#include <media/cam_defs.h>

 #include "cam_context.h"
 #include "cam_isp_hw_mgr_intf.h"
--- a/drivers/cam_isp/cam_isp_dev.c
+++ b/drivers/cam_isp/cam_isp_dev.c
@@ -11,7 +11,7 @@
 #include <linux/timer.h>
 #include <linux/kernel.h>

-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_isp_dev.h"
 #include "cam_hw_mgr_intf.h"
 #include "cam_isp_hw_mgr_intf.h"
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile
@@ -3,7 +3,7 @@
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
-ccflags-y += -I$(srctree)/techpack/camera/drivers/isp_hw_mgr/
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/include
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
@@ -10,7 +10,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c
@@ -10,7 +10,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
@@ -11,7 +11,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
--- a/drivers/cam_jpeg/Makefile
+++ b/drivers/cam_jpeg/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
--- a/drivers/cam_jpeg/cam_jpeg_context.h
+++ b/drivers/cam_jpeg/cam_jpeg_context.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_JPEG_CONTEXT_H_
 #define _CAM_JPEG_CONTEXT_H_

-#include <cam_jpeg.h>
+#include <media/cam_jpeg.h>

 #include "cam_context.h"
 #include "cam_jpeg_hw_mgr_intf.h"
--- a/drivers/cam_lrme/Makefile
+++ b/drivers/cam_lrme/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
--- a/drivers/cam_req_mgr/Makefile
+++ b/drivers/cam_req_mgr/Makefile
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
-ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
-ccflags-y += -I$(srctree)
+ccflags-y += -I$(src)

 obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr_core.o\
 				cam_req_mgr_dev.o \
--- a/drivers/cam_req_mgr/cam_mem_mgr_api.h
+++ b/drivers/cam_req_mgr/cam_mem_mgr_api.h
@@ -7,7 +7,7 @@
 #define _CAM_MEM_MGR_API_H_

 #include <media/cam_req_mgr.h>
-#include "../cam_smmu/cam_smmu_api.h"
+#include "cam_smmu_api.h"

 /**
 * struct cam_mem_mgr_request_desc
--- a/drivers/cam_req_mgr/cam_req_mgr_dev.c
+++ b/drivers/cam_req_mgr/cam_req_mgr_dev.c
@@ -10,8 +10,8 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
-#include <cam_req_mgr.h>
-#include <cam_defs.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_defs.h>
 #include "cam_req_mgr_dev.h"
 #include "cam_req_mgr_util.h"
 #include "cam_req_mgr_core.h"
--- a/drivers/cam_req_mgr/cam_req_mgr_util.c
+++ b/drivers/cam_req_mgr/cam_req_mgr_util.c
@@ -11,7 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/random.h>
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_util.h"
 #include "cam_debug_util.h"

--- a/drivers/cam_sensor_module/cam_actuator/Makefile
+++ b/drivers/cam_sensor_module/cam_actuator/Makefile
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

+
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_actuator_dev.o cam_actuator_core.o cam_actuator_soc.o
--- a/drivers/cam_sensor_module/cam_cci/Makefile
+++ b/drivers/cam_sensor_module/cam_cci/Makefile
@@ -1,11 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
-ccflags-y += -I$(srctree)/techpack/camera/drivers/camera/cam_req_mgr
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)

 obj-$(CONFIG_SPECTRA_CAMERA) += cam_cci_dev.o cam_cci_core.o cam_cci_soc.o
--- a/drivers/cam_sensor_module/cam_cci/cam_cci_core.h
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_core.h
@@ -6,7 +6,7 @@
 #define _CAM_CCI_CORE_H_

 #include <linux/irqreturn.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_cci_dev.h"
 #include "cam_cci_soc.h"

--- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
@@ -4,7 +4,7 @@
 */

 #include "cam_cci_dev.h"
-#include "../../cam_req_mgr/cam_req_mgr_dev.h"
+#include "cam_req_mgr_dev.h"
 #include "cam_cci_soc.h"
 #include "cam_cci_core.h"

--- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
@@ -18,14 +18,14 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/semaphore.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
 #include <cam_sensor_cmn_header.h>
 #include <cam_io_util.h>
 #include <cam_sensor_util.h>
-#include "../../cam_req_mgr/cam_subdev.h"
+#include "cam_subdev.h"
 #include <cam_cpas_api.h>
 #include "cam_cci_hwreg.h"
 #include "cam_soc_util.h"
--- a/drivers/cam_sensor_module/cam_csiphy/Makefile
+++ b/drivers/cam_sensor_module/cam_csiphy/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
--- a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
+++ b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
@@ -7,7 +7,7 @@
 #include "cam_req_mgr_dev.h"
 #include "cam_csiphy_soc.h"
 #include "cam_csiphy_core.h"
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>

 static long cam_csiphy_subdev_ioctl(struct v4l2_subdev *sd,
 	unsigned int cmd, void *arg)
--- a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
+++ b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
@@ -18,7 +18,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_defs.h>
+#include <media/cam_defs.h>
 #include <cam_sensor_cmn_header.h>
 #include <cam_req_mgr_interface.h>
 #include <cam_subdev.h>
--- a/drivers/cam_sensor_module/cam_eeprom/Makefile
+++ b/drivers/cam_sensor_module/cam_eeprom/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
--- a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
+++ b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
@@ -5,7 +5,7 @@

 #include <linux/module.h>
 #include <linux/crc32.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>

 #include "cam_eeprom_core.h"
 #include "cam_eeprom_soc.h"
--- a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
+++ b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
@@ -20,7 +20,7 @@
 #include <cam_req_mgr_interface.h>
 #include <cam_mem_mgr.h>
 #include <cam_subdev.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_soc_util.h"
 #include "cam_context.h"

--- a/drivers/cam_sensor_module/cam_flash/Makefile
+++ b/drivers/cam_sensor_module/cam_flash/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
@@ -9,6 +9,7 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_res_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

 obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash_dev.o cam_flash_core.o cam_flash_soc.o
--- a/drivers/cam_sensor_module/cam_flash/cam_flash_core.h
+++ b/drivers/cam_sensor_module/cam_flash/cam_flash_core.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_FLASH_CORE_H_
 #define _CAM_FLASH_CORE_H_

-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_flash_dev.h"

 int cam_flash_publish_dev_info(struct cam_req_mgr_device_info *info);
--- a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
+++ b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
@@ -17,8 +17,8 @@
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <cam_sensor.h>
-#include <cam_req_mgr.h>
+#include <media/cam_sensor.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_util.h"
 #include "cam_req_mgr_interface.h"
 #include "cam_subdev.h"
--- a/drivers/cam_sensor_module/cam_ois/Makefile
+++ b/drivers/cam_sensor_module/cam_ois/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
@@ -8,6 +8,7 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_res_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/

 obj-$(CONFIG_SPECTRA_CAMERA) += cam_ois_dev.o cam_ois_core.o cam_ois_soc.o
--- a/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
+++ b/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
@@ -10,7 +10,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ioctl.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include <cam_sensor_i2c.h>
 #include <cam_sensor_spi.h>
 #include <cam_sensor_io.h>
--- a/drivers/cam_sensor_module/cam_res_mgr/Makefile
+++ b/drivers/cam_sensor_module/cam_res_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-#ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+#ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
--- a/drivers/cam_sensor_module/cam_sensor/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
--- a/drivers/cam_sensor_module/cam_sensor_io/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor_io/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h
@@ -8,7 +8,7 @@

 #include <linux/delay.h>
 #include <media/v4l2-subdev.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_cci_dev.h"
 #include "cam_sensor_io.h"

--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_SENSOR_IO_H_
 #define _CAM_SENSOR_IO_H_

-#include <cam_sensor.h>
+#include <media/cam_sensor.h>

 #include "cam_sensor_cmn_header.h"

--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h
@@ -8,7 +8,7 @@

 #include <linux/spi/spi.h>
 #include <linux/cma.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_sensor_i2c.h"

 #define MAX_SPI_SIZE 110
--- a/drivers/cam_sensor_module/cam_sensor_utils/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor_utils/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h
@@ -13,8 +13,8 @@
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/list.h>
-#include <cam_sensor.h>
-#include <cam_req_mgr.h>
+#include <media/cam_sensor.h>
+#include <media/cam_req_mgr.h>

 #define MAX_REGULATOR 5
 #define MAX_POWER_CONFIG 12
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
@@ -5,7 +5,7 @@

 #include <linux/kernel.h>
 #include "cam_sensor_util.h"
-#include <cam_mem_mgr.h>
+#include "cam_mem_mgr.h"
 #include "cam_res_mgr_api.h"

 #define CAM_SENSOR_PINCTRL_STATE_SLEEP "cam_suspend"
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
@@ -12,9 +12,9 @@
 #include <linux/of_gpio.h>
 #include <linux/of.h>
 #include "cam_sensor_cmn_header.h"
-#include "../../cam_req_mgr/cam_req_mgr_util.h"
-#include "../../cam_req_mgr/cam_req_mgr_interface.h"
-#include "../../cam_req_mgr/cam_mem_mgr.h"
+#include "cam_req_mgr_util.h"
+#include "cam_req_mgr_interface.h"
+#include <cam_mem_mgr.h>
 #include "cam_soc_util.h"
 #include "cam_debug_util.h"
 #include "cam_sensor_io.h"
--- a/drivers/cam_smmu/Makefile
+++ b/drivers/cam_smmu/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

--- a/drivers/cam_smmu/cam_smmu_api.c
+++ b/drivers/cam_smmu/cam_smmu_api.c
@@ -15,7 +15,7 @@
 #include <linux/genalloc.h>
 #include <soc/qcom/scm.h>
 #include <soc/qcom/secure_buffer.h>
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_smmu_api.h"
 #include "cam_debug_util.h"

--- a/drivers/cam_sync/Makefile
+++ b/drivers/cam_sync/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(srctree)/drivers/media/platform/msm/synx
 ccflags-y += -I$(src)
--- a/drivers/cam_utils/Makefile
+++ b/drivers/cam_utils/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
--- a/drivers/cam_utils/cam_trace.c
+++ b/drivers/cam_utils/cam_trace.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
 */

 /* Instantiate tracepoints */
--- a/drivers/cam_utils/cam_trace.h
+++ b/drivers/cam_utils/cam_trace.h
@@ -14,7 +14,7 @@
 #define TRACE_INCLUDE_FILE ../../techpack/camera/drivers/cam_utils/cam_trace

 #include <linux/tracepoint.h>
-#include <uapi/media/cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_core.h"
 #include "cam_req_mgr_interface.h"
 #include "cam_context.h"
--- a/include/uapi/media/cam_cpas.h
+++ b/include/uapi/media/cam_cpas.h
@@ -6,7 +6,7 @@
 #ifndef __UAPI_CAM_CPAS_H__
 #define __UAPI_CAM_CPAS_H__

-#include "cam_defs.h"
+#include <media/cam_defs.h>

 #define CAM_FAMILY_CAMERA_SS     1
 #define CAM_FAMILY_CPAS_SS       2
--- a/include/uapi/media/cam_fd.h
+++ b/include/uapi/media/cam_fd.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
 */

 #ifndef __UAPI_CAM_FD_H__
 #define __UAPI_CAM_FD_H__

-#include "cam_defs.h"
+#include <media/cam_defs.h>

 #define CAM_FD_MAX_FACES                       35
 #define CAM_FD_RAW_RESULT_ENTRIES              512
--- a/include/uapi/media/cam_icp.h
+++ b/include/uapi/media/cam_icp.h
@@ -6,8 +6,8 @@
 #ifndef __UAPI_CAM_ICP_H__
 #define __UAPI_CAM_ICP_H__

-#include "cam_defs.h"
-#include "cam_cpas.h"
+#include <media/cam_defs.h>
+#include <media/cam_cpas.h>

 /* icp, ipe, bps, cdm(ipe/bps) are used in querycap */
 #define CAM_ICP_DEV_TYPE_A5      1
--- a/include/uapi/media/cam_isp.h
+++ b/include/uapi/media/cam_isp.h
@@ -6,10 +6,10 @@
 #ifndef __UAPI_CAM_ISP_H__
 #define __UAPI_CAM_ISP_H__

-#include "cam_defs.h"
-#include "cam_isp_vfe.h"
-#include "cam_isp_ife.h"
-#include "cam_cpas.h"
+#include <media/cam_defs.h>
+#include <media/cam_isp_vfe.h>
+#include <media/cam_isp_ife.h>
+#include <media/cam_cpas.h>

 /* ISP driver name */
 #define CAM_ISP_DEV_NAME                        "cam-isp"
--- a/include/uapi/media/cam_jpeg.h
+++ b/include/uapi/media/cam_jpeg.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
 */

 #ifndef __UAPI_CAM_JPEG_H__
 #define __UAPI_CAM_JPEG_H__

-#include "cam_defs.h"
+#include <media/cam_defs.h>

 /* enc, dma, cdm(enc/dma) are used in querycap */
 #define CAM_JPEG_DEV_TYPE_ENC      0
--- a/include/uapi/media/cam_lrme.h
+++ b/include/uapi/media/cam_lrme.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
 */

 #ifndef __UAPI_CAM_LRME_H__
 #define __UAPI_CAM_LRME_H__

-#include "cam_defs.h"
+#include <media/cam_defs.h>

 /* LRME Resource Types */

--- a/include/uapi/media/cam_req_mgr.h
+++ b/include/uapi/media/cam_req_mgr.h
@@ -10,7 +10,7 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/media.h>
-#include "cam_defs.h"
+#include <media/cam_defs.h>

 #define CAM_REQ_MGR_VNODE_NAME "cam-req-mgr-devnode"

--- a/include/uapi/media/cam_sensor.h
+++ b/include/uapi/media/cam_sensor.h
@@ -8,7 +8,7 @@

 #include <linux/types.h>
 #include <linux/ioctl.h>
-#include "cam_defs.h"
+#include <media/cam_defs.h>

 #define CAM_SENSOR_PROBE_CMD   (CAM_COMMON_OPCODE_MAX + 1)
 #define CAM_FLASH_MAX_LED_TRIGGERS 3