From: Neil Armstrong <narmstrong@baylibre.com>
To: dmitry.torokhov@gmail.com, andy.gross@linaro.org,
david.brown@linaro.org, lee.jones@linaro.org,
lgirdwood@gmail.com, broonie@kernel.org, a.zummo@towertech.it,
alexandre.belloni@free-electrons.com
Cc: Neil Armstrong <narmstrong@baylibre.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org,
rtc-linux@googlegroups.com
Subject: [PATCH 2/5] input: pmic8xxx-pwrkey: Add support for pm8018 pwrkey
Date: Fri, 17 Jun 2016 12:22:06 +0200 [thread overview]
Message-ID: <1466158929-19524-3-git-send-email-narmstrong@baylibre.com> (raw)
In-Reply-To: <1466158929-19524-1-git-send-email-narmstrong@baylibre.com>
In order to support pwrkey for Qualcomm MDM9615 SoC, add support
for the pm8018 pwrkey in pmic8xxx-pwrkey.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt | 1 +
drivers/input/misc/pmic8xxx-pwrkey.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt
index 588536c..9e530e2 100644
--- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt
+++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt
@@ -8,6 +8,7 @@ PROPERTIES
Definition: must be one of:
"qcom,pm8058-pwrkey"
"qcom,pm8921-pwrkey"
+ "qcom,pm8018-pwrkey"
- reg:
Usage: required
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 67aab86..f6f9b87 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -446,6 +446,7 @@ static int pmic8xxx_pwrkey_remove(struct platform_device *pdev)
}
static const struct of_device_id pm8xxx_pwr_key_id_table[] = {
+ { .compatible = "qcom,pm8018-pwrkey", .data = &pm8921_pwrkey_shutdown },
{ .compatible = "qcom,pm8058-pwrkey", .data = &pm8058_pwrkey_shutdown },
{ .compatible = "qcom,pm8921-pwrkey", .data = &pm8921_pwrkey_shutdown },
{ }
--
1.9.1
next prev parent reply other threads:[~2016-06-17 10:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 10:22 [PATCH 0/5] Add support for the Qualcomm PM8018 PMIC Neil Armstrong
2016-06-17 10:22 ` [PATCH 1/5] mfd: pm8921: Add support for pm8018 Neil Armstrong
2016-06-22 5:07 ` Bjorn Andersson
2016-06-17 10:22 ` Neil Armstrong [this message]
2016-06-18 16:21 ` [PATCH 2/5] input: pmic8xxx-pwrkey: Add support for pm8018 pwrkey Dmitry Torokhov
2016-06-22 5:25 ` Bjorn Andersson
2016-06-22 5:33 ` Dmitry Torokhov
2016-06-17 10:22 ` [PATCH 3/5] rtc: rtc-pm8xxx: Add support for pm8018 rtc Neil Armstrong
2016-06-21 16:24 ` Alexandre Belloni
2016-06-22 5:06 ` Bjorn Andersson
2016-06-17 10:22 ` [PATCH 4/5] mfd: qcom-rpm: Add support for pm8018 RPM Regulator Neil Armstrong
2016-06-22 5:23 ` Bjorn Andersson
2016-06-22 8:34 ` Neil Armstrong
2016-06-22 15:52 ` Bjorn Andersson
2016-06-17 10:22 ` [PATCH 5/5] regulator: qcom_rpm-regulator: Add support for pm8018 rpm regulator Neil Armstrong
2016-06-17 12:24 ` Mark Brown
2016-06-17 16:53 ` Bjorn Andersson
2016-06-18 9:47 ` Mark Brown
2016-06-20 9:03 ` Neil Armstrong
2016-06-22 8:39 ` Neil Armstrong
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=1466158929-19524-3-git-send-email-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=andy.gross@linaro.org \
--cc=broonie@kernel.org \
--cc=david.brown@linaro.org \
--cc=dmitry.torokhov@gmail.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/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;
as well as URLs for NNTP newsgroup(s).