From patchwork Fri Dec 2 00:31:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9457491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B7B5760235 for ; Fri, 2 Dec 2016 00:32:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8BC92852B for ; Fri, 2 Dec 2016 00:32:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CC3728539; Fri, 2 Dec 2016 00:32:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4CD832852B for ; Fri, 2 Dec 2016 00:32:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCbln-0002iu-S3; Fri, 02 Dec 2016 00:32:07 +0000 Received: from mail-pf0-x234.google.com ([2607:f8b0:400e:c00::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCblf-0002JR-Gj for linux-rockchip@lists.infradead.org; Fri, 02 Dec 2016 00:32:03 +0000 Received: by mail-pf0-x234.google.com with SMTP id c4so48912466pfb.1 for ; Thu, 01 Dec 2016 16:31:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zGrXmMYVXEnnZ3YX7DzeksqwfV+RmKWywjL33enKf7k=; b=BQ3n00S25Zh/id/NtTh+05+qB/qHvDDOFn1Dt3elsXvVdWliMDFiiDrD9RS4b4twK8 GrXlO/c+8C8K/OLfxvABlWYC/nLRBM07JXArCjahKo5fvLAK3nfxY4kBtyEc5gMawRxc msALONexnsJ5IYbz7rNv0L+0q8I0eExTYIk/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zGrXmMYVXEnnZ3YX7DzeksqwfV+RmKWywjL33enKf7k=; b=U26nxT+kd+eRntAQXq5iMc1rn23zQijuxB2pt8v3tSs/jvcrhPriPAFXq9YfVUmBWV wNqEea1yME3fzsoicp32W7up6yDnQMg7gK0ovsGjfDcewGdCOh47l54WGKxya8zf/jm/ 6GJOuPRfDeMJjq1yk69/imSS3ip10iA5LCF1Me3+ZPCpSB/0ffws8LicHttPPEHvSgAy D+K3AR9GG9dTtE+K+zYFbDnWNiYH7uyHqzUPgGSseMjwClFRW96RdOLtws7bgPTzkZu5 uTjmjMSt6nhppwNt/6EeycVfYBd6js/pXxcmkC8UNmQ2yzAFj+QJGybw3JVGl1VYT2Y7 nJ+Q== X-Gm-Message-State: AKaTC03iBHlPE3GzgliOs3DWDoyhNjlvbBFwXsOUKDvcTNRd68nwTJ76Oz0UH3Y/hXQHgrZ/ X-Received: by 10.98.70.150 with SMTP id o22mr42172801pfi.134.1480638697979; Thu, 01 Dec 2016 16:31:37 -0800 (PST) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id z28sm2649456pgc.40.2016.12.01.16.31.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 16:31:37 -0800 (PST) From: Brian Norris To: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v3 2/2] HID: i2c-hid: support regulator power on/off Date: Thu, 1 Dec 2016 16:31:10 -0800 Message-Id: <1480638670-111492-2-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1480638670-111492-1-git-send-email-briannorris@chromium.org> References: <1480638670-111492-1-git-send-email-briannorris@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161201_163159_918235_81A61B44 X-CRM114-Status: GOOD ( 17.38 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Brian Norris , Dmitry Torokhov , linux-kernel@vger.kernel.org, Doug Anderson , linux-rockchip@lists.infradead.org, Rob Herring , linux-input@vger.kernel.org, Caesar Wang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On some boards, we need to enable a regulator before using the HID, and it's also nice to save power in suspend by disabling it. Support an optional "vdd-supply" and a companion initialization delay. Signed-off-by: Brian Norris Signed-off-by: Caesar Wang Cc: Jiri Kosina Cc: linux-input@vger.kernel.org --- v2: * support compatible property for wacom, with specific "vdd-supply" name * support the 100ms delay needed for this digitizer * target regulator support only at specific device v3: * drop Wacom specifics and allow this to be used generically * add "init-delay-ms" property support drivers/hid/i2c-hid/i2c-hid.c | 48 ++++++++++++++++++++++++++++++++++++++++++- include/linux/i2c/i2c-hid.h | 6 ++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index b3ec4f2de875..4cb523133d13 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -37,7 +37,9 @@ #include #include #include +#include #include +#include #include @@ -937,6 +939,22 @@ static int i2c_hid_of_probe(struct i2c_client *client, } pdata->hid_descriptor_address = val; + ret = of_property_read_u32(dev->of_node, "init-delay-ms", &val); + if (!ret) + pdata->init_delay_ms = ret; + + pdata->supply = devm_regulator_get_optional(dev, "vdd"); + if (IS_ERR(pdata->supply)) { + ret = PTR_ERR(pdata->supply); + pdata->supply = NULL; + if (ret == -EPROBE_DEFER) + return ret; + if (ret == -ENODEV) + return 0; + dev_err(dev, "Failed to get regulator: %d\n", ret); + return ret; + } + return 0; } @@ -983,6 +1001,17 @@ static int i2c_hid_probe(struct i2c_client *client, ihid->pdata = *platform_data; } + if (ihid->pdata.supply) { + ret = regulator_enable(ihid->pdata.supply); + if (ret < 0) { + dev_err(&client->dev, "Failed to enable regulator: %d\n", + ret); + return ret; + } + if (ihid->pdata.init_delay_ms) + msleep(ihid->pdata.init_delay_ms); + } + if (client->irq > 0) { ihid->irq = client->irq; } else if (ACPI_COMPANION(&client->dev)) { @@ -1100,6 +1129,9 @@ static int i2c_hid_remove(struct i2c_client *client) if (ihid->desc) gpiod_put(ihid->desc); + if (ihid->pdata.supply) + regulator_disable(ihid->pdata.supply); + kfree(ihid); acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev)); @@ -1152,6 +1184,11 @@ static int i2c_hid_suspend(struct device *dev) else hid_warn(hid, "Failed to enable irq wake: %d\n", wake_status); + } else if (ihid->pdata.supply) { + ret = regulator_disable(ihid->pdata.supply); + if (ret < 0) + hid_warn(hid, "Failed to disable supply: %d\n", + ret); } return 0; @@ -1165,7 +1202,16 @@ static int i2c_hid_resume(struct device *dev) struct hid_device *hid = ihid->hid; int wake_status; - if (device_may_wakeup(&client->dev) && ihid->irq_wake_enabled) { + if (!device_may_wakeup(&client->dev)) { + if (ihid->pdata.supply) { + ret = regulator_enable(ihid->pdata.supply); + if (ret < 0) + hid_warn(hid, "Failed to enable supply: %d\n", + ret); + if (ihid->pdata.init_delay_ms) + msleep(ihid->pdata.init_delay_ms); + } + } else if (ihid->irq_wake_enabled) { wake_status = disable_irq_wake(ihid->irq); if (!wake_status) ihid->irq_wake_enabled = false; diff --git a/include/linux/i2c/i2c-hid.h b/include/linux/i2c/i2c-hid.h index 7aa901d92058..97688cde4a91 100644 --- a/include/linux/i2c/i2c-hid.h +++ b/include/linux/i2c/i2c-hid.h @@ -14,9 +14,13 @@ #include +struct regulator; + /** * struct i2chid_platform_data - used by hid over i2c implementation. * @hid_descriptor_address: i2c register where the HID descriptor is stored. + * @supply: regulator for powering on the device. + * @init_delay_ms: delay after powering on before device is usable. * * Note that it is the responsibility of the platform driver (or the acpi 5.0 * driver, or the flattened device tree) to setup the irq related to the gpio in @@ -31,6 +35,8 @@ */ struct i2c_hid_platform_data { u16 hid_descriptor_address; + struct regulator *supply; + int init_delay_ms; }; #endif /* __LINUX_I2C_HID_H */