Merge "msm: camera: vfe: Quieten driver during boot" into dev/msm-4.14-camx (f093458b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-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
		@@ -106,7 +106,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");
		CAM_WARN(CAM_ISP, "Option clk get failed with rc %d", rc);

		rc = cam_vfe_request_platform_resource(soc_info, vfe_irq_handler,
		irq_data);

+18 −15

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-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
		@@ -3268,11 +3268,12 @@ static int cam_vfe_bus_init_hw(void *hw_priv,
		NULL,
		NULL);

		if (bus_priv->irq_handle <= 0) {
		if ((int)bus_priv->irq_handle <= 0) {
		CAM_ERR(CAM_ISP, "Failed to subscribe BUS IRQ");
		return -EFAULT;
		}

		if (bus_priv->tasklet_info != NULL) {
		bus_priv->error_irq_handle = cam_irq_controller_subscribe_irq(
		bus_priv->common_data.bus_irq_controller,
		CAM_IRQ_PRIORITY_0,
		@@ -3283,10 +3284,12 @@ static int cam_vfe_bus_init_hw(void *hw_priv,
		bus_priv->tasklet_info,
		&tasklet_bh_api);

		if (bus_priv->irq_handle <= 0) {
		CAM_ERR(CAM_ISP, "Failed to subscribe BUS IRQ");
		if ((int)bus_priv->error_irq_handle <= 0) {
		CAM_ERR(CAM_ISP, "Failed to subscribe BUS error IRQ %d",
		bus_priv->error_irq_handle);
		return -EFAULT;
		}
		}

		/Set Debug Registers/
		cam_io_w_mb(CAM_VFE_BUS_SET_DEBUG_REG, bus_priv->common_data.mem_base +