Merge branch 'master' of git://blackhole.kfki.hu/nf

[linux.git] / drivers / input / keyboard / snvs_pwrkey.c

diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
index e76b7a400a1c1383f8630be0c0535293a9567d5d..2f5e3ab5ed638c9f7d0691f40528b766cf794134 100644 (file)
--- a/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@ -19,15 +19,16 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
-#define SNVS_LPSR_REG  0x4C    /* LP Status Register */
-#define SNVS_LPCR_REG  0x38    /* LP Control Register */
-#define SNVS_HPSR_REG  0x14
-#define SNVS_HPSR_BTN  BIT(6)
-#define SNVS_LPSR_SPO  BIT(18)
-#define SNVS_LPCR_DEP_EN BIT(5)
+#define SNVS_HPVIDR1_REG       0xF8
+#define SNVS_LPSR_REG          0x4C    /* LP Status Register */
+#define SNVS_LPCR_REG          0x38    /* LP Control Register */
+#define SNVS_HPSR_REG          0x14
+#define SNVS_HPSR_BTN          BIT(6)
+#define SNVS_LPSR_SPO          BIT(18)
+#define SNVS_LPCR_DEP_EN       BIT(5)
 
-#define DEBOUNCE_TIME 30
-#define REPEAT_INTERVAL 60
+#define DEBOUNCE_TIME          30
+#define REPEAT_INTERVAL                60
 
 struct pwrkey_drv_data {
        struct regmap *snvs;
@@ -37,6 +38,7 @@ struct pwrkey_drv_data {
        int wakeup;
        struct timer_list check_timer;
        struct input_dev *input;
+       u8 minor_rev;
 };
 
 static void imx_imx_snvs_check_for_events(struct timer_list *t)
@@ -67,13 +69,29 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
 {
        struct platform_device *pdev = dev_id;
        struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev);
+       struct input_dev *input = pdata->input;
        u32 lp_status;
 
-       pm_wakeup_event(pdata->input->dev.parent, 0);
+       pm_wakeup_event(input->dev.parent, 0);
 
        regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status);
-       if (lp_status & SNVS_LPSR_SPO)
-               mod_timer(&pdata->check_timer, jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
+       if (lp_status & SNVS_LPSR_SPO) {
+               if (pdata->minor_rev == 0) {
+                       /*
+                        * The first generation i.MX6 SoCs only sends an
+                        * interrupt on button release. To mimic power-key
+                        * usage, we'll prepend a press event.
+                        */
+                       input_report_key(input, pdata->keycode, 1);
+                       input_sync(input);
+                       input_report_key(input, pdata->keycode, 0);
+                       input_sync(input);
+                       pm_relax(input->dev.parent);
+               } else {
+                       mod_timer(&pdata->check_timer,
+                                 jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
+               }
+       }
 
        /* clear SPO status */
        regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO);
@@ -90,10 +108,11 @@ static void imx_snvs_pwrkey_act(void *pdata)
 
 static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
 {
-       struct pwrkey_drv_data *pdata = NULL;
-       struct input_dev *input = NULL;
+       struct pwrkey_drv_data *pdata;
+       struct input_dev *input;
        struct device_node *np;
        int error;
+       u32 vid;
 
        /* Get SNVS register Page */
        np = pdev->dev.of_node;
@@ -121,6 +140,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
        if (pdata->irq < 0)
                return -EINVAL;
 
+       regmap_read(pdata->snvs, SNVS_HPVIDR1_REG, &vid);
+       pdata->minor_rev = vid & 0xff;
+
        regmap_update_bits(pdata->snvs, SNVS_LPCR_REG, SNVS_LPCR_DEP_EN, SNVS_LPCR_DEP_EN);
 
        /* clear the unexpected interrupt before driver ready */