Merge "msm: camera: cci: Add sysfs utility to control cci and sensor powerup" into camera-kernel.qclinux.1.0

Author: Camera Software Integration

Kbuild

@@ -496,6 +496,9 @@ camera_$(CAMERA_ARCH)-$(CONFIG_SPECTRA_TFE) += \
 	camera/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid.o \
 	camera/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.o
 
+camera_$(CAMERA_ARCH)-$(CONFIG_SPECTRA_SENSOR_SYSFS_UTIL) += \
+	camera/drivers/cam_sensor_module/cam_cci/cam_cci_sysfs_util.o
+
 camera_$(CAMERA_ARCH)-y += camera/drivers/camera_main.o
 
 obj-m += camera_$(CAMERA_ARCH).o

camera/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

@@ -770,6 +770,13 @@ static int cam_cci_component_bind(struct device *dev,
 		CAM_WARN(CAM_CCI, "debugfs creation failed");
 		rc = 0;
 	}
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+	if (cam_sysfs_add_cci(new_cci_dev)) {
+		CAM_DBG(CAM_CCI, "CCI%d sysfs creation success", soc_info->index);
+	} else {
+		CAM_DBG(CAM_CCI, "CCI%d sysfs creation failed", soc_info->index);
+	}
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
 	head = 0;
 	tail = 0;
 	CAM_DBG(CAM_CCI, "Component bound successfully");
@@ -809,11 +816,13 @@ static void cam_cci_component_unbind(struct device *dev,
 
 	cam_cpas_unregister_client(cci_dev->cpas_handle);
 	debugfs_root = NULL;
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+	cam_sysfs_remove_cci(cci_dev);
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
 	cam_cci_soc_remove(pdev, cci_dev);
 	rc = cam_unregister_subdev(&(cci_dev->v4l2_dev_str));
 	if (rc < 0)
 		CAM_ERR(CAM_CCI, "Fail with cam_unregister_subdev. rc:%d", rc);
-
 	devm_kfree(&pdev->dev, cci_dev);
 }
 
@@ -865,6 +874,9 @@ int cam_cci_init_module(void)
 
 void cam_cci_exit_module(void)
 {
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+	cam_sysfs_exit();
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
 	platform_driver_unregister(&cci_driver);
 }
 

camera/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #ifndef _CAM_CCI_DEV_H_
@@ -181,6 +181,15 @@ enum cam_cci_state_t {
 	CCI_STATE_DISABLED,
 };
 
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+struct cci_sysfs {
+	int32_t master;
+	int32_t cci_dev;
+	struct kobject sysfs_kobj;
+	struct mutex cci_mutex;
+};
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
+
 /**
  * struct cci_device
  * @pdev:                       Platform device
@@ -253,6 +262,10 @@ struct cci_device {
 	struct mutex init_mutex;
 	uint64_t  dump_en;
 	bool is_probing;
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+	struct cci_sysfs cci_master_sysfs[MASTER_MAX];
+	int32_t num_masters;
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
 };
 
 enum cam_cci_i2c_cmd_type {
@@ -332,6 +345,17 @@ struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index);
 void cam_cci_dump_registers(struct cci_device *cci_dev,
 		enum cci_i2c_master_t master, enum cci_i2c_queue_t queue);
 
+#ifdef CONFIG_SPECTRA_SENSOR_SYSFS_UTIL
+/**
+ * @brief       : API to update client bus information.
+ * @bus_id      : cci bus id, this is basically cci cel index
+ * @cci_dev     : cci device handle
+ * @master_id   : master id of the client
+ */
+int32_t cam_cci_get_bus_info(int32_t bus_id, int32_t cci_idx,
+	int32_t *cci_dev, int32_t *master_id);
+#endif /*CONFIG_SPECTRA_SENSOR_SYSFS_UTIL*/
+
 /**
  * @brief : API to register CCI hw to platform framework.
  * @return struct platform_device pointer on on success, or ERR_PTR() on error.