From patchwork Sun Aug 23 21:17:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 7058831 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 799A7C05AC for ; Sun, 23 Aug 2015 21:18:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A8FB2041E for ; Sun, 23 Aug 2015 21:18:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36462204C9 for ; Sun, 23 Aug 2015 21:18:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759AbbHWVSD (ORCPT ); Sun, 23 Aug 2015 17:18:03 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34912 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbbHWVSD (ORCPT ); Sun, 23 Aug 2015 17:18:03 -0400 Received: by pacdd16 with SMTP id dd16so80979107pac.2 for ; Sun, 23 Aug 2015 14:18:02 -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=CFt6u9roKktEQI85mJ8DjFBQaKeusGCYkdmYH5rlxuI=; b=cJIIVWcbgNyAdSkpzOol/PWZwKxAYQqflhOrtZ9QZXoHzMcZC73bShI3rLv9nF1Q7P CdiQ4OTn2TEWZl9Rtnv1jD1aCyoLKw4ztKYauzu/vz6C8mCqUZk4Vpl5AwC2SvxgYYiE OrxndnSHII6uiSx7IBpmqObPqNPrmE+wRvqgSzr3IGhQOkGfoz4UsT5+Up88cN4jJIUl DwcITCZ0z2iYu7OuxkX2EZ6flothAAakVCE7lmNc3rvktEmHAlRAqysW9ISaKgqPRvcN 3iYW1dV/YcVzZB9IL/oNXhZL4GOUKv4lPQvYCrtbdymmktthmPbIxZmEdsRmLHGjhwjM Grng== X-Received: by 10.69.1.7 with SMTP id bc7mr39422432pbd.154.1440364682443; Sun, 23 Aug 2015 14:18:02 -0700 (PDT) Received: from localhost.localdomain (c-76-105-208-73.hsd1.or.comcast.net. [76.105.208.73]) by smtp.gmail.com with ESMTPSA id xo14sm14928969pac.24.2015.08.23.14.18.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Aug 2015 14:18:01 -0700 (PDT) From: Matt Ranostay To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Matt Ranostay Subject: [PATCH v4 1/1] cap11xx: add runtime PM support Date: Sun, 23 Aug 2015 14:17:57 -0700 Message-Id: <1440364677-1016-2-git-send-email-mranostay@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440364677-1016-1-git-send-email-mranostay@gmail.com> References: <1440364677-1016-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.0 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 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 | 84 +++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 378db10..13fae03 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,12 +208,6 @@ out: static int cap11xx_set_sleep(struct cap11xx_priv *priv, bool sleep) { - /* - * DLSEEP mode will turn off all LEDS, prevent this - */ - if (IS_ENABLED(CONFIG_LEDS_CLASS) && priv->num_leds) - return 0; - return regmap_update_bits(priv->regmap, CAP11XX_REG_MAIN_CONTROL, CAP11XX_REG_MAIN_CONTROL_DLSEEP, sleep ? CAP11XX_REG_MAIN_CONTROL_DLSEEP : 0); @@ -222,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 @@ -251,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); } @@ -315,8 +318,6 @@ static int cap11xx_init_leds(struct device *dev, error = devm_led_classdev_register(dev, &led->cdev); if (error) return error; - - priv->num_leds++; led++; } @@ -330,6 +331,16 @@ static int cap11xx_init_leds(struct device *dev, } #endif +static void cap11xx_shutdown_act(void *data) +{ + struct i2c_client *i2c_client = data; + struct cap11xx_priv *priv = i2c_get_clientdata(i2c_client); + + cap11xx_set_sleep(priv, true); + pm_runtime_disable(&i2c_client->dev); + pm_runtime_set_suspended(&i2c_client->dev); +} + static int cap11xx_i2c_probe(struct i2c_client *i2c_client, const struct i2c_device_id *id) { @@ -363,6 +374,14 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); + error = devm_add_action(dev, cap11xx_shutdown_act, i2c_client); + if (error) { + dev_err(dev, "failed to register remove action\n"); + return error; + } + i2c_set_clientdata(i2c_client, priv); + priv->i2c_client = i2c_client; + error = regmap_read(priv->regmap, CAP11XX_REG_PRODUCT_ID, &val); if (error) return error; @@ -388,7 +407,6 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, return error; dev_info(dev, "CAP11XX detected, revision 0x%02x\n", rev); - i2c_set_clientdata(i2c_client, priv); node = dev->of_node; if (!of_property_read_u32(node, "microchip,sensor-gain", &gain32)) { @@ -450,22 +468,28 @@ 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); + + input_set_drvdata(priv->idev, priv); error = input_register_device(priv->idev); if (error) return error; + error = cap11xx_init_leds(dev, priv, cap->num_leds); + if (error) + return error; + irq = irq_of_parse_and_map(node, 0); if (!irq) { dev_err(dev, "Unable to parse or map IRQ\n"); @@ -496,10 +520,32 @@ static const struct i2c_device_id cap11xx_i2c_ids[] = { }; MODULE_DEVICE_TABLE(i2c, cap11xx_i2c_ids); +#ifdef CONFIG_PM +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); +} +#endif + +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", .of_match_table = cap11xx_dt_ids, + .pm = &cap11xx_pm_ops, }, .id_table = cap11xx_i2c_ids, .probe = cap11xx_i2c_probe,