diff --git a/drivers/Makefile b/drivers/Makefile index 13edfb5874..84beb97a75 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,3 +1,5 @@ +subdir-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/camera + obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/ obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/ obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/ diff --git a/drivers/cam_cdm/Makefile b/drivers/cam_cdm/Makefile index 323a523011..9ba81e385a 100644 --- a/drivers/cam_cdm/Makefile +++ b/drivers/cam_cdm/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_core/Makefile b/drivers/cam_core/Makefile index e117039fc3..d8dd1a4894 100644 --- a/drivers/cam_core/Makefile +++ b/drivers/cam_core/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_cpas/Makefile b/drivers/cam_cpas/Makefile index 6fc8f9830c..947fbbf7d9 100644 --- a/drivers/cam_cpas/Makefile +++ b/drivers/cam_cpas/Makefile @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -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 -#ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/cpas_top -#ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/camss_top ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree) diff --git a/drivers/cam_cpas/camss_top/Makefile b/drivers/cam_cpas/camss_top/Makefile index de11b71365..8fc199fcf9 100644 --- a/drivers/cam_cpas/camss_top/Makefile +++ b/drivers/cam_cpas/camss_top/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_cpas/cpas_top/Makefile b/drivers/cam_cpas/cpas_top/Makefile index 0306b14ef1..cbd65d8fdd 100644 --- a/drivers/cam_cpas/cpas_top/Makefile +++ b/drivers/cam_cpas/cpas_top/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_cust/cam_custom_context.h b/drivers/cam_cust/cam_custom_context.h index 91acf1e5ee..1c4b70abf3 100644 --- a/drivers/cam_cust/cam_custom_context.h +++ b/drivers/cam_cust/cam_custom_context.h @@ -7,8 +7,9 @@ #define _CAM_CUSTOM_CONTEXT_H_ #include -#include -#include + +#include +#include #include "cam_context.h" #include "cam_custom_hw_mgr_intf.h" diff --git a/drivers/cam_cust/cam_custom_dev.c b/drivers/cam_cust/cam_custom_dev.c index 76d4a7d0e1..da95f36b9d 100644 --- a/drivers/cam_cust/cam_custom_dev.c +++ b/drivers/cam_cust/cam_custom_dev.c @@ -12,7 +12,8 @@ #include #include -#include +#include + #include "cam_custom_dev.h" #include "cam_hw_mgr_intf.h" #include "cam_custom_hw_mgr_intf.h" diff --git a/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c b/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c index 1db06bb3ab..694ac1bee2 100644 --- a/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c +++ b/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c @@ -7,9 +7,11 @@ #include #include #include + #include -#include +#include #include + #include "cam_sync_api.h" #include "cam_smmu_api.h" #include "cam_req_mgr_workq.h" diff --git a/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h b/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h index 64f4555528..4a9b27be74 100644 --- a/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h +++ b/drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h @@ -12,8 +12,9 @@ #include "cam_ife_csid_hw_intf.h" #include "cam_isp_hw.h" #include "cam_custom_hw.h" -#include -#include + +#include +#include enum cam_custom_hw_mgr_res_type { CAM_CUSTOM_HW_SUB_MODULE, diff --git a/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h b/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h index 0fd557c140..c1d6a258cc 100644 --- a/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h +++ b/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h @@ -9,7 +9,8 @@ #include #include #include -#include + +#include enum cam_custom_hw_resource_state { CAM_CUSTOM_HW_RESOURCE_STATE_UNAVAILABLE = 0, diff --git a/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h b/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h index b1fb1cb429..85492be281 100644 --- a/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h +++ b/drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h @@ -9,7 +9,9 @@ #include #include #include -#include + +#include + #include "cam_hw.h" #include "cam_hw_mgr_intf.h" #include "cam_hw_intf.h" diff --git a/drivers/cam_fd/Makefile b/drivers/cam_fd/Makefile index 92356a35d8..e74167e061 100644 --- a/drivers/cam_fd/Makefile +++ b/drivers/cam_fd/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_fd/fd_hw_mgr/Makefile b/drivers/cam_fd/fd_hw_mgr/Makefile index 8db8097679..7857618bd5 100644 --- a/drivers/cam_fd/fd_hw_mgr/Makefile +++ b/drivers/cam_fd/fd_hw_mgr/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_icp/Makefile b/drivers/cam_icp/Makefile index aec65fc06f..98a9ed931e 100644 --- a/drivers/cam_icp/Makefile +++ b/drivers/cam_icp/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 @@ -9,7 +8,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/icp_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/fw_inc -ccflags-y += -I$(srctree)/techpack/camera ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/ diff --git a/drivers/cam_icp/icp_hw/Makefile b/drivers/cam_icp/icp_hw/Makefile index 68b36f7066..5b61366cc5 100644 --- a/drivers/cam_icp/icp_hw/Makefile +++ b/drivers/cam_icp/icp_hw/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_isp/Makefile b/drivers/cam_isp/Makefile index 86ad96d61c..6459d44930 100644 --- a/drivers/cam_isp/Makefile +++ b/drivers/cam_isp/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c index 3c82c6b2f8..b49b04a49e 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c @@ -7,8 +7,10 @@ #include #include #include + #include -#include +#include + #include "cam_smmu_api.h" #include "cam_req_mgr_workq.h" #include "cam_isp_hw_mgr_intf.h" diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c index af9f67286d..b87f79f708 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c @@ -5,8 +5,9 @@ #include #include -#include -#include + +#include +#include #include diff --git 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 index 314ebff70f..28e4218a7b 100644 --- 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 @@ -5,7 +5,9 @@ #include #include -#include + +#include + #include "cam_io_util.h" #include "cam_debug_util.h" #include "cam_cdm_util.h" diff --git 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 index cae1253158..2351afcbf1 100644 --- 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 @@ -6,7 +6,9 @@ #include #include -#include + +#include + #include "cam_io_util.h" #include "cam_debug_util.h" #include "cam_cdm_util.h" diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h index 97336a2da3..2548c36016 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h @@ -6,7 +6,8 @@ #ifndef _CAM_VFE_BUS_H_ #define _CAM_VFE_BUS_H_ -#include +#include + #include "cam_hw_intf.h" #include "cam_isp_hw.h" diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c index 98c84ad77d..7815da6748 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c @@ -4,7 +4,9 @@ */ #include -#include + +#include + #include "cam_io_util.h" #include "cam_isp_hw_mgr_intf.h" #include "cam_isp_hw.h" diff --git a/drivers/cam_jpeg/Makefile b/drivers/cam_jpeg/Makefile index 471f870e4c..03a132a8f8 100644 --- a/drivers/cam_jpeg/Makefile +++ b/drivers/cam_jpeg/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_lrme/Makefile b/drivers/cam_lrme/Makefile index 72cdba4da0..6aa9701dbd 100644 --- a/drivers/cam_lrme/Makefile +++ b/drivers/cam_lrme/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_lrme/lrme_hw_mgr/Makefile b/drivers/cam_lrme/lrme_hw_mgr/Makefile index 3387c3d0f0..37cd971bdc 100644 --- a/drivers/cam_lrme/lrme_hw_mgr/Makefile +++ b/drivers/cam_lrme/lrme_hw_mgr/Makefile @@ -9,7 +9,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw -ccflags-y += -I$(srctree)/techpack/camera ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include obj-$(CONFIG_SPECTRA_CAMERA) += lrme_hw/ diff --git a/drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile b/drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile index 8df30c0f44..a1a15add92 100644 --- a/drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile +++ b/drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile @@ -9,7 +9,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw -ccflags-y += -I$(srctree)/techpack/camera0 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme_hw_dev.o cam_lrme_hw_core.o cam_lrme_hw_soc.o diff --git a/drivers/cam_req_mgr/Makefile b/drivers/cam_req_mgr/Makefile index 50599d8792..6856883534 100644 --- a/drivers/cam_req_mgr/Makefile +++ b/drivers/cam_req_mgr/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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_utils diff --git a/drivers/cam_sensor_module/cam_actuator/Makefile b/drivers/cam_sensor_module/cam_actuator/Makefile index e61c6eeba3..480cea7677 100644 --- a/drivers/cam_sensor_module/cam_actuator/Makefile +++ b/drivers/cam_sensor_module/cam_actuator/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_cci/Makefile b/drivers/cam_sensor_module/cam_cci/Makefile index a1301bf41d..4a93880a72 100644 --- a/drivers/cam_sensor_module/cam_cci/Makefile +++ b/drivers/cam_sensor_module/cam_cci/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_csiphy/Makefile b/drivers/cam_sensor_module/cam_csiphy/Makefile index d98b845743..3cbc09d0b1 100644 --- a/drivers/cam_sensor_module/cam_csiphy/Makefile +++ b/drivers/cam_sensor_module/cam_csiphy/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_eeprom/Makefile b/drivers/cam_sensor_module/cam_eeprom/Makefile index 7a676c1135..f978136982 100644 --- a/drivers/cam_sensor_module/cam_eeprom/Makefile +++ b/drivers/cam_sensor_module/cam_eeprom/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_flash/Makefile b/drivers/cam_sensor_module/cam_flash/Makefile index da9e9e1b19..967d50dd25 100644 --- a/drivers/cam_sensor_module/cam_flash/Makefile +++ b/drivers/cam_sensor_module/cam_flash/Makefile @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_ois/Makefile b/drivers/cam_sensor_module/cam_ois/Makefile index fa7fabc0f0..8658af35e4 100644 --- a/drivers/cam_sensor_module/cam_ois/Makefile +++ b/drivers/cam_sensor_module/cam_ois/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_res_mgr/Makefile b/drivers/cam_sensor_module/cam_res_mgr/Makefile index 1c8ccb0e3b..d0ba37e376 100644 --- a/drivers/cam_sensor_module/cam_res_mgr/Makefile +++ b/drivers/cam_sensor_module/cam_res_mgr/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -#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 diff --git a/drivers/cam_sensor_module/cam_sensor/Makefile b/drivers/cam_sensor_module/cam_sensor/Makefile index d3a6fbb6c3..77ccd7fe2c 100644 --- a/drivers/cam_sensor_module/cam_sensor/Makefile +++ b/drivers/cam_sensor_module/cam_sensor/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_sensor_io/Makefile b/drivers/cam_sensor_module/cam_sensor_io/Makefile index 5b11171fa0..b41cd60c6c 100644 --- a/drivers/cam_sensor_module/cam_sensor_io/Makefile +++ b/drivers/cam_sensor_module/cam_sensor_io/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sensor_module/cam_sensor_utils/Makefile b/drivers/cam_sensor_module/cam_sensor_utils/Makefile index d822b2a733..8c76ba286e 100644 --- a/drivers/cam_sensor_module/cam_sensor_utils/Makefile +++ b/drivers/cam_sensor_module/cam_sensor_utils/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_smmu/Makefile b/drivers/cam_smmu/Makefile index b674b48ceb..89b2c967ce 100644 --- a/drivers/cam_smmu/Makefile +++ b/drivers/cam_smmu/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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 diff --git a/drivers/cam_sync/Makefile b/drivers/cam_sync/Makefile index 40efdf4dd7..2f3247cb08 100644 --- a/drivers/cam_sync/Makefile +++ b/drivers/cam_sync/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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) diff --git a/drivers/cam_utils/Makefile b/drivers/cam_utils/Makefile index e17c2f50bb..931478f067 100644 --- a/drivers/cam_utils/Makefile +++ b/drivers/cam_utils/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -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/ diff --git a/drivers/cam_utils/cam_soc_util.h b/drivers/cam_utils/cam_soc_util.h index ad2382b835..f31ee9f406 100644 --- a/drivers/cam_utils/cam_soc_util.h +++ b/drivers/cam_utils/cam_soc_util.h @@ -18,7 +18,7 @@ #include #include "cam_io_util.h" -#include +#include #define NO_SET_RATE -1 #define INIT_RATE -2 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild new file mode 100644 index 0000000000..f84da02a5a --- /dev/null +++ b/include/uapi/Kbuild @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note + +# Legacy file used for kernel 4.19.x build system to install +# UAPI headers. + +header-y += camera/media/cam_cpas.h +header-y += camera/media/cam_custom.h +header-y += camera/media/cam_defs.h +header-y += camera/media/cam_fd.h +header-y += camera/media/cam_icp.h +header-y += camera/media/cam_isp_ife.h +header-y += camera/media/cam_isp_vfe.h +header-y += camera/media/cam_isp.h +header-y += camera/media/cam_jpeg.h +header-y += camera/media/cam_lrme.h +header-y += camera/media/cam_req_mgr.h +header-y += camera/media/cam_sensor.h +header-y += camera/media/cam_sync.h