From patchwork Fri Feb 10 02:03:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9565893 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 9208560216 for ; Fri, 10 Feb 2017 02:04:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 820002853B for ; Fri, 10 Feb 2017 02:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 767E72854A; Fri, 10 Feb 2017 02:04:29 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A0162853B for ; Fri, 10 Feb 2017 02:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=u0ZMp2uCgQ3KL0eT0P8EeVnTEmkjqiMdhaaEiCExVow=; b=sNxUOb7lBl1OTcJJDxT+wamevR jE8O9MteK4GbSOWZiHEVRNDEOkmWlECojdSYbASs3Q3MXfK54uqewJFRy69dzywuewUSHKONaMZKY NsPn4zp5Y4czm8FuSKgIyTAt+wk68ynJvACP1D+iXHfd3C8uWB+ueW5WtHMv0pXzXAy9yKkHWoNv+ 45qvgAiTRN4zE/7g4ZWcMeAg+XjCFh/D2hj1FW1r5IMwPAG7ZrlExuvloi/3h/vAomJd4f9PdT0vf m9j6Obq+YsFQOl48w1boCXSf/pnYA09om5MrVB4rTmhBHdF2Gkbmnp/NbwjyhRoKJHUp3ZJcqHvQP cg02LLig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cc0ZY-0005I0-O0; Fri, 10 Feb 2017 02:04:28 +0000 Received: from mail-pg0-x22c.google.com ([2607:f8b0:400e:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cc0ZT-0005G9-Dl for linux-rockchip@lists.infradead.org; Fri, 10 Feb 2017 02:04:27 +0000 Received: by mail-pg0-x22c.google.com with SMTP id v184so5643464pgv.3 for ; Thu, 09 Feb 2017 18:04:03 -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=nLmPb36i4H5FfzdlWoeNx0lBfYCSXLm/A/UJwca8VsQ=; b=U4aJTCxIxa/SDwvczLT6gMNELaIYfMFTprVDsjWfMKO6OhscX28ieYr3td6vXz9+so V4U17l5eoOj8s/UU+5TvF7nUrVXkezGTpnbAVYsxB4G1Zq03N3Hd266XlM2IChSDNtmS CcrT1TSb3eeg1I1GumgzKY2MlUSE6Ks6Hiub8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nLmPb36i4H5FfzdlWoeNx0lBfYCSXLm/A/UJwca8VsQ=; b=mgmOw/puCuL4yiNgn4HBhxdCsS0mHFMRj+eEozM0CZHoJBE8P0fHlvBngrcQ7zEEu2 9ewYf65Kql14MAAppM849h4YGlYrxrpA/DC+R7c3H1OcHkevMu5WbA5dVoIP3RSq2zX3 4s86c2Q8wJM7QqXt4oWTG1JXX5Cn1dA4tgU12jvg3T0msHNCS/d9ieucZ/DCoL5uiyeW zSysbIe3mSCfVRgVgB1HmpuwbI0lmKk9c3zj/bfv4byFrHnUF/5JWjz2Rjt04m/3OuTW PZk6mJaCrdyAnVdtVO7zmoYXf4skmOsGlgn5HMYyZayL14WeopEq2vfSQ1RLXA3L5UqZ gn6A== X-Gm-Message-State: AMke39mvOtyTkZOVkKP9Id7Yb7omW4BE7AxM32lOf1w0TSWAp6Lud6WNV2qq2KU7pDCFLMom X-Received: by 10.99.39.70 with SMTP id n67mr7538321pgn.203.1486692242758; Thu, 09 Feb 2017 18:04:02 -0800 (PST) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id w16sm247966pgc.15.2017.02.09.18.04.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Feb 2017 18:04:02 -0800 (PST) From: Brian Norris To: Jiri Kosina , Benjamin Tissoires Subject: [PATCH v5 2/2] HID: i2c-hid: support regulator power on/off Date: Thu, 9 Feb 2017 18:03:57 -0800 Message-Id: <20170210020357.10679-2-briannorris@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170210020357.10679-1-briannorris@chromium.org> References: <20170210020357.10679-1-briannorris@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170209_180423_496903_CA5D4BCA X-CRM114-Status: GOOD ( 16.85 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 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 Acked-by: Benjamin Tissoires Reviewed-by: Dmitry Torokhov 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 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 v5: * rebase * use 'post-power-on-delay-ms' name --- drivers/hid/i2c-hid/i2c-hid.c | 42 ++++++++++++++++++++++++++++++++++++++++-- include/linux/i2c/i2c-hid.h | 6 ++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index ea3c3546cef7..a3f6daf0886b 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -994,6 +994,11 @@ static int i2c_hid_of_probe(struct i2c_client *client, } pdata->hid_descriptor_address = val; + ret = of_property_read_u32(dev->of_node, "post-power-on-delay-ms", + &val); + if (!ret) + pdata->post_power_delay_ms = val; + return 0; } @@ -1053,6 +1058,24 @@ 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; + } + + 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.post_power_delay_ms) + msleep(ihid->pdata.post_power_delay_ms); + i2c_set_clientdata(client, ihid); ihid->client = client; @@ -1068,7 +1091,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); @@ -1125,6 +1148,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: i2c_hid_free_buffers(ihid); kfree(ihid); @@ -1149,6 +1175,8 @@ static int i2c_hid_remove(struct i2c_client *client) if (ihid->bufsize) i2c_hid_free_buffers(ihid); + regulator_disable(ihid->pdata.supply); + kfree(ihid); return 0; @@ -1199,6 +1227,10 @@ 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; @@ -1212,7 +1244,13 @@ 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.post_power_delay_ms) + msleep(ihid->pdata.post_power_delay_ms); + } else if (ihid->irq_wake_enabled) { wake_status = disable_irq_wake(client->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..1fb088239d12 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. + * @post_power_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 post_power_delay_ms; }; #endif /* __LINUX_I2C_HID_H */