From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:34495 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751497AbcGWRBG (ORCPT ); Sat, 23 Jul 2016 13:01:06 -0400 From: Steve Longerbeam To: lars@metafoo.de Cc: mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Steve Longerbeam Subject: [PATCH v3 8/9] media: adv7180: enable lock/unlock interrupts Date: Sat, 23 Jul 2016 10:00:48 -0700 Message-Id: <1469293249-6774-9-git-send-email-steve_longerbeam@mentor.com> In-Reply-To: <1469293249-6774-1-git-send-email-steve_longerbeam@mentor.com> References: <1469293249-6774-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org List-ID: Enable the SD lock/unlock interrupts and send V4L2_EVENT_SRC_CH_LOCK_STATUS in the interrupt handler on a detected lock/unlock. Signed-off-by: Steve Longerbeam --- v3: no changes v2: - last version of this patch was based on the old reverted autodetect code. This version now only enables the interrupt and sends the event in the interrupt handler. --- drivers/media/i2c/adv7180.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index ef2a107..6bcc652 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -874,19 +874,29 @@ static const struct v4l2_subdev_ops adv7180_ops = { static irqreturn_t adv7180_irq(int irq, void *devid) { struct adv7180_state *state = devid; - u8 isr3; + u8 isr1, isr3; mutex_lock(&state->mutex); + isr1 = adv7180_read(state, ADV7180_REG_ISR1); isr3 = adv7180_read(state, ADV7180_REG_ISR3); /* clear */ + adv7180_write(state, ADV7180_REG_ICR1, isr1); adv7180_write(state, ADV7180_REG_ICR3, isr3); - if (isr3 & ADV7180_IRQ3_AD_CHANGE) { - static const struct v4l2_event src_ch = { + if ((isr3 & ADV7180_IRQ3_AD_CHANGE) || + (isr1 & (ADV7180_IRQ1_LOCK | ADV7180_IRQ1_UNLOCK))) { + static struct v4l2_event src_ch = { .type = V4L2_EVENT_SOURCE_CHANGE, - .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION, }; + if (isr3 & ADV7180_IRQ3_AD_CHANGE) + src_ch.u.src_change.changes |= + V4L2_EVENT_SRC_CH_RESOLUTION; + + if (isr1 & (ADV7180_IRQ1_LOCK | ADV7180_IRQ1_UNLOCK)) + src_ch.u.src_change.changes |= + V4L2_EVENT_SRC_CH_LOCK_STATUS; + v4l2_subdev_notify_event(&state->sd, &src_ch); } mutex_unlock(&state->mutex); @@ -1287,7 +1297,9 @@ static int init_device(struct adv7180_state *state) if (ret < 0) goto out_unlock; - ret = adv7180_write(state, ADV7180_REG_IMR1, 0); + /* enable lock/unlock interrupts */ + ret = adv7180_write(state, ADV7180_REG_IMR1, + ADV7180_IRQ1_LOCK | ADV7180_IRQ1_UNLOCK); if (ret < 0) goto out_unlock; -- 1.9.1