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

Commit 8010edb3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 786e1d8b on remote branch 

Change-Id: I22ba3662e4b5d50fd572c317722ea243b54c8026
parents d6ba4387 786e1d8b

config/bengalcamera.conf

+6 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Copyright (c) 2019, The Linux Foundation. All rights reserved.

# Copyright (c) 2019,2021 The Linux Foundation. All rights reserved.



export CONFIG_SPECTRA_CAMERA=y

$(info "BENGAL SPECTRA_CAMERA IS MODULAR")

export CONFIG_SPECTRA_CAMERA=m



ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))

export CONFIG_SPECTRA_TFE=y

export CONFIG_SPECTRA_ISP=y

export CONFIG_SPECTRA_SENSOR=y

export CONFIG_SPECTRA_OPE=y

endif
 
 No newline at end of file

drivers/cam_isp/cam_isp_context.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ static int __cam_isp_ctx_handle_buf_done_for_req_list( 
		req_isp->cdm_reset_before_apply = false;

		req_isp->num_acked = 0;

		req_isp->num_deferred_acks = 0;

		req_isp->bubble_detected = false;

		/*

		 * Only update the process_bubble and bubble_frame_cnt

		 * when bubble is detected on this req, in case the other
@@ -875,6 +874,7 @@ static int __cam_isp_ctx_handle_buf_done_for_req_list( 
		if (req_isp->bubble_detected) {

			atomic_set(&ctx_isp->process_bubble, 0);

			ctx_isp->bubble_frame_cnt = 0;

			req_isp->bubble_detected = false;

		}



		CAM_DBG(CAM_REQ,

drivers/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_1_hwreg.h

+10 −10
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ csiphy_reg_t csiphy_2ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0000, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0014, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0024, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -93,7 +93,7 @@ csiphy_reg_t csiphy_2ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x070c, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0714, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0724, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -115,7 +115,7 @@ csiphy_reg_t csiphy_2ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0200, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0214, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0224, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -137,7 +137,7 @@ csiphy_reg_t csiphy_2ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0400, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0414, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0424, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -159,7 +159,7 @@ csiphy_reg_t csiphy_2ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0600, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x060c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0614, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0624, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -185,7 +185,7 @@ struct csiphy_reg_t 
		{0x0000, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0014, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0024, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -207,7 +207,7 @@ struct csiphy_reg_t 
		{0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x070c, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0714, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0724, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -229,7 +229,7 @@ struct csiphy_reg_t 
		{0x0200, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0214, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0224, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -251,7 +251,7 @@ struct csiphy_reg_t 
		{0x0400, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x040C, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0414, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0428, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0424, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -273,7 +273,7 @@ struct csiphy_reg_t 
		{0x0600, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x060C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0638, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0614, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0628, 0x0E, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0624, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

drivers/cam_sensor_module/cam_flash/cam_flash_soc.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/of_gpio.h>

#include "cam_flash_soc.h"

#include "cam_res_mgr_api.h"

#include <dt-bindings/msm/msm-camera.h>



void cam_flash_put_source_node_data(struct cam_flash_ctrl *fctrl)

{
@@ -77,6 +78,7 @@ static int32_t cam_get_source_node_info( 
	if (rc) {

		CAM_ERR(CAM_FLASH,

			"flash-type read failed rc=%d", rc);

		soc_private->flash_type = CAM_FLASH_TYPE_PMIC; // default to PMIC flash

	}



	switch_src_node = of_parse_phandle(of_node, "switch-source", 0);