summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/input/misc/Kconfig8
-rw-r--r--drivers/input/misc/ab8500-ponkey.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 54789297273..69b99e2d400 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -30,11 +30,11 @@ config INPUT_AB8500_ACCDET
AB8500 Mix-Sig PMIC.
config INPUT_AB8500_PONKEY
- tristate "AB8500 Pon (PowerOn) Key"
- depends on AB8500_CORE
+ tristate "AB5500/AB8500 Pon (PowerOn) Key"
+ depends on AB5500_CORE || AB8500_CORE
help
- Say Y here to use the PowerOn Key for ST-Ericsson's AB8500
- Mix-Sig PMIC.
+ Say Y here to use the PowerOn Key for ST-Ericsson's AB5500/AB8500
+ Mix-Sig PMICs.
To compile this driver as a module, choose M here: the module
will be called ab8500-ponkey.
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index fe107402475..a6ade3aaf14 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -19,6 +19,11 @@ struct ab8500_ponkey_variant {
const char *irq_rising;
};
+static const struct ab8500_ponkey_variant ab5500_onswa = {
+ .irq_falling = "ONSWAn_falling",
+ .irq_rising = "ONSWAn_rising",
+};
+
static const struct ab8500_ponkey_variant ab8500_ponkey = {
.irq_falling = "ONKEY_DBF",
.irq_rising = "ONKEY_DBR",
@@ -145,6 +150,7 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev)
}
static struct platform_device_id ab8500_ponkey_id_table[] = {
+ { "ab5500-onswa", (kernel_ulong_t)&ab5500_onswa, },
{ "ab8500-poweron-key", (kernel_ulong_t)&ab8500_ponkey, },
{ },
};