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

Commit 1eb162cc authored by Haritha Chintalapati's avatar Haritha Chintalapati Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: tfe: Enable TFE and OPE for bengal" into camera-kernel.lnx.4.0

parents 79f9e08a 97eeefea

config/bengalcamera.conf

+2 −4
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ 
# Copyright (c) 2019, The Linux Foundation. All rights reserved.



export CONFIG_SPECTRA_CAMERA=y

export CONFIG_SPECTRA_TFE=y

export CONFIG_SPECTRA_ISP=y

export CONFIG_SPECTRA_SENSOR=y

export CONFIG_SPECTRA_ICP=y

export CONFIG_SPECTRA_JPEG=y

export CONFIG_SPECTRA_LRME=y

export CONFIG_SPECTRA_FD=y
 
export CONFIG_SPECTRA_OPE=y

config/bengalcameraconf.h

+3 −5
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-2020, The Linux Foundation. All rights reserved.

 */



#define CONFIG_SPECTRA_CAMERA 1

#define CONFIG_SPECTRA_TFE    1

#define CONFIG_SPECTRA_ISP    1

#define CONFIG_SPECTRA_SENSOR 1

#define CONFIG_SPECTRA_ICP    1

#define CONFIG_SPECTRA_JPEG   1

#define CONFIG_SPECTRA_LRME   1

#define CONFIG_SPECTRA_FD     1

#define CONFIG_SPECTRA_OPE    1

drivers/cam_cpas/cam_cpas_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ static int cam_cpas_hw_stop(void *hw_priv, void *stop_args, 
			CAM_ERR(CAM_CPAS, "disable_resorce failed, rc=%d", rc);

			goto done;

		}

		CAM_DBG(CAM_CPAS, "Disabled all the resources: irq_count=%d\n",

		CAM_DBG(CAM_CPAS, "Disabled all the resources: irq_count=%d",

			atomic_read(&cpas_core->irq_count));

		cpas_hw->hw_state = CAM_HW_STATE_POWER_DOWN;

	}

drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi100.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static const struct of_device_id cam_csid_ppi100_dt_match[] = { 


MODULE_DEVICE_TABLE(of, cam_csid_ppi100_dt_match);



static struct platform_driver cam_csid_ppi100_driver = {

struct platform_driver cam_csid_ppi100_driver = {

	.probe  = cam_csid_ppi_probe,

	.remove = cam_csid_ppi_remove,

	.driver = {

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,8 @@ int cam_tfe_csid_hw_probe_init(struct cam_hw_intf *csid_hw_intf, 
	for (i = 0; i < CAM_CSID_PPI_HW_MAX; i++) {

		rc = cam_csid_ppi_hw_init(&tfe_csid_hw->ppi_hw_intf[i], i);

		if (rc < 0) {

			CAM_ERR(CAM_ISP, "PPI init failed for PPI %d", i);

			CAM_INFO(CAM_ISP, "PPI init failed for PPI %d", i);

			rc = 0;

			break;

		}

	}