From patchwork Thu Jun 25 03:37:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 6672051 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 772C99F72C for ; Thu, 25 Jun 2015 03:37:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CEB6205DF for ; Thu, 25 Jun 2015 03:36:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 738D92060A for ; Thu, 25 Jun 2015 03:36:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbbFYDgw (ORCPT ); Wed, 24 Jun 2015 23:36:52 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34042 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752401AbbFYDgp (ORCPT ); Wed, 24 Jun 2015 23:36:45 -0400 Received: by pabvl15 with SMTP id vl15so41284630pab.1; Wed, 24 Jun 2015 20:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vmTAkChLy31RyWYN79UWrU2+a+JezFK8HCfVIKtXGu4=; b=JODV+0F3DUPLZlUYFvzhcThm1lQmlUFjpTKGcGRRfmna3zCfwUSNl9oqKscKqLYS7l zE/F94LOs+CIHjY5bYxBC41jBc/+AlhPlgBs5vF8h3RcMlhrV1VAx8Rk9aSh7OYyGlR9 mR25ja+owDjX+4/Hr37jDC3yXpgNNGRQyn4w1mNlE5n3yJ7Cxo2AsQ4d3UwcLV52Okcr do8mbrSIoPzkw702/5jI13cS++vDvC7+I5BtJvIL94lNDAQeZLCkTUIGMkfnXIhl5zQ1 GgUzVY3JKPKtc076b7Xn2M3ovGLfKBgstOm2DwBiMFdH3aVv1oDmPf3sj7/VAJQwp1Zz encw== X-Received: by 10.67.24.65 with SMTP id ig1mr85915837pad.61.1435203403797; Wed, 24 Jun 2015 20:36:43 -0700 (PDT) Received: from localhost.localdomain (c-76-105-208-73.hsd1.or.comcast.net. [76.105.208.73]) by mx.google.com with ESMTPSA id sn7sm28331676pac.5.2015.06.24.20.36.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jun 2015 20:36:43 -0700 (PDT) From: Matt Ranostay To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-pm@vger.kernel.org, Matt Ranostay Subject: [PATCH] cap11xx: add runtime PM support Date: Wed, 24 Jun 2015 20:37:45 -0700 Message-Id: <1435203465-11592-2-git-send-email-mranostay@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435203465-11592-1-git-send-email-mranostay@gmail.com> References: <1435203465-11592-1-git-send-email-mranostay@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.2 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=unavailable 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 Puts device into DEEP SLEEP when no LEDs are in in the on-state, and no input_handlers are in use. Also uses *_autosuspend to prevent a LED trigger from constantly suspending and resuming device. Signed-off-by: Matt Ranostay --- drivers/input/keyboard/cap11xx.c | 75 ++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index b983b5a..4dc7690 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -84,9 +85,9 @@ struct cap11xx_led { struct cap11xx_priv { struct regmap *regmap; struct input_dev *idev; + struct i2c_client *i2c_client; struct cap11xx_led *leds; - int num_leds; /* config */ u32 keycodes[]; @@ -207,13 +208,6 @@ out: static int cap11xx_set_sleep(struct cap11xx_priv *priv, bool sleep) { -#ifdef CONFIG_LEDS_CLASS - /* - * DLSEEP mode will turn off all LEDS, prevent this - */ - if (priv->num_leds) - return 0; -#endif return regmap_update_bits(priv->regmap, CAP11XX_REG_MAIN_CONTROL, CAP11XX_REG_MAIN_CONTROL_DLSEEP, sleep ? CAP11XX_REG_MAIN_CONTROL_DLSEEP : 0); @@ -223,14 +217,16 @@ static int cap11xx_input_open(struct input_dev *idev) { struct cap11xx_priv *priv = input_get_drvdata(idev); - return cap11xx_set_sleep(priv, false); + pm_runtime_get(&priv->i2c_client->dev); + + return 0; } static void cap11xx_input_close(struct input_dev *idev) { struct cap11xx_priv *priv = input_get_drvdata(idev); - cap11xx_set_sleep(priv, true); + pm_runtime_put_autosuspend(&priv->i2c_client->dev); } #ifdef CONFIG_LEDS_CLASS @@ -252,10 +248,16 @@ static void cap11xx_led_set(struct led_classdev *cdev, enum led_brightness value) { struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev); + struct cap11xx_priv *priv = led->priv; if (led->new_brightness == value) return; + if (value) + pm_runtime_get(&priv->i2c_client->dev); + else + pm_runtime_put_autosuspend(&priv->i2c_client->dev); + led->new_brightness = value; schedule_work(&led->work); } @@ -312,7 +314,6 @@ static int cap11xx_init_leds(struct device *dev, error = devm_led_classdev_register(dev, &led->cdev); if (error < 0) return -EINVAL; - priv->num_leds++; led++; }; @@ -446,17 +447,23 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, priv->idev->open = cap11xx_input_open; priv->idev->close = cap11xx_input_close; - error = cap11xx_init_leds(dev, priv, cap->num_leds); + error = cap11xx_set_sleep(priv, true); if (error) return error; - input_set_drvdata(priv->idev, priv); + error = pm_runtime_set_active(dev); + if (error) + return error; - /* - * Put the device in deep sleep mode for now. - * ->open() will bring it back once the it is actually needed. - */ - cap11xx_set_sleep(priv, true); + pm_runtime_enable(dev); + pm_runtime_set_autosuspend_delay(dev, 1000); + pm_runtime_use_autosuspend(dev); + + error = cap11xx_init_leds(dev, priv, cap->num_leds); + if (error) + return error; + priv->i2c_client = i2c_client; + input_set_drvdata(priv->idev, priv); error = input_register_device(priv->idev); if (error) @@ -476,6 +483,17 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, return 0; } +static int cap11xx_i2c_remove(struct i2c_client *i2c_client) +{ + struct cap11xx_priv *priv = i2c_get_clientdata(i2c_client); + + pm_runtime_disable(&i2c_client->dev); + pm_runtime_set_suspended(&i2c_client->dev); + cap11xx_set_sleep(priv, true); + + return 0; +} + static const struct of_device_id cap11xx_dt_ids[] = { { .compatible = "microchip,cap1106", }, { .compatible = "microchip,cap1126", }, @@ -492,14 +510,35 @@ static const struct i2c_device_id cap11xx_i2c_ids[] = { }; MODULE_DEVICE_TABLE(i2c, cap11xx_i2c_ids); +static int cap11xx_runtime_suspend(struct device *dev) +{ + struct cap11xx_priv *priv = i2c_get_clientdata(to_i2c_client(dev)); + + return cap11xx_set_sleep(priv, true); +} + +static int cap11xx_runtime_resume(struct device *dev) +{ + struct cap11xx_priv *priv = i2c_get_clientdata(to_i2c_client(dev)); + + return cap11xx_set_sleep(priv, false); +} + +static const struct dev_pm_ops cap11xx_pm_ops = { + SET_RUNTIME_PM_OPS(cap11xx_runtime_suspend, + cap11xx_runtime_resume, NULL) +}; + static struct i2c_driver cap11xx_i2c_driver = { .driver = { .name = "cap11xx", .owner = THIS_MODULE, .of_match_table = cap11xx_dt_ids, + .pm = &cap11xx_pm_ops, }, .id_table = cap11xx_i2c_ids, .probe = cap11xx_i2c_probe, + .remove = cap11xx_i2c_remove, }; module_i2c_driver(cap11xx_i2c_driver);