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

Commit 8f6e1ddf authored by Vishalsingh Hajeri's avatar Vishalsingh Hajeri
Browse files

Revert "msm: camera: isp: Add support for BUS driver version 175" 



This reverts commit 7ef5d124.
The change being reverted was made to add support for new DISP
ports on newer targets. These ports are not present on sdm845
and older targets. Therefore that change is not needed on 4.9
branch.

Change-Id: I766feded6e4d30227a0bad572d5133899d3abc55
Signed-off-by: default avatarVishalsingh Hajeri <vhajeri@codeaurora.org>
parent f5f97930

Documentation/devicetree/bindings/media/video/msm-cam-vfe.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe-lite175", "qcom,vfe-lite170".

    driver. e.g. "qcom,vfe170", "qcom,vfe-lite170".



- cell-index

  Usage: required

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.h

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
/*

 * Maximum hw resource - This number is based on the maximum

 * output port resource. The current maximum resource number

 * is 24.

 * is 20.

 */

#define CAM_ISP_CTX_RES_MAX                     24

#define CAM_ISP_CTX_RES_MAX                     20



/*

 * Maximum configuration entry size  - This is based on the

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_h 




obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe_soc.o cam_vfe_dev.o cam_vfe_core.o

obj-$(CONFIG_SPECTRA_CAMERA) += vfe_bus/ vfe_top/ vfe17x/
 
 No newline at end of file
 
obj-$(CONFIG_SPECTRA_CAMERA) += vfe_bus/ vfe_top/ vfe170/
 
 No newline at end of file

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static uint32_t camif_irq_reg_mask[CAM_IFE_IRQ_REGISTERS_MAX] = { 


static uint32_t camif_irq_err_reg_mask[CAM_IFE_IRQ_REGISTERS_MAX] = {

	0x0003FC00,

	0xEFFF7EBC,

	0x0FFF7EBC,

};



static uint32_t rdi_irq_reg_mask[CAM_IFE_IRQ_REGISTERS_MAX] = {

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/Makefile→drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe170/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_h 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw



obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe17x.o cam_vfe_lite170.o
 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe170.o cam_vfe_lite170.o