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

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

Merge "msm: camera: cpas: Increase number of cpas clients"

parents 69241812 54eab2c2

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

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

 */



#ifndef _CAM_CPAS_HW_H_
@@ -10,7 +10,7 @@ 
#include "cam_cpas_hw_intf.h"

#include "cam_common_util.h"



#define CAM_CPAS_MAX_CLIENTS 30

#define CAM_CPAS_MAX_CLIENTS 40

#define CAM_CPAS_INFLIGHT_WORKS 5



#define CAM_CPAS_AXI_MIN_MNOC_AB_BW   (2048 * 1024)

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_soc.c

+7 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

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

 */



#include <linux/device.h>
@@ -66,7 +66,13 @@ int cam_cpas_get_custom_dt_info(struct platform_device *pdev, 
		CAM_ERR(CAM_CPAS, "no client-names found");

		count = 0;

		return -EINVAL;

	} else if (count > CAM_CPAS_MAX_CLIENTS) {

		CAM_ERR(CAM_CPAS, "Number of clients %d greater than max %d",

			count, CAM_CPAS_MAX_CLIENTS);

		count = 0;

		return -EINVAL;

	}



	soc_private->num_clients = count;

	CAM_DBG(CAM_CPAS,

		"arch-compat=%s, client_id_based = %d, num_clients=%d",

drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.c

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

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

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

 */



#include "cam_cci_dev.h"
@@ -395,7 +395,7 @@ static int cam_cci_platform_probe(struct platform_device *pdev) 
	}



	g_cci_subdev[soc_info->index] = &new_cci_dev->v4l2_dev_str.sd;

	CAM_ERR(CAM_CCI, "Device Type :%d", soc_info->index);

	CAM_INFO(CAM_CCI, "Device Type :%d", soc_info->index);



	cam_register_subdev_fops(&cci_v4l2_subdev_fops);

	cci_v4l2_subdev_fops.unlocked_ioctl = cam_cci_subdev_fops_ioctl;