From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F67DC433DB for ; Mon, 11 Jan 2021 05:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11B16227BF for ; Mon, 11 Jan 2021 05:58:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727191AbhAKF6Z (ORCPT ); Mon, 11 Jan 2021 00:58:25 -0500 Received: from muru.com ([72.249.23.125]:42630 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727055AbhAKF6Y (ORCPT ); Mon, 11 Jan 2021 00:58:24 -0500 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 528C980E4; Mon, 11 Jan 2021 05:57:43 +0000 (UTC) Date: Mon, 11 Jan 2021 07:57:39 +0200 From: Tony Lindgren To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Arthur Demchenkov , Carl Philipp Klemm , Merlijn Wajer , Pavel Machek , ruleh , Sebastian Reichel Subject: Re: [PATCH 3/5] Input: omap4-keypad - move rest of key scanning to a separate function Message-ID: References: <20210110190529.46135-1-tony@atomide.com> <20210110190529.46135-4-tony@atomide.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Dmitry Torokhov [210111 04:50]: > On Sun, Jan 10, 2021 at 09:05:27PM +0200, Tony Lindgren wrote: > > Let's move rest of the key scanning code to omap4_keypad_scan_keys(). > > We will use omap4_keypad_scan_keys() also for implementing errata > > handling to clear the stuck last key in the following patch. > > And this one will become then... Yes great, this works for me. Thanks, Tony > > Input: omap4-keypad - move rest of key scanning to a separate function > > From: Tony Lindgren > > Let's move rest of the key scanning code to omap4_keypad_scan_keys(). > We will use omap4_keypad_scan_keys() also for implementing errata > handling to clear the stuck last key in the following patch. > > Signed-off-by: Tony Lindgren > Signed-off-by: Dmitry Torokhov > --- > drivers/input/keyboard/omap4-keypad.c | 39 ++++++++++++++++++++++----------- > 1 file changed, 26 insertions(+), 13 deletions(-) > > diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c > index 6dcf27af856d..c48705dd049b 100644 > --- a/drivers/input/keyboard/omap4-keypad.c > +++ b/drivers/input/keyboard/omap4-keypad.c > @@ -71,6 +71,7 @@ struct omap4_keypad { > > void __iomem *base; > unsigned int irq; > + struct mutex lock; /* for key scan */ > > unsigned int rows; > unsigned int cols; > @@ -135,6 +136,28 @@ static int omap4_keypad_report_keys(struct omap4_keypad *keypad_data, > return events; > } > > +static void omap4_keypad_scan_keys(struct omap4_keypad *keypad_data, u64 keys) > +{ > + u64 changed; > + > + mutex_lock(&keypad_data->lock); > + > + changed = keys ^ keypad_data->keys; > + > + /* > + * Report key up events separately and first. This matters in case we > + * lost key-up interrupt and just now catching up. > + */ > + omap4_keypad_report_keys(keypad_data, changed & ~keys, false); > + > + /* Report key down events */ > + omap4_keypad_report_keys(keypad_data, changed & keys, true); > + > + keypad_data->keys = keys; > + > + mutex_unlock(&keypad_data->lock); > +} > + > /* Interrupt handlers */ > static irqreturn_t omap4_keypad_irq_handler(int irq, void *dev_id) > { > @@ -150,24 +173,13 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) > { > struct omap4_keypad *keypad_data = dev_id; > u32 low, high; > - u64 keys, changed; > + u64 keys; > > low = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE31_0); > high = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE63_32); > keys = low | (u64)high << 32; > > - changed = keys ^ keypad_data->keys; > - > - /* > - * Report key up events separately and first. This matters in case we > - * lost key-up interrupt and just now catching up. > - */ > - omap4_keypad_report_keys(keypad_data, changed & ~keys, false); > - > - /* Report key down events */ > - omap4_keypad_report_keys(keypad_data, changed & keys, true); > - > - keypad_data->keys = keys; > + omap4_keypad_scan_keys(keypad_data, keys); > > /* clear pending interrupts */ > kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS, > @@ -300,6 +312,7 @@ static int omap4_keypad_probe(struct platform_device *pdev) > } > > keypad_data->irq = irq; > + mutex_init(&keypad_data->lock); > > error = omap4_keypad_parse_dt(dev, keypad_data); > if (error)