Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca0de993 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: common: Correct compilation flag for TFE hw" into camera-kernel.lnx.4.0

parents a4f5f1e5 5c24b7d2

drivers/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ camera-$(CONFIG_SPECTRA_ISP) += \ 
	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_dev.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_soc.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_core.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_ver1.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_ver2.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg.o \

	cam_isp/isp_hw_mgr/cam_isp_hw_mgr.o \
@@ -195,8 +196,7 @@ camera-$(CONFIG_SPECTRA_OPE) += \ 
	cam_ope/ope_hw_mgr/ope_hw/bus_rd/ope_bus_rd.o\

	cam_ope/ope_hw_mgr/ope_hw/bus_wr/ope_bus_wr.o



camera-$(CONFIG_SPECTRA_CAMERA) += \

	cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.o \

camera-$(CONFIG_SPECTRA_TFE) += \

	cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_soc.o \

	cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_dev.o \

	cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.o \
@@ -206,11 +206,7 @@ camera-$(CONFIG_SPECTRA_CAMERA) += \ 
	cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.o \

	cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.o \

	cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_dev.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_soc.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_core.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_ver1.o \

	cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg.o

	cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.o





camera-y += camera_main.o

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.h

+8 −0
Original line number Diff line number Diff line
@@ -191,6 +191,14 @@ struct cam_tfe_hw_event_recovery_data { 
 * @iommu_hdl:          Iommu handle to be returned

 *

 */

#ifdef CONFIG_SPECTRA_TFE

int cam_tfe_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf, int *iommu_hdl);



#else

static inline int cam_tfe_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf,

	int *iommu_hdl) {

	return -EINVAL;

}

#endif



#endif /* _CAM_TFE_HW_MGR_H_ */

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/Makefile

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



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_cdm/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

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/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/isp_hw/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/



obj-$(CONFIG_SPECTRA_CAMERA) += cam_tfe_csid_dev.o cam_tfe_csid_soc.o cam_tfe_csid_core.o

obj-$(CONFIG_SPECTRA_CAMERA) += cam_tfe_csid530.o

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/Makefile

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



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_cdm/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

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/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/isp_hw/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller



obj-$(CONFIG_SPECTRA_CAMERA) += cam_tfe_soc.o cam_tfe_dev.o cam_tfe_core.o cam_tfe_bus.o cam_tfe.o