diff --git a/drivers/cam_icp/cam_icp_subdev.c b/drivers/cam_icp/cam_icp_subdev.c index 801c885914..d4c7e025af 100644 --- a/drivers/cam_icp/cam_icp_subdev.c +++ b/drivers/cam_icp/cam_icp_subdev.c @@ -205,7 +205,7 @@ static int cam_icp_component_bind(struct device *dev, g_icp_dev.open_cnt = 0; mutex_init(&g_icp_dev.icp_lock); - CAM_INFO(CAM_ICP, "Component bound successfully"); + CAM_DBG(CAM_ICP, "Component bound successfully"); return rc; diff --git a/drivers/cam_isp/cam_isp_dev.c b/drivers/cam_isp/cam_isp_dev.c index 322ee3d854..a8c56ae192 100644 --- a/drivers/cam_isp/cam_isp_dev.c +++ b/drivers/cam_isp/cam_isp_dev.c @@ -161,7 +161,7 @@ static int cam_isp_dev_component_bind(struct device *dev, mutex_init(&g_isp_dev.isp_mutex); - CAM_INFO(CAM_ISP, "Component bound successfully"); + CAM_DBG(CAM_ISP, "Component bound successfully"); return 0; unregister: diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c index c0b555d370..6f4152671f 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c @@ -149,7 +149,7 @@ int cam_vfe_init_soc_resources(struct cam_hw_soc_info *soc_info, CAM_VFE_DSP_CLK_NAME, &soc_private->dsp_clk, &soc_private->dsp_clk_index, &soc_private->dsp_clk_rate); if (rc) - CAM_WARN(CAM_ISP, "Option clk get failed with rc %d", rc); + CAM_DBG(CAM_ISP, "Option clk get failed with rc %d", rc); rc = cam_vfe_request_platform_resource(soc_info, vfe_irq_handler, irq_data); diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c index 67c59bc0e2..a7ee65edb3 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c @@ -3581,7 +3581,7 @@ static int cam_vfe_bus_ver3_init_hw(void *hw_priv, } /* no clock gating at bus input */ - CAM_INFO(CAM_ISP, "Overriding clock gating at bus input"); + CAM_DBG(CAM_ISP, "Overriding clock gating at bus input"); cam_io_w_mb(0x3FFFFFF, bus_priv->common_data.mem_base + bus_priv->common_data.common_reg->cgc_ovd); diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c index e632596991..d114de1d0e 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c @@ -327,7 +327,7 @@ int cam_vfe_top_ver3_init_hw(void *device_priv, * Auto clock gating is enabled by default, but no harm * in setting the value we expect. */ - CAM_INFO(CAM_ISP, "Enabling clock gating at IFE top"); + CAM_DBG(CAM_ISP, "Enabling clock gating at IFE top"); cam_soc_util_w_mb(common_data.soc_info, VFE_CORE_BASE_IDX, common_data.common_reg->core_cgc_ovd_0, 0x0); diff --git a/drivers/cam_jpeg/cam_jpeg_dev.c b/drivers/cam_jpeg/cam_jpeg_dev.c index d78d889e88..76a055b891 100644 --- a/drivers/cam_jpeg/cam_jpeg_dev.c +++ b/drivers/cam_jpeg/cam_jpeg_dev.c @@ -143,7 +143,7 @@ static int cam_jpeg_dev_component_bind(struct device *dev, mutex_init(&g_jpeg_dev.jpeg_mutex); - CAM_INFO(CAM_JPEG, "Component bound successfully"); + CAM_DBG(CAM_JPEG, "Component bound successfully"); return rc; diff --git a/drivers/cam_req_mgr/cam_req_mgr_dev.c b/drivers/cam_req_mgr/cam_req_mgr_dev.c index 55d08da9ff..ba45dbd7b6 100644 --- a/drivers/cam_req_mgr/cam_req_mgr_dev.c +++ b/drivers/cam_req_mgr/cam_req_mgr_dev.c @@ -813,7 +813,7 @@ static int cam_req_mgr_component_master_bind(struct device *dev) goto req_mgr_device_deinit; } - CAM_INFO(CAM_CRM, "All camera components bound successfully"); + CAM_DBG(CAM_CRM, "All camera components bound successfully"); rc = sysfs_create_file(&dev->kobj, &camera_debug_sysfs_attr.attr); if (rc < 0) { CAM_ERR(CAM_CPAS, diff --git a/drivers/cam_sensor_module/cam_actuator/cam_actuator_soc.c b/drivers/cam_sensor_module/cam_actuator/cam_actuator_soc.c index 3ee629e3f1..0248effdfb 100644 --- a/drivers/cam_sensor_module/cam_actuator/cam_actuator_soc.c +++ b/drivers/cam_sensor_module/cam_actuator/cam_actuator_soc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. */ #include @@ -57,13 +57,13 @@ int32_t cam_actuator_parse_dt(struct cam_actuator_ctrl_t *a_ctrl, } if (!soc_info->gpio_data) { - CAM_INFO(CAM_ACTUATOR, "No GPIO found"); + CAM_DBG(CAM_ACTUATOR, "No GPIO found"); rc = 0; return rc; } if (!soc_info->gpio_data->cam_gpio_common_tbl_size) { - CAM_INFO(CAM_ACTUATOR, "No GPIO found"); + CAM_DBG(CAM_ACTUATOR, "No GPIO found"); return -EINVAL; } diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c index 804bee34c2..d78d4c7fb8 100644 --- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c +++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c @@ -426,7 +426,7 @@ static int cam_cci_component_bind(struct device *dev, g_cci_subdev[soc_info->index] = &new_cci_dev->v4l2_dev_str.sd; mutex_init(&(new_cci_dev->init_mutex)); - CAM_INFO(CAM_CCI, "Device Type :%d", soc_info->index); + CAM_DBG(CAM_CCI, "Device Type :%d", soc_info->index); cpas_parms.cam_cpas_client_cb = NULL; cpas_parms.cell_index = soc_info->index; diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_soc.c b/drivers/cam_sensor_module/cam_flash/cam_flash_soc.c index dc56aebfe7..abd2355403 100644 --- a/drivers/cam_sensor_module/cam_flash/cam_flash_soc.c +++ b/drivers/cam_sensor_module/cam_flash/cam_flash_soc.c @@ -112,7 +112,7 @@ static int32_t cam_get_source_node_info( "qcom,current-ma", &soc_private->flash_op_current[i]); if (rc) { - CAM_INFO(CAM_FLASH, "op-current: read failed"); + CAM_DBG(CAM_FLASH, "op-current: read failed"); rc = 0; } @@ -121,7 +121,7 @@ static int32_t cam_get_source_node_info( "qcom,duration-ms", &soc_private->flash_max_duration[i]); if (rc) { - CAM_INFO(CAM_FLASH, + CAM_DBG(CAM_FLASH, "max-duration prop unavailable: %d", rc); rc = 0; diff --git a/drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c b/drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c index 3a944abff7..abe1b2c7a0 100644 --- a/drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c +++ b/drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c @@ -682,10 +682,10 @@ static int cam_res_mgr_component_bind(struct device *dev, rc = cam_res_mgr_parse_dt(&pdev->dev); if (rc) { - CAM_INFO(CAM_RES, "Disable shared gpio support."); + CAM_DBG(CAM_RES, "Disable shared gpio support."); cam_res->shared_gpio_enabled = false; } else { - CAM_INFO(CAM_RES, "Enable shared gpio support."); + CAM_DBG(CAM_RES, "Enable shared gpio support."); cam_res->shared_gpio_enabled = true; } diff --git a/drivers/cam_smmu/cam_smmu_api.c b/drivers/cam_smmu/cam_smmu_api.c index 3f86b8c5e3..719f98cc5f 100644 --- a/drivers/cam_smmu/cam_smmu_api.c +++ b/drivers/cam_smmu/cam_smmu_api.c @@ -771,7 +771,7 @@ static int cam_smmu_create_add_handle_in_table(char *name, *hdl = iommu_cb_set.cb_info[i].handle; mutex_unlock( &iommu_cb_set.cb_info[i].lock); - CAM_INFO(CAM_SMMU, + CAM_DBG(CAM_SMMU, "%s already got handle 0x%x", name, iommu_cb_set.cb_info[i].handle); diff --git a/drivers/cam_utils/cam_debug_util.c b/drivers/cam_utils/cam_debug_util.c index 96d466008c..882b9ea678 100644 --- a/drivers/cam_utils/cam_debug_util.c +++ b/drivers/cam_utils/cam_debug_util.c @@ -202,6 +202,9 @@ const char *cam_get_module_name(unsigned int module_id) case CAM_PRESIL: name = "CAM-PRESIL"; break; + case CAM_RES: + name = "CAM-RES"; + break; default: name = "CAM"; break; diff --git a/drivers/cam_utils/cam_soc_util.c b/drivers/cam_utils/cam_soc_util.c index ce80569ab0..73077a799d 100644 --- a/drivers/cam_utils/cam_soc_util.c +++ b/drivers/cam_utils/cam_soc_util.c @@ -556,7 +556,7 @@ int cam_soc_util_get_option_clk_by_name(struct cam_hw_soc_info *soc_info, clk_name); if (index < 0) { - CAM_INFO(CAM_UTIL, "No clk data for %s", clk_name); + CAM_DBG(CAM_UTIL, "No clk data for %s", clk_name); *clk_index = -1; *clk = ERR_PTR(-EINVAL); return -EINVAL; diff --git a/drivers/camera_main.c b/drivers/camera_main.c index 621f5c3dbe..b73c9992f0 100644 --- a/drivers/camera_main.c +++ b/drivers/camera_main.c @@ -278,7 +278,7 @@ static int camera_init(void) } } - CAM_INFO(CAM_UTIL, "Spectra camera driver initcalls done"); + CAM_INFO(CAM_UTIL, "Spectra camera driver initialized"); end_init: return rc;