From patchwork Fri Dec 2 22:19:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9459351 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 A79DC60515 for ; Fri, 2 Dec 2016 22:25:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B25C2858E for ; Fri, 2 Dec 2016 22:25:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FBAD285AD; Fri, 2 Dec 2016 22:25:48 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 014322858E for ; Fri, 2 Dec 2016 22:25:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755791AbcLBWZk (ORCPT ); Fri, 2 Dec 2016 17:25:40 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:34454 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753035AbcLBWZi (ORCPT ); Fri, 2 Dec 2016 17:25:38 -0500 Received: by mail-pg0-f46.google.com with SMTP id x23so111916278pgx.1 for ; Fri, 02 Dec 2016 14:25: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=uIXM7bo+fTWqjuSvNNvSrRIa1pvfk7dE5HWd0Pnp/zg=; b=g3Qco09gAtVO/lwtvVOFydVtVaB5cv2DenkAnEX3llUUC+APaD9hKGf2wa977KWNIg RYrZaZMPgF+zZk3szJZfU90QLjBNgRMGaXAggT4Y/8ptKzty2Ttm88g91MANywDYpjnv cbRPmIaHwITtyYrhy+0QzxumQhDo/8qB7TelA= 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=uIXM7bo+fTWqjuSvNNvSrRIa1pvfk7dE5HWd0Pnp/zg=; b=RLQmfO01YGzFKMz2un7tTPy1reBUGzCbUQmrngRDpuoNQaTYWn2xRTekKPF3yXH0wA X6DvsqT0BIbXc4+Ss2h7RfprBBuV394jwQDP6XrG3ir9A/iVLYGuyLBNPpgO+4aukegO zTCnaahCSEActLjWfOzLsHS7IyyxHrZ58X99qkRbvv3Ei8CVgD8X8KwBRyfyv00fbntN stIBF/oZOvlCs7b5rcM7H+a8kg4G0vIsvlEppV4bmTsAxMsm/P+khc9mVbH+lFXbuKJU U/+LFp/TwYNiUfNPou7PFYDyYZDjKJJhfb9sv2ZgpUIw3+Kq/XMcN4kXbNg6wEHagxXn a2BQ== X-Gm-Message-State: AKaTC02/vxDDeYWdPzwBCaHQv/dNV6YXDlL0NMflvgAPTnbs7sEPurRKfwPgWkr/FvupLBaY X-Received: by 10.84.209.143 with SMTP id y15mr101045533plh.180.1480717148787; Fri, 02 Dec 2016 14:19:08 -0800 (PST) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id t193sm10076460pgb.4.2016.12.02.14.19.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Dec 2016 14:19:08 -0800 (PST) From: Brian Norris To: Jiri Kosina , Benjamin Tissoires Cc: Caesar Wang , linux-rockchip@lists.infradead.org, Rob Herring , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Torokhov , Mark Rutland , Doug Anderson , Brian Norris Subject: [PATCH 2/2] HID: i2c-hid: support regulator power on/off Date: Fri, 2 Dec 2016 14:19:00 -0800 Message-Id: <1480717140-14558-2-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1480717140-14558-1-git-send-email-briannorris@chromium.org> References: <1480717140-14558-1-git-send-email-briannorris@chromium.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.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 Reviewed-by: Dmitry Torokhov Acked-by: Benjamin Tissoires --- 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 v4: * use devm_regulator_get() (with a 'dummy' regulator for most cases) instead of _optional() version, to make code less conditional (Dmitry) * fix but where 'init_delay_ms' wasn't getting assigned properly * disable regulator in probe() failure path --- drivers/hid/i2c-hid/i2c-hid.c | 44 +++++++++++++++++++++++++++++++++++++++++-- include/linux/i2c/i2c-hid.h | 6 ++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index b3ec4f2de875..5c6e037613d7 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -937,6 +938,10 @@ 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 = val; + return 0; } @@ -983,6 +988,15 @@ static int i2c_hid_probe(struct i2c_client *client, ihid->pdata = *platform_data; } + ihid->pdata.supply = devm_regulator_get(&client->dev, "vdd"); + if (IS_ERR(ihid->pdata.supply)) { + ret = PTR_ERR(ihid->pdata.supply); + if (ret != -EPROBE_DEFER) + dev_err(&client->dev, "Failed to get regulator: %d\n", + ret); + return ret; + } + if (client->irq > 0) { ihid->irq = client->irq; } else if (ACPI_COMPANION(&client->dev)) { @@ -1000,6 +1014,15 @@ static int i2c_hid_probe(struct i2c_client *client, } } + ret = regulator_enable(ihid->pdata.supply); + if (ret < 0) { + dev_err(&client->dev, "Failed to enable regulator: %d\n", + ret); + goto err; + } + if (ihid->pdata.init_delay_ms) + msleep(ihid->pdata.init_delay_ms); + i2c_set_clientdata(client, ihid); ihid->client = client; @@ -1015,7 +1038,7 @@ static int i2c_hid_probe(struct i2c_client *client, * real computation later. */ ret = i2c_hid_alloc_buffers(ihid, HID_MIN_BUFFER_SIZE); if (ret < 0) - goto err; + goto err_regulator; pm_runtime_get_noresume(&client->dev); pm_runtime_set_active(&client->dev); @@ -1070,6 +1093,9 @@ static int i2c_hid_probe(struct i2c_client *client, pm_runtime_put_noidle(&client->dev); pm_runtime_disable(&client->dev); +err_regulator: + regulator_disable(ihid->pdata.supply); + err: if (ihid->desc) gpiod_put(ihid->desc); @@ -1100,6 +1126,8 @@ static int i2c_hid_remove(struct i2c_client *client) if (ihid->desc) gpiod_put(ihid->desc); + regulator_disable(ihid->pdata.supply); + kfree(ihid); acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev)); @@ -1152,6 +1180,11 @@ static int i2c_hid_suspend(struct device *dev) else hid_warn(hid, "Failed to enable irq wake: %d\n", wake_status); + } else { + ret = regulator_disable(ihid->pdata.supply); + if (ret < 0) + hid_warn(hid, "Failed to disable supply: %d\n", + ret); } return 0; @@ -1165,7 +1198,14 @@ 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)) { + 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 */