From patchwork Mon Feb 10 10:07:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 3617311 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC48BBF418 for ; Mon, 10 Feb 2014 10:08:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF1F920155 for ; Mon, 10 Feb 2014 10:08:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D332120173 for ; Mon, 10 Feb 2014 10:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbaBJKII (ORCPT ); Mon, 10 Feb 2014 05:08:08 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:34252 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752516AbaBJKID (ORCPT ); Mon, 10 Feb 2014 05:08:03 -0500 Received: by mail-pb0-f44.google.com with SMTP id rq2so6049060pbb.31 for ; Mon, 10 Feb 2014 02:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wqT6T4bamk6kGNi6mQ7DgKH1bAL5SCETNATH7OWrfQQ=; b=XA7A1Ltzr4xiY4ULbwbGw5cYmRLS9SSHFMPdFMsjtr/PVK/hZclmsuTLi+jGkVHbkP THh4Jkc/ZsziM/suEPNx3EXenmKUVNuflIOp/56iIT3ZfXZQKXIfeylkM51GX3VEKwPZ MlTlNlRN8b8JkOilx3EqrJC3eM1Nd4z33ytWcC6+m02WZtnptYoxsy1zSVX+Z/d8a3bi Vu2ZVQscjz31HFZaHtwuVj/eOq5/rxwvA/975/4sLkTS2jSP8Y/DFnCtxKWxe0Gr8eW8 pmq+hMOiaANU03qrYOTbV5gevNBQDdL2dsxpJ+dW5PilieUZ28vbhKBWxWPGsmViA34r MC0A== X-Received: by 10.68.189.198 with SMTP id gk6mr8258674pbc.146.1392026882864; Mon, 10 Feb 2014 02:08:02 -0800 (PST) Received: from localhost.localdomain ([117.136.8.138]) by mx.google.com with ESMTPSA id sq7sm40845405pbc.19.2014.02.10.02.07.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 02:08:02 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, workgroup.linux@csr.com, Xianglong Du , Rongjun Ying , Barry Song Subject: [PATCH] input: sirfsoc-onkey - report onkey untouch event by detecting pin status Date: Mon, 10 Feb 2014 18:07:39 +0800 Message-Id: <1392026859-4977-1-git-send-email-21cnbao@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xianglong Du this patch adds a delayed_work to detect the untouch of onkey since HW will not generate interrupt for it. at the same time, we move the KEY event to POWER instead of SUSPEND, which will be suitable for both Android and Linux. Userspace PowerManager Daemon will decide to suspend or shutdown based on how long we have touched onkey Signed-off-by: Xianglong Du Signed-off-by: Rongjun Ying Signed-off-by: Barry Song --- drivers/input/misc/sirfsoc-onkey.c | 48 ++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/sirfsoc-onkey.c b/drivers/input/misc/sirfsoc-onkey.c index e8897c3..9cd810b 100644 --- a/drivers/input/misc/sirfsoc-onkey.c +++ b/drivers/input/misc/sirfsoc-onkey.c @@ -13,16 +13,44 @@ #include #include #include +#include struct sirfsoc_pwrc_drvdata { u32 pwrc_base; struct input_dev *input; + struct delayed_work work; }; #define PWRC_ON_KEY_BIT (1 << 0) #define PWRC_INT_STATUS 0xc #define PWRC_INT_MASK 0x10 +#define PWRC_PIN_STATUS 0x14 +#define PWRC_KEY_DETECT_UP_TIME 20 /* ms*/ + +static inline int sirfsoc_pwrc_is_on_key_down( + struct sirfsoc_pwrc_drvdata *pwrcdrv) +{ + int state = sirfsoc_rtc_iobrg_readl( + pwrcdrv->pwrc_base + PWRC_PIN_STATUS) + & PWRC_ON_KEY_BIT; + return !state; /* ON_KEY is active low */ +} + +static void sirfsoc_pwrc_report_event(struct work_struct *work) +{ + struct sirfsoc_pwrc_drvdata *pwrcdrv = + container_of((struct delayed_work *)work, + struct sirfsoc_pwrc_drvdata, work); + + if (!sirfsoc_pwrc_is_on_key_down(pwrcdrv)) { + input_event(pwrcdrv->input, EV_PWR, KEY_POWER, 0); + input_sync(pwrcdrv->input); + } else { + schedule_delayed_work(&pwrcdrv->work, + msecs_to_jiffies(PWRC_KEY_DETECT_UP_TIME)); + } +} static irqreturn_t sirfsoc_pwrc_isr(int irq, void *dev_id) { @@ -34,17 +62,11 @@ static irqreturn_t sirfsoc_pwrc_isr(int irq, void *dev_id) sirfsoc_rtc_iobrg_writel(int_status & ~PWRC_ON_KEY_BIT, pwrcdrv->pwrc_base + PWRC_INT_STATUS); - /* - * For a typical Linux system, we report KEY_SUSPEND to trigger apm-power.c - * to queue a SUSPEND APM event - */ - input_event(pwrcdrv->input, EV_PWR, KEY_SUSPEND, 1); - input_sync(pwrcdrv->input); - /* - * Todo: report KEY_POWER event for Android platforms, Android PowerManager - * will handle the suspend and powerdown/hibernation - */ + input_event(pwrcdrv->input, EV_PWR, KEY_POWER, 1); + input_sync(pwrcdrv->input); + schedule_delayed_work(&pwrcdrv->work, + msecs_to_jiffies(PWRC_KEY_DETECT_UP_TIME)); return IRQ_HANDLED; } @@ -88,6 +110,8 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev) pwrcdrv->input->phys = "pwrc/input0"; pwrcdrv->input->evbit[0] = BIT_MASK(EV_PWR); + INIT_DELAYED_WORK(&pwrcdrv->work, sirfsoc_pwrc_report_event); + irq = platform_get_irq(pdev, 0); error = devm_request_irq(&pdev->dev, irq, sirfsoc_pwrc_isr, IRQF_SHARED, @@ -119,8 +143,12 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev) static int sirfsoc_pwrc_remove(struct platform_device *pdev) { + struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(&pdev->dev); + device_init_wakeup(&pdev->dev, 0); + cancel_delayed_work_sync(&pwrcdrv->work); + return 0; }