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

Commit 62f3da62 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "camera_v2: Changes for dual JPEG encoding"

parents 5331cf28 f84ee4da

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_core.c

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ irqreturn_t msm_jpeg_core_irq(int irq_num, void *context) 
			msm_jpeg_irq_handler(

				MSM_JPEG_HW_MASK_COMP_FRAMEDONE,

				context, data);

		pgmn_dev->state = MSM_JPEG_INIT;

	}

	if (msm_jpeg_hw_irq_is_reset_ack(jpeg_irq_status)) {

		data = msm_jpeg_core_reset_ack_irq(jpeg_irq_status,

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw_reg.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013 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
@@ -55,7 +55,7 @@ 


#define JPEG_OFFLINE_CMD_START 0x00000001



#define JPEG_RESET_DEFAULT 0x00020000

#define JPEG_RESET_DEFAULT 0x00032013



#define JPEG_IRQ_DISABLE_ALL 0x00000000

#define JPEG_IRQ_CLEAR_ALL 0xFFFFFFFF