Commit 2049a9e5 authored by Vinod Koul's avatar Vinod Koul Committed by Dmitry Torokhov

Input: pm8941-pwrkey - abstract register offsets and event code

In order to support resin thru the pwrkey driver (they are very
similar in nature) we need to abstract the handling in this driver.

First we abstract pull_up_bit and status_bit along in driver data.
The event code sent for key events is quiried from DT.

Since the device can be child of pon lookup regmap and reg from
parent if lookup fails (we are child).
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 0b64fa0a
...@@ -32,6 +32,14 @@ PROPERTIES ...@@ -32,6 +32,14 @@ PROPERTIES
Definition: presence of this property indicates that the KPDPWR_N pin Definition: presence of this property indicates that the KPDPWR_N pin
should be configured for pull up. should be configured for pull up.
- linux,code:
Usage: optional
Value type: <u32>
Definition: The input key-code associated with the power key.
Use the linux event codes defined in
include/dt-bindings/input/linux-event-codes.h
When property is omitted KEY_POWER is assumed.
EXAMPLE EXAMPLE
pwrkey@800 { pwrkey@800 {
...@@ -40,4 +48,5 @@ EXAMPLE ...@@ -40,4 +48,5 @@ EXAMPLE
interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>; interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
debounce = <15625>; debounce = <15625>;
bias-pull-up; bias-pull-up;
linux,code = <KEY_POWER>;
}; };
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/regmap.h> #include <linux/regmap.h>
...@@ -42,6 +43,10 @@ ...@@ -42,6 +43,10 @@
#define PON_DBC_CTL 0x71 #define PON_DBC_CTL 0x71
#define PON_DBC_DELAY_MASK 0x7 #define PON_DBC_DELAY_MASK 0x7
struct pm8941_data {
unsigned int pull_up_bit;
unsigned int status_bit;
};
struct pm8941_pwrkey { struct pm8941_pwrkey {
struct device *dev; struct device *dev;
...@@ -52,6 +57,9 @@ struct pm8941_pwrkey { ...@@ -52,6 +57,9 @@ struct pm8941_pwrkey {
unsigned int revision; unsigned int revision;
struct notifier_block reboot_notifier; struct notifier_block reboot_notifier;
u32 code;
const struct pm8941_data *data;
}; };
static int pm8941_reboot_notify(struct notifier_block *nb, static int pm8941_reboot_notify(struct notifier_block *nb,
...@@ -124,7 +132,8 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data) ...@@ -124,7 +132,8 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data)
if (error) if (error)
return IRQ_HANDLED; return IRQ_HANDLED;
input_report_key(pwrkey->input, KEY_POWER, !!(sts & PON_KPDPWR_N_SET)); input_report_key(pwrkey->input, pwrkey->code,
sts & pwrkey->data->status_bit);
input_sync(pwrkey->input); input_sync(pwrkey->input);
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -157,6 +166,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) ...@@ -157,6 +166,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
{ {
struct pm8941_pwrkey *pwrkey; struct pm8941_pwrkey *pwrkey;
bool pull_up; bool pull_up;
struct device *parent;
u32 req_delay; u32 req_delay;
int error; int error;
...@@ -175,24 +185,37 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) ...@@ -175,24 +185,37 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
pwrkey->dev = &pdev->dev; pwrkey->dev = &pdev->dev;
pwrkey->data = of_device_get_match_data(&pdev->dev);
pwrkey->regmap = dev_get_regmap(pdev->dev.parent, NULL); parent = pdev->dev.parent;
pwrkey->regmap = dev_get_regmap(parent, NULL);
if (!pwrkey->regmap) {
/*
* We failed to get regmap for parent. Let's see if we are
* a child of pon node and read regmap and reg from its
* parent.
*/
pwrkey->regmap = dev_get_regmap(parent->parent, NULL);
if (!pwrkey->regmap) { if (!pwrkey->regmap) {
dev_err(&pdev->dev, "failed to locate regmap\n"); dev_err(&pdev->dev, "failed to locate regmap\n");
return -ENODEV; return -ENODEV;
} }
error = of_property_read_u32(parent->of_node,
"reg", &pwrkey->baseaddr);
} else {
error = of_property_read_u32(pdev->dev.of_node, "reg",
&pwrkey->baseaddr);
}
if (error)
return error;
pwrkey->irq = platform_get_irq(pdev, 0); pwrkey->irq = platform_get_irq(pdev, 0);
if (pwrkey->irq < 0) { if (pwrkey->irq < 0) {
dev_err(&pdev->dev, "failed to get irq\n"); dev_err(&pdev->dev, "failed to get irq\n");
return pwrkey->irq; return pwrkey->irq;
} }
error = of_property_read_u32(pdev->dev.of_node, "reg",
&pwrkey->baseaddr);
if (error)
return error;
error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2, error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2,
&pwrkey->revision); &pwrkey->revision);
if (error) { if (error) {
...@@ -200,13 +223,21 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) ...@@ -200,13 +223,21 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
return error; return error;
} }
error = of_property_read_u32(pdev->dev.of_node, "linux,code",
&pwrkey->code);
if (error) {
dev_dbg(&pdev->dev,
"no linux,code assuming power (%d)\n", error);
pwrkey->code = KEY_POWER;
}
pwrkey->input = devm_input_allocate_device(&pdev->dev); pwrkey->input = devm_input_allocate_device(&pdev->dev);
if (!pwrkey->input) { if (!pwrkey->input) {
dev_dbg(&pdev->dev, "unable to allocate input device\n"); dev_dbg(&pdev->dev, "unable to allocate input device\n");
return -ENOMEM; return -ENOMEM;
} }
input_set_capability(pwrkey->input, EV_KEY, KEY_POWER); input_set_capability(pwrkey->input, EV_KEY, pwrkey->code);
pwrkey->input->name = "pm8941_pwrkey"; pwrkey->input->name = "pm8941_pwrkey";
pwrkey->input->phys = "pm8941_pwrkey/input0"; pwrkey->input->phys = "pm8941_pwrkey/input0";
...@@ -225,8 +256,8 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) ...@@ -225,8 +256,8 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
error = regmap_update_bits(pwrkey->regmap, error = regmap_update_bits(pwrkey->regmap,
pwrkey->baseaddr + PON_PULL_CTL, pwrkey->baseaddr + PON_PULL_CTL,
PON_KPDPWR_PULL_UP, pwrkey->data->pull_up_bit,
pull_up ? PON_KPDPWR_PULL_UP : 0); pull_up ? pwrkey->data->pull_up_bit : 0);
if (error) { if (error) {
dev_err(&pdev->dev, "failed to set pull: %d\n", error); dev_err(&pdev->dev, "failed to set pull: %d\n", error);
return error; return error;
...@@ -271,8 +302,13 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) ...@@ -271,8 +302,13 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct pm8941_data pwrkey_data = {
.pull_up_bit = PON_KPDPWR_PULL_UP,
.status_bit = PON_KPDPWR_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" }, { .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table); MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment