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

Commit 0acfa541 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: trinket: Enable camera driver support for trinket"

parents 3447c3d1 4c5ca3e8

arch/arm64/configs/vendor/trinket_defconfig

+27 −3
Original line number Diff line number Diff line
@@ -383,7 +383,33 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SPECTRA_CAMERA=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y
@@ -464,8 +490,6 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QTI_TRI_LED=y

drivers/media/platform/msm/camera_v2/isp/msm_isp.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -668,7 +668,7 @@ int vfe_hw_probe(struct platform_device *pdev) 
	ISP_DBG("%s: device id = %d\n", __func__, pdev->id);



	vfe_dev->pdev = pdev;

	hw_info = &vfe_dev->hw_info;

	hw_info = vfe_dev->hw_info;



	rc = vfe_dev->hw_info->vfe_ops.platform_ops.get_platform_data(vfe_dev);

	if (rc < 0) {

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2372,7 +2372,7 @@ static void msm_isp_input_disable(struct vfe_device *vfe_dev, int cmd_type) 
			vfe_dev->hw_info->vfe_ops.core_ops.update_camif_state(

				vfe_dev, DISABLE_CAMIF);

	}

	hw_info = &vfe_dev->hw_info;

	hw_info = vfe_dev->hw_info;

	/*

	 * halt and reset hardware if all streams are disabled, in this case

	 * ispif is halted immediately as well

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2156,7 +2156,7 @@ irqreturn_t msm_isp_process_irq(int irq_num, void *data) 
	ping_pong_status =

		vfe_dev->hw_info->vfe_ops.axi_ops.get_pingpong_status(vfe_dev);



	hw_info = &vfe_dev->hw_info;

	hw_info = vfe_dev->hw_info;

	/* Get the dual IRQ status in dual mode*/

	if (vfe_dev->dual_vfe_sync_mode)

		hw_info->vfe_ops.irq_ops.read_and_clear_dual_irq_status(