From: Quentin Schulz <quentin.schulz@free-electrons.com>
To: dmitry.torokhov@gmail.com, wens@csie.org, lee.jones@linaro.org
Cc: Quentin Schulz <quentin.schulz@free-electrons.com>,
hdegoede@redhat.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org,
thomas.petazzoni@free-electrons.com,
maxime.ripard@free-electrons.com
Subject: [PATCH v2 3/3] Input: axp20x-pek: add support for AXP221 PEK
Date: Wed, 19 Jul 2017 09:43:37 +0200 [thread overview]
Message-ID: <20170719074337.19189-4-quentin.schulz@free-electrons.com> (raw)
In-Reply-To: <20170719074337.19189-1-quentin.schulz@free-electrons.com>
The AXP221 has different values for startup time bits from the AXP20X.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
---
drivers/input/misc/axp20x-pek.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
index fa49f45c0f0e..71fd0dc7dad4 100644
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@ -56,6 +56,13 @@ static const struct axp20x_time startup_time[] = {
{ .time = 2000, .idx = 3 },
};
+static const struct axp20x_time axp221_startup_time[] = {
+ { .time = 128, .idx = 0 },
+ { .time = 1000, .idx = 1 },
+ { .time = 2000, .idx = 2 },
+ { .time = 3000, .idx = 3 },
+};
+
static const struct axp20x_time shutdown_time[] = {
{ .time = 4000, .idx = 0 },
{ .time = 6000, .idx = 1 },
@@ -70,6 +77,13 @@ static const struct axp20x_info axp20x_info = {
.shutdown_mask = AXP20X_PEK_SHUTDOWN_MASK,
};
+static const struct axp20x_info axp221_info = {
+ .startup_time = axp221_startup_time,
+ .startup_mask = AXP20X_PEK_STARTUP_MASK,
+ .shutdown_time = shutdown_time,
+ .shutdown_mask = AXP20X_PEK_SHUTDOWN_MASK,
+};
+
static ssize_t axp20x_show_attr(struct device *dev,
const struct axp20x_time *time,
unsigned int mask, char *buf)
@@ -397,6 +411,9 @@ static const struct platform_device_id axp_pek_id_match[] = {
{
.name = "axp20x-pek",
.driver_data = (kernel_ulong_t)&axp20x_info,
+ }, {
+ .name = "axp221-pek",
+ .driver_data = (kernel_ulong_t)&axp221_info,
},
};
--
2.11.0
next prev parent reply other threads:[~2017-07-19 7:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 7:43 [PATCH v2 0/3] add support for AXP22X/AXP288/AXP8XX PEK Quentin Schulz
2017-07-19 7:43 ` [PATCH v2 1/3] Input: axp20x-pek: use driver_data of platform_device_id instead of extended attributes Quentin Schulz
2017-07-19 9:33 ` Maxime Ripard
2017-07-19 7:43 ` [PATCH v2 2/3] Input: axp20x-pek: remove mention to " Quentin Schulz
2017-08-02 8:50 ` Chen-Yu Tsai
2017-07-19 7:43 ` Quentin Schulz [this message]
2017-08-02 8:53 ` [PATCH v2 3/3] Input: axp20x-pek: add support for AXP221 PEK Chen-Yu Tsai
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=20170719074337.19189-4-quentin.schulz@free-electrons.com \
--to=quentin.schulz@free-electrons.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=lee.jones@linaro.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=wens@csie.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