From: Anson Huang <Anson.Huang@nxp.com>
To: <dmitry.torokhov@gmail.com>, <keescook@chromium.org>,
<linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] input: snvs_pwrkey: add clock support
Date: Wed, 10 Jan 2018 17:10:22 +0800 [thread overview]
Message-ID: <1515575422-8843-1-git-send-email-Anson.Huang@nxp.com> (raw)
Add optional clock enable/disable support for the SNVS pwrkey,
which is required for accessing SNVS block on some i.MX SoCs
like i.MX7D.
If SNVS clock is required, it needs to be passed from dtb file
and SNVS pwrkey driver will enable it.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
drivers/input/keyboard/snvs_pwrkey.c | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
index 53c768b..51642aa 100644
--- a/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
@@ -43,6 +44,7 @@ struct pwrkey_drv_data {
int wakeup;
struct timer_list check_timer;
struct input_dev *input;
+ struct clk *clk;
};
static void imx_imx_snvs_check_for_events(struct timer_list *t)
@@ -129,6 +131,18 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
return -EINVAL;
}
+ pdata->clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(pdata->clk)) {
+ pdata->clk = NULL;
+ } else {
+ error = clk_prepare_enable(pdata->clk);
+ if (error) {
+ dev_err(&pdev->dev,
+ "Could not prepare or enable the snvs clock\n");
+ return error;
+ }
+ }
+
regmap_update_bits(pdata->snvs, SNVS_LPCR_REG, SNVS_LPCR_DEP_EN, SNVS_LPCR_DEP_EN);
/* clear the unexpected interrupt before driver ready */
@@ -139,7 +153,8 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
input = devm_input_allocate_device(&pdev->dev);
if (!input) {
dev_err(&pdev->dev, "failed to allocate the input device\n");
- return -ENOMEM;
+ error = -ENOMEM;
+ goto error_snvs_pwrkey_device_register;
}
input->name = pdev->name;
@@ -152,7 +167,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
error = devm_add_action(&pdev->dev, imx_snvs_pwrkey_act, pdata);
if (error) {
dev_err(&pdev->dev, "failed to register remove action\n");
- return error;
+ goto error_snvs_pwrkey_device_register;
}
error = devm_request_irq(&pdev->dev, pdata->irq,
@@ -161,13 +176,13 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
if (error) {
dev_err(&pdev->dev, "interrupt not available.\n");
- return error;
+ goto error_snvs_pwrkey_device_register;
}
error = input_register_device(input);
if (error < 0) {
dev_err(&pdev->dev, "failed to register input device\n");
- return error;
+ goto error_snvs_pwrkey_device_register;
}
pdata->input = input;
@@ -176,6 +191,13 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, pdata->wakeup);
return 0;
+
+error_snvs_pwrkey_device_register:
+ if (pdata->clk)
+ clk_disable_unprepare(pdata->clk);
+
+ return error;
+
}
static int __maybe_unused imx_snvs_pwrkey_suspend(struct device *dev)
--
1.9.1
next reply other threads:[~2018-01-10 9:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 9:10 Anson Huang [this message]
2018-01-11 0:23 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515575422-8843-1-git-send-email-Anson.Huang@nxp.com \
--to=anson.huang@nxp.com \
--cc=dmitry.torokhov@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®