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>

diff --git a/Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt b/Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
index bf719396eaddd0a1657583db7de739412b5de980..34ab5763f49453926c38fc361e91e988d4cf591c 100644 (file)
--- a/Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
+++ b/Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
@@ -7,6 +7,7 @@ PROPERTIES
        Value type: <string>
        Definition: must be one of:
                    "qcom,pm8941-pwrkey"
+                   "qcom,pm8941-resin"
 
 - reg:
        Usage: required

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index e1b3914b141e35c3927ab76b7880f29d196958a2..48153e0ca19a3638be9aa004c107a3dfbfab0f52 100644 (file)
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -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
@@ -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
@@ -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);