A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Update IRQ controller names" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-02-10 11:47:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4c9c8a271a
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c
View file

@ -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 <linux/slab.h>
@ -695,8 +695,9 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv)
if (!controller)
return IRQ_NONE;
CAM_DBG(CAM_IRQ_CTRL, "locking controller %pK name %s lock %pK",
controller, controller->name, &controller->lock);
CAM_DBG(CAM_IRQ_CTRL,
"Locking: %s IRQ Controller: [%pK], lock handle: %pK",
controller->name, controller, &controller->lock);
spin_lock(&controller->lock);
for (i = 0; i < controller->num_registers; i++) {
irq_register = &controller->irq_register_arr[i];
@ -743,8 +744,9 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv)
}
}
spin_unlock(&controller->lock);
CAM_DBG(CAM_IRQ_CTRL, "unlocked controller %pK name %s lock %pK",
controller, controller->name, &controller->lock);
CAM_DBG(CAM_IRQ_CTRL,
"Unlocked: %s IRQ Controller: %pK, lock handle: %pK",
controller->name, controller, &controller->lock);
return IRQ_HANDLED;
}

6
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
View file

@ -3727,7 +3727,6 @@ int cam_vfe_bus_ver3_init(
struct cam_vfe_bus *vfe_bus_local;
struct cam_vfe_bus_ver3_hw_info *ver3_hw_info = bus_hw_info;
struct cam_vfe_soc_private *soc_private = NULL;
char rup_controller_name[12] = "";
CAM_DBG(CAM_ISP, "Enter");
@ -3793,10 +3792,7 @@ int cam_vfe_bus_ver3_init(
goto free_bus_priv;
}
strlcat(rup_controller_name, drv_name, sizeof(rup_controller_name));
strlcat(rup_controller_name, "_rup", sizeof(rup_controller_name));
rc = cam_irq_controller_init(rup_controller_name,
rc = cam_irq_controller_init("vfe_bus_rup",
bus_priv->common_data.mem_base,
&ver3_hw_info->common_reg.irq_reg_info,
&bus_priv->common_data.rup_irq_controller, false);