Skip to content

Commit

Permalink
Input: pm8941-pwrkey - add resin entry
Browse files Browse the repository at this point in the history
Since handling is abstracted in this driver, we need to add resin entry
in id table along with pwrkey_data.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Vinod Koul authored and Dmitry Torokhov committed Jul 31, 2018
1 parent 2049a9e commit 955c594
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PROPERTIES
Value type: <string>
Definition: must be one of:
"qcom,pm8941-pwrkey"
"qcom,pm8941-resin"

- reg:
Usage: required
Expand Down
8 changes: 8 additions & 0 deletions drivers/input/misc/pm8941-pwrkey.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#define PON_RT_STS 0x10
#define PON_KPDPWR_N_SET BIT(0)
#define PON_RESIN_N_SET BIT(1)

#define PON_PS_HOLD_RST_CTL 0x5a
#define PON_PS_HOLD_RST_CTL2 0x5b
Expand All @@ -39,6 +40,7 @@

#define PON_PULL_CTL 0x70
#define PON_KPDPWR_PULL_UP BIT(1)
#define PON_RESIN_PULL_UP BIT(0)

#define PON_DBC_CTL 0x71
#define PON_DBC_DELAY_MASK 0x7
Expand Down Expand Up @@ -307,8 +309,14 @@ static const struct pm8941_data pwrkey_data = {
.status_bit = PON_KPDPWR_N_SET,
};

static const struct pm8941_data resin_data = {
.pull_up_bit = PON_RESIN_PULL_UP,
.status_bit = PON_RESIN_N_SET,
};

static const struct of_device_id pm8941_pwr_key_id_table[] = {
{ .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data },
{ .compatible = "qcom,pm8941-resin", .data = &resin_data },
{ }
};
MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);
Expand Down

0 comments on commit 955c594

Please sign in to comment.