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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 E0552C3A5A9 for ; Wed, 4 Sep 2019 06:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C312820870 for ; Wed, 4 Sep 2019 06:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728797AbfIDGwv (ORCPT ); Wed, 4 Sep 2019 02:52:51 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:36255 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725267AbfIDGwv (ORCPT ); Wed, 4 Sep 2019 02:52:51 -0400 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i5P9s-0002uV-Ki; Wed, 04 Sep 2019 08:52:48 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1i5P9s-0004iI-6D; Wed, 04 Sep 2019 08:52:48 +0200 Date: Wed, 4 Sep 2019 08:52:48 +0200 From: Marco Felsch To: Robin van der Gracht Cc: "linux-input @ vger . kernel . org" , "linux-kernel @ vger . kernel . org" , Dmitry Torokhov , RobinGong , Pengutronix Kernel Team , Shawn Guo , Adam Ford , "linux-arm-kernel @ lists . infradead . org" Subject: Re: [PATCH v3] input: keyboard: snvs_pwrkey: Send key events for i.MX6 S, DL and Q Message-ID: <20190904065248.4i7q2vuxxt2xdnrr@pengutronix.de> References: <20190904062329.97520-1-robin@protonic.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190904062329.97520-1-robin@protonic.nl> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:40:59 up 109 days, 12:59, 63 users, load average: 0.17, 0.09, 0.03 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Robin, thanks for the patch it looks quite good, just two minor nitpicks. On 19-09-04 06:23, Robin van der Gracht wrote: > The first generation i.MX6 processors does not send an interrupt when the > power key is pressed. It sends a power down request interrupt if the key is > released before a hard shutdown (5 second press). This should allow > software to bring down the SoC safely. > > For this driver to work as a regular power key with the older SoCs, we need > to send a keypress AND release when we get the power down request irq. > > Signed-off-by: Robin van der Gracht > --- > > Changes v2 -> v3: > - Drop alt compatible string for identifying first revision snvs hardware, > read minor revision from register instead. > - Drop imx6qdl.dtsi modification and device-tree binding documentation. > - Add an additional input_sync() to create 2 seperate input reports for press > and release. > > drivers/input/keyboard/Kconfig | 2 +- > drivers/input/keyboard/snvs_pwrkey.c | 28 ++++++++++++++++++++++++++-- > 2 files changed, 27 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig > index 7c4f19dab34f..937e58da5ce1 100644 > --- a/drivers/input/keyboard/Kconfig > +++ b/drivers/input/keyboard/Kconfig > @@ -436,7 +436,7 @@ config KEYBOARD_SNVS_PWRKEY > depends on OF > help > This is the snvs powerkey driver for the Freescale i.MX application > - processors that are newer than i.MX6 SX. > + processors. > > To compile this driver as a module, choose M here; the > module will be called snvs_pwrkey. > diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c > index 5342d8d45f81..828580eee0d2 100644 > --- a/drivers/input/keyboard/snvs_pwrkey.c > +++ b/drivers/input/keyboard/snvs_pwrkey.c > @@ -19,6 +19,7 @@ > #include > #include > > +#define SNVS_HPVIDR1_REG 0xF8 > #define SNVS_LPSR_REG 0x4C /* LP Status Register */ > #define SNVS_LPCR_REG 0x38 /* LP Control Register */ > #define SNVS_HPSR_REG 0x14 > @@ -37,6 +38,7 @@ struct pwrkey_drv_data { > int wakeup; > struct timer_list check_timer; > struct input_dev *input; > + u8 minor_rev; > }; > > static void imx_imx_snvs_check_for_events(struct timer_list *t) > @@ -45,6 +47,20 @@ static void imx_imx_snvs_check_for_events(struct timer_list *t) > struct input_dev *input = pdata->input; > u32 state; > > + if (pdata->minor_rev == 0) { Should we use a define here and .. > + /* > + * The first generation i.MX6 SoCs only sends an interrupt on > + * button release. To mimic power-key usage, we'll prepend a > + * press event. > + */ > + input_report_key(input, pdata->keycode, 1); > + input_sync(input); > + input_report_key(input, pdata->keycode, 0); > + input_sync(input); > + pm_relax(input->dev.parent); > + return; > + } > + > regmap_read(pdata->snvs, SNVS_HPSR_REG, &state); > state = state & SNVS_HPSR_BTN ? 1 : 0; > > @@ -67,13 +83,17 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) > { > struct platform_device *pdev = dev_id; > struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev); > + unsigned long expire = jiffies; > u32 lp_status; > > pm_wakeup_event(pdata->input->dev.parent, 0); > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > - if (lp_status & SNVS_LPSR_SPO) > - mod_timer(&pdata->check_timer, jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > + if (lp_status & SNVS_LPSR_SPO) { > + if (pdata->minor_rev > 0) here? Just a nitpick, feel free to add/drop it. > + expire = jiffies + msecs_to_jiffies(DEBOUNCE_TIME); > + mod_timer(&pdata->check_timer, expire); > + } > > /* clear SPO status */ > regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > @@ -94,6 +114,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > struct input_dev *input = NULL; > struct device_node *np; > int error; > + u32 vid; > > /* Get SNVS register Page */ > np = pdev->dev.of_node; > @@ -123,6 +144,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > return -EINVAL; > } > > + regmap_read(pdata->snvs, SNVS_HPVIDR1_REG, &vid); Should we check the return val here? Regards, Marco > + pdata->minor_rev = vid & 0xff; > + > regmap_update_bits(pdata->snvs, SNVS_LPCR_REG, SNVS_LPCR_DEP_EN, SNVS_LPCR_DEP_EN); > > /* clear the unexpected interrupt before driver ready */ > -- > 2.20.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Felsch Subject: Re: [PATCH v3] input: keyboard: snvs_pwrkey: Send key events for i.MX6 S, DL and Q Date: Wed, 4 Sep 2019 08:52:48 +0200 Message-ID: <20190904065248.4i7q2vuxxt2xdnrr@pengutronix.de> References: <20190904062329.97520-1-robin@protonic.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190904062329.97520-1-robin@protonic.nl> Sender: linux-kernel-owner@vger.kernel.org To: Robin van der Gracht Cc: "linux-input @ vger . kernel . org" , "linux-kernel @ vger . kernel . org" , Dmitry Torokhov , RobinGong , Pengutronix Kernel Team , Shawn Guo , Adam Ford , "linux-arm-kernel @ lists . infradead . org" List-Id: linux-input@vger.kernel.org Hi Robin, thanks for the patch it looks quite good, just two minor nitpicks. On 19-09-04 06:23, Robin van der Gracht wrote: > The first generation i.MX6 processors does not send an interrupt when the > power key is pressed. It sends a power down request interrupt if the key is > released before a hard shutdown (5 second press). This should allow > software to bring down the SoC safely. > > For this driver to work as a regular power key with the older SoCs, we need > to send a keypress AND release when we get the power down request irq. > > Signed-off-by: Robin van der Gracht > --- > > Changes v2 -> v3: > - Drop alt compatible string for identifying first revision snvs hardware, > read minor revision from register instead. > - Drop imx6qdl.dtsi modification and device-tree binding documentation. > - Add an additional input_sync() to create 2 seperate input reports for press > and release. > > drivers/input/keyboard/Kconfig | 2 +- > drivers/input/keyboard/snvs_pwrkey.c | 28 ++++++++++++++++++++++++++-- > 2 files changed, 27 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig > index 7c4f19dab34f..937e58da5ce1 100644 > --- a/drivers/input/keyboard/Kconfig > +++ b/drivers/input/keyboard/Kconfig > @@ -436,7 +436,7 @@ config KEYBOARD_SNVS_PWRKEY > depends on OF > help > This is the snvs powerkey driver for the Freescale i.MX application > - processors that are newer than i.MX6 SX. > + processors. > > To compile this driver as a module, choose M here; the > module will be called snvs_pwrkey. > diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c > index 5342d8d45f81..828580eee0d2 100644 > --- a/drivers/input/keyboard/snvs_pwrkey.c > +++ b/drivers/input/keyboard/snvs_pwrkey.c > @@ -19,6 +19,7 @@ > #include > #include > > +#define SNVS_HPVIDR1_REG 0xF8 > #define SNVS_LPSR_REG 0x4C /* LP Status Register */ > #define SNVS_LPCR_REG 0x38 /* LP Control Register */ > #define SNVS_HPSR_REG 0x14 > @@ -37,6 +38,7 @@ struct pwrkey_drv_data { > int wakeup; > struct timer_list check_timer; > struct input_dev *input; > + u8 minor_rev; > }; > > static void imx_imx_snvs_check_for_events(struct timer_list *t) > @@ -45,6 +47,20 @@ static void imx_imx_snvs_check_for_events(struct timer_list *t) > struct input_dev *input = pdata->input; > u32 state; > > + if (pdata->minor_rev == 0) { Should we use a define here and .. > + /* > + * The first generation i.MX6 SoCs only sends an interrupt on > + * button release. To mimic power-key usage, we'll prepend a > + * press event. > + */ > + input_report_key(input, pdata->keycode, 1); > + input_sync(input); > + input_report_key(input, pdata->keycode, 0); > + input_sync(input); > + pm_relax(input->dev.parent); > + return; > + } > + > regmap_read(pdata->snvs, SNVS_HPSR_REG, &state); > state = state & SNVS_HPSR_BTN ? 1 : 0; > > @@ -67,13 +83,17 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) > { > struct platform_device *pdev = dev_id; > struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev); > + unsigned long expire = jiffies; > u32 lp_status; > > pm_wakeup_event(pdata->input->dev.parent, 0); > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > - if (lp_status & SNVS_LPSR_SPO) > - mod_timer(&pdata->check_timer, jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > + if (lp_status & SNVS_LPSR_SPO) { > + if (pdata->minor_rev > 0) here? Just a nitpick, feel free to add/drop it. > + expire = jiffies + msecs_to_jiffies(DEBOUNCE_TIME); > + mod_timer(&pdata->check_timer, expire); > + } > > /* clear SPO status */ > regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > @@ -94,6 +114,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > struct input_dev *input = NULL; > struct device_node *np; > int error; > + u32 vid; > > /* Get SNVS register Page */ > np = pdev->dev.of_node; > @@ -123,6 +144,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > return -EINVAL; > } > > + regmap_read(pdata->snvs, SNVS_HPVIDR1_REG, &vid); Should we check the return val here? Regards, Marco > + pdata->minor_rev = vid & 0xff; > + > regmap_update_bits(pdata->snvs, SNVS_LPCR_REG, SNVS_LPCR_DEP_EN, SNVS_LPCR_DEP_EN); > > /* clear the unexpected interrupt before driver ready */ > -- > 2.20.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | 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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 50359C3A5A7 for ; Wed, 4 Sep 2019 06:53:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 240D120870 for ; Wed, 4 Sep 2019 06:53:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Fedqrx7T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 240D120870 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y1CW2HfM57NTRgPtd3/1ygi+EfiR1X8LR18Qvdy6SM0=; b=Fedqrx7TQXaimS 3MQyQpe2F29LFxGek/579ikNOhKRgjPefjEApgfumAv8jAsuJthsm7PZeHFLl8W5vmF8joE2HRkfw sFJoy2KLSGH+jZxFlN62PKnzi30Gw9OVVtIrZcs0bD3Ozg5tYaXXXigNgYK77nRq1OvV6MCthMnXZ 2bZxOdg1tJ2wknILsYu0wtanKaxjqn9HE6+jyDldgffw657upPHjlzX1H7GwHyOiJ0zpp2mH0NMpp pbifbihpNqLo6jYCSQApy2Gl1As9sdE2UNTumPf0V9NZKHiq7BsJnV2pfk/v2igmPqpGWewMJURMe Tef6bMF1yv6r+D0qLIRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5PA5-0006Tn-G5; Wed, 04 Sep 2019 06:53:01 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5PA1-0006SI-5X for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2019 06:52:59 +0000 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i5P9s-0002uV-Ki; Wed, 04 Sep 2019 08:52:48 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1i5P9s-0004iI-6D; Wed, 04 Sep 2019 08:52:48 +0200 Date: Wed, 4 Sep 2019 08:52:48 +0200 From: Marco Felsch To: Robin van der Gracht Subject: Re: [PATCH v3] input: keyboard: snvs_pwrkey: Send key events for i.MX6 S, DL and Q Message-ID: <20190904065248.4i7q2vuxxt2xdnrr@pengutronix.de> References: <20190904062329.97520-1-robin@protonic.nl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190904062329.97520-1-robin@protonic.nl> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:40:59 up 109 days, 12:59, 63 users, load average: 0.17, 0.09, 0.03 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190903_235257_227112_7DDD8F43 X-CRM114-Status: GOOD ( 26.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Ford , Dmitry Torokhov , "linux-kernel @ vger . kernel . org" , Pengutronix Kernel Team , "linux-input @ vger . kernel . org" , RobinGong , Shawn Guo , "linux-arm-kernel @ lists . infradead . org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Robin, thanks for the patch it looks quite good, just two minor nitpicks. On 19-09-04 06:23, Robin van der Gracht wrote: > The first generation i.MX6 processors does not send an interrupt when the > power key is pressed. It sends a power down request interrupt if the key is > released before a hard shutdown (5 second press). This should allow > software to bring down the SoC safely. > > For this driver to work as a regular power key with the older SoCs, we need > to send a keypress AND release when we get the power down request irq. > > Signed-off-by: Robin van der Gracht > --- > > Changes v2 -> v3: > - Drop alt compatible string for identifying first revision snvs hardware, > read minor revision from register instead. > - Drop imx6qdl.dtsi modification and device-tree binding documentation. > - Add an additional input_sync() to create 2 seperate input reports for press > and release. > > drivers/input/keyboard/Kconfig | 2 +- > drivers/input/keyboard/snvs_pwrkey.c | 28 ++++++++++++++++++++++++++-- > 2 files changed, 27 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig > index 7c4f19dab34f..937e58da5ce1 100644 > --- a/drivers/input/keyboard/Kconfig > +++ b/drivers/input/keyboard/Kconfig > @@ -436,7 +436,7 @@ config KEYBOARD_SNVS_PWRKEY > depends on OF > help > This is the snvs powerkey driver for the Freescale i.MX application > - processors that are newer than i.MX6 SX. > + processors. > > To compile this driver as a module, choose M here; the > module will be called snvs_pwrkey. > diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c > index 5342d8d45f81..828580eee0d2 100644 > --- a/drivers/input/keyboard/snvs_pwrkey.c > +++ b/drivers/input/keyboard/snvs_pwrkey.c > @@ -19,6 +19,7 @@ > #include > #include > > +#define SNVS_HPVIDR1_REG 0xF8 > #define SNVS_LPSR_REG 0x4C /* LP Status Register */ > #define SNVS_LPCR_REG 0x38 /* LP Control Register */ > #define SNVS_HPSR_REG 0x14 > @@ -37,6 +38,7 @@ struct pwrkey_drv_data { > int wakeup; > struct timer_list check_timer; > struct input_dev *input; > + u8 minor_rev; > }; > > static void imx_imx_snvs_check_for_events(struct timer_list *t) > @@ -45,6 +47,20 @@ static void imx_imx_snvs_check_for_events(struct timer_list *t) > struct input_dev *input = pdata->input; > u32 state; > > + if (pdata->minor_rev == 0) { Should we use a define here and .. > + /* > + * The first generation i.MX6 SoCs only sends an interrupt on > + * button release. To mimic power-key usage, we'll prepend a > + * press event. > + */ > + input_report_key(input, pdata->keycode, 1); > + input_sync(input); > + input_report_key(input, pdata->keycode, 0); > + input_sync(input); > + pm_relax(input->dev.parent); > + return; > + } > + > regmap_read(pdata->snvs, SNVS_HPSR_REG, &state); > state = state & SNVS_HPSR_BTN ? 1 : 0; > > @@ -67,13 +83,17 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id) > { > struct platform_device *pdev = dev_id; > struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev); > + unsigned long expire = jiffies; > u32 lp_status; > > pm_wakeup_event(pdata->input->dev.parent, 0); > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > - if (lp_status & SNVS_LPSR_SPO) > - mod_timer(&pdata->check_timer, jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > + if (lp_status & SNVS_LPSR_SPO) { > + if (pdata->minor_rev > 0) here? Just a nitpick, feel free to add/drop it. > + expire = jiffies + msecs_to_jiffies(DEBOUNCE_TIME); > + mod_timer(&pdata->check_timer, expire); > + } > > /* clear SPO status */ > regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > @@ -94,6 +114,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > struct input_dev *input = NULL; > struct device_node *np; > int error; > + u32 vid; > > /* Get SNVS register Page */ > np = pdev->dev.of_node; > @@ -123,6 +144,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) > return -EINVAL; > } > > + regmap_read(pdata->snvs, SNVS_HPVIDR1_REG, &vid); Should we check the return val here? Regards, Marco > + pdata->minor_rev = vid & 0xff; > + > regmap_update_bits(pdata->snvs, SNVS_LPCR_REG, SNVS_LPCR_DEP_EN, SNVS_LPCR_DEP_EN); > > /* clear the unexpected interrupt before driver ready */ > -- > 2.20.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel