msm: camera: common: Merge camera-kernel.3.1 changes in camera-kernel.4.0
msm: camera: tfe: Fix variable initialization issues msm: camera: isp: Dual tfe event check with proper hw idx msm: camera: smmu: Add support for non-contiguous mermory region msm: camera: smmu: Use iommu best match algo for camera msm: camera: ope: Optimize allocation of IO configuration msm: camera: ope: Fix for KW Issues msm: camera: ope: Add support for stripe level height configuration msm: camera: tfe: Enable the delay line clc msm: camera: ope: Fix false alarm for OPE HW timeout msm: camera: tfe: Support register dump per request msm: camera: ope: Increase max number of stripes msm: camera: ope: Change packer and unpacker format in case NV12 msm: camera: tfe: Add packet code get command for tfe msm: camera: ope: Trigger recovery in case of violation on write bus msm: camera: ope: Protect ope hw reset with mutex msm: camera: ope: Add a check for valid request in cdm callback msm: camera: ope: Remove the BW & clock vote in release context msm: camera: ope: Reduce OPE BUS memory msm: camera: ope: Fix return value for ope acquire msm: camera: ope: Fix false alarm for OPE request timeout msm: camera: ope: Avoid deadlock during recovery after HW hang msm: camera: tfe: tfe debug enhancement msm: camera: cdm: Fix irq_data value in case of inline irq msm: camera: flash: Switch off flash on provider crash msm: camera: ope: Initialize ope hw mutex structure msm: camera: cdm: Flush all available FIFOs during reset msm: camera: cpas: Add mandatory bw option for axi ports clocks msm: camera: ope: Use vzalloc to allocate the write bus ctx structure msm: camera: ope: Fix handling of init hw failure msm: camera: tfe: Enable per frame register dump for rdi only context msm: camera: cdm: Protect cdm core status bits with mutex msm: camera: cdm: correct the error check in cmd submit irq msm: camera: ope: Fix unclock access during HW reset msm: camera: ope: Program frame level settings after idle event msm: camera: ope: Delay releasing of resources for last context msm: camera: isp: Increase default SOF freeze timeout msm: camera: smmu: Add map and unmap monitor msm: camera: isp: Add trace events across ISP msm: camera: smmu: Profile time taken for map, unmap msm: camera: ope: Start context timer on receiving new request msm: camera: tfe: Reduce stack size during set axi bw msm: camera: cdm: Check for HW state before dumping registers msm: camera: ope: Reduce stack footprint during acquire msm: camera: tfe: Disable clock if tfe2 is not supported msm: camera: cdm: Avoid cdm pause incase of BL submit msm: camera: tfe: Optimize CSID IRQ logging msm: camera: ope: Move request id validity check outside of lock msm: camera: tfe: Correct the tfe hw manager dump logic msm: camera: ope: Synchronize flush and submit BLs msm: camera: cdm: Protect cdm reset status msm: camera: cdm: Handle cdm deinit sequence properly msm: camera: tfe: Reduce reset timeout to 100ms msm: camera: ope: Fix hang detection msm: camera: ope: Make non-fatal logs as debug and info logs msm: camera: tfe: set overflow pending bit to zero after HW reset msm: camera: ope: Do not disable CDM during error handling msm: camera: ope: Add support for OPE Replay msm: camera: ope: Stop OPE in case of init failure msm: camera: ope: Synchronize process cmd and flush request msm: camera: cdm: Fix CDM IRQ handling msm: camera: tfe: LDAR dump for TFE msm: camera: ope: Fix the length check for debug buffer msm: camera: cdm: Fix CDM reset logic msm: camera: ope: Dump debug registers in case of HW hang msm: camera: tfe: Support the RDI bus port for line based mode msm: camera: cdm: Handle out of order reset done events msm: camera: ope: Consider other contexts during timeout msm: camera: ope: Put GenIRQ in last stripe BL msm: camera: tfe: Process the rdi interrupts for rdi only resource msm: camera: jpeg: Check the HW state before accessing register msm: camera: csiphy: Update csiphy power-up sequence for lito v2 msm: camera: cdm: Secure freeing of request lists using locks msm: camera: cpas: Add support for Scuba camnoc msm: camera: csiphy: Clear secure phy flags on release msm: camera: tfe: validate the tfe bw num paths msm: camera: ope: Reorder the reset order in ope acquire msm: camera: ope: Dump debug registers in case of reset failure msm: camera: ope: Add logic to detect hang in CDM msm: camera: isp: Increase max count of cfg to support more init packets msm: camera: core: Fix cpas axi clk rate overflow. CRs-Fixed: 2668666 Change-Id: I882ca4bd117bebc7d1c62bc82299d69d7b5c9388 Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
This commit is contained in:
@@ -415,7 +415,7 @@ long cam_soc_util_get_clk_round_rate(struct cam_hw_soc_info *soc_info,
|
||||
* @return: success or failure
|
||||
*/
|
||||
int cam_soc_util_set_src_clk_rate(struct cam_hw_soc_info *soc_info,
|
||||
int32_t clk_rate);
|
||||
int64_t clk_rate);
|
||||
|
||||
/**
|
||||
* cam_soc_util_get_option_clk_by_name()
|
||||
@@ -657,7 +657,7 @@ int cam_soc_util_clk_enable_default(struct cam_hw_soc_info *soc_info,
|
||||
enum cam_vote_level clk_level);
|
||||
|
||||
int cam_soc_util_get_clk_level(struct cam_hw_soc_info *soc_info,
|
||||
int32_t clk_rate, int clk_idx, int32_t *clk_lvl);
|
||||
int64_t clk_rate, int clk_idx, int32_t *clk_lvl);
|
||||
|
||||
/* Callback to get reg space data for specific HW */
|
||||
typedef int (*cam_soc_util_regspace_data_cb)(uint32_t reg_base_type,
|
||||
|
Reference in New Issue
Block a user