From patchwork Sun May 30 08:51:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Eric_B=C3=A9nard?= X-Patchwork-Id: 103117 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4U8pHIu000384 for ; Sun, 30 May 2010 08:51:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751849Ab0E3IvQ (ORCPT ); Sun, 30 May 2010 04:51:16 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:56909 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751861Ab0E3IvP (ORCPT ); Sun, 30 May 2010 04:51:15 -0400 Received: from localhost.localdomain (tal33-3-82-233-81-124.fbx.proxad.net [82.233.81.124]) by smtp3-g21.free.fr (Postfix) with ESMTP id CBB5D8180D7; Sun, 30 May 2010 10:51:07 +0200 (CEST) From: =?utf-8?q?Eric=20B=C3=A9nard?= To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, maramaopercheseimorto@gmail.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] imx_keypad: add PM support Date: Sun, 30 May 2010 10:51:06 +0200 Message-Id: <1275209466-3899-1-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1275135823.3128.15.camel@realization> References: <1275135823.3128.15.camel@realization> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 30 May 2010 08:51:18 +0000 (UTC) diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index d92c15c..b303cc9 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -364,6 +364,55 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad) writew(0xff00, keypad->mmio_base + KPCR); } +static int mxc_kpp_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct imx_keypad *keypad = platform_get_drvdata(pdev); + unsigned short reg_val; + + clk_disable(keypad->clk); + + if (device_may_wakeup(&pdev->dev)) { + reg_val = readw(keypad->mmio_base + KPSR); + if ((reg_val & KBD_STAT_KDIE) == 0) { + /* If no depress interrupt enable the release interrupt */ + reg_val |= KBD_STAT_KRIE; + writew(reg_val, keypad->mmio_base + KPSR); + } + enable_irq_wake(keypad->irq); + } else { + keypad->enabled = false; + synchronize_irq(keypad->irq); + disable_irq(keypad->irq); + } + + return 0; +} + +/*! + * This function brings the Keypad controller back from low-power state. + * If Keypad is enabled as a wake source(i.e. it can resume the system + * from suspend mode), the Keypad controller doesn't enter low-power state. + * + * @param pdev the device structure used to give information on Keypad + * to resume + * + * @return The function always returns 0. + */ +static int mxc_kpp_resume(struct platform_device *pdev) +{ + struct imx_keypad *keypad = platform_get_drvdata(pdev); + + clk_enable(keypad->clk); + if (device_may_wakeup(&pdev->dev)) { + /* The irq routine already cleared KRIE if it was set */ + } else { + keypad->enabled = true; + enable_irq(keypad->irq); + } + + return 0; +} + static void imx_keypad_close(struct input_dev *dev) { struct imx_keypad *keypad = input_get_drvdata(dev); @@ -410,7 +459,8 @@ open_err: static int __devinit imx_keypad_probe(struct platform_device *pdev) { - const struct matrix_keymap_data *keymap_data = pdev->dev.platform_data; + const struct matrix_keypad_platform_data *keypad_data = pdev->dev.platform_data; + const struct matrix_keymap_data *keymap_data = keypad_data->keymap_data; struct imx_keypad *keypad; struct input_dev *input_dev; struct resource *res; @@ -525,7 +575,7 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, keypad); - device_init_wakeup(&pdev->dev, 1); + device_init_wakeup(&pdev->dev, keypad_data->wakeup); return 0; @@ -574,6 +624,8 @@ static struct platform_driver imx_keypad_driver = { }, .probe = imx_keypad_probe, .remove = __devexit_p(imx_keypad_remove), + .suspend = mxc_kpp_suspend, + .resume = mxc_kpp_resume, }; static int __init imx_keypad_init(void)