hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: pm8941-pwrkey - add resin entry 

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>
This commit is contained in:
Vinod Koul 2018-07-30 23:05:49 -07:00 committed by Dmitry Torokhov
parent 2049a9e56a
commit 955c594ed1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
View File

@ -7,6 +7,7 @@ PROPERTIES
Value type: <string> Value type: <string>
Definition: must be one of: Definition: must be one of:
"qcom,pm8941-pwrkey" "qcom,pm8941-pwrkey"
"qcom,pm8941-resin"
- reg: - reg:
Usage: required Usage: required

8
drivers/input/misc/pm8941-pwrkey.c
View File

@ -29,6 +29,7 @@
#define PON_RT_STS 0x10 #define PON_RT_STS 0x10
#define PON_KPDPWR_N_SET BIT(0) #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_CTL 0x5a
#define PON_PS_HOLD_RST_CTL2 0x5b #define PON_PS_HOLD_RST_CTL2 0x5b
@ -39,6 +40,7 @@
#define PON_PULL_CTL 0x70 #define PON_PULL_CTL 0x70
#define PON_KPDPWR_PULL_UP BIT(1) #define PON_KPDPWR_PULL_UP BIT(1)
#define PON_RESIN_PULL_UP BIT(0)
#define PON_DBC_CTL 0x71 #define PON_DBC_CTL 0x71
#define PON_DBC_DELAY_MASK 0x7 #define PON_DBC_DELAY_MASK 0x7
@ -307,8 +309,14 @@ static const struct pm8941_data pwrkey_data = {
.status_bit = PON_KPDPWR_N_SET, .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[] = { static const struct of_device_id pm8941_pwr_key_id_table[] = {
{ .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data }, { .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data },
{ .compatible = "qcom,pm8941-resin", .data = &resin_data },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table); MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);