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

Commit 7aa55f53 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: cdm: Fix irq_data value in case of inline irq" into camera-kernel.lnx.3.1

parents 7ee711c6 cb02d402

drivers/cam_cdm/cam_cdm.h

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

/* 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.

 */

 */





#ifndef _CAM_CDM_H_

#ifndef _CAM_CDM_H_
@@ -100,6 +100,7 @@ 
#define CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK 0x10000

#define CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK 0x10000

#define CAM_CDM_IRQ_STATUS_ERROR_OVER_FLOW_MASK 0x20000

#define CAM_CDM_IRQ_STATUS_ERROR_OVER_FLOW_MASK 0x20000

#define CAM_CDM_IRQ_STATUS_ERROR_AHB_BUS_MASK 0x40000

#define CAM_CDM_IRQ_STATUS_ERROR_AHB_BUS_MASK 0x40000

#define CAM_CDM_IRQ_STATUS_USR_DATA_MASK 0xFF





#define CAM_CDM_IRQ_STATUS_ERRORS \

#define CAM_CDM_IRQ_STATUS_ERRORS \

	(CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK | \

	(CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK | \

drivers/cam_cdm/cam_cdm_hw_core.c

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

// 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/delay.h>

#include <linux/delay.h>
@@ -1139,7 +1139,8 @@ irqreturn_t cam_hw_cdm_irq(int irq_num, void *data) 
				return IRQ_HANDLED;

				return IRQ_HANDLED;

			}

			}





			payload[i]->irq_data = user_data >> (i * 0x8);

			payload[i]->irq_data = (user_data >> (i * 0x8)) &

				CAM_CDM_IRQ_STATUS_USR_DATA_MASK;





			if (payload[i]->irq_data ==

			if (payload[i]->irq_data ==

					CAM_CDM_DBG_GEN_IRQ_USR_DATA)

					CAM_CDM_DBG_GEN_IRQ_USR_DATA)