linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source
@ 2012-04-01  2:08 Chao Xie
  2012-04-01  2:08 ` [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Chao Xie @ 2012-04-01  2:08 UTC (permalink / raw)
  To: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

When the keypad is used as wake up source, the clock can not
be disabled. Or it can not detect key pressing.
If the keypad is used as wake up source, when resume back,
do not enable the clock and configure it again because the
register content is retained.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 drivers/input/keyboard/pxa27x_keypad.c |   33 ++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 29fe1b2..b07771e 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -399,7 +399,7 @@ static int pxa27x_keypad_open(struct input_dev *dev)
 	struct pxa27x_keypad *keypad = input_get_drvdata(dev);
 
 	/* Enable unit clock */
-	clk_enable(keypad->clk);
+	clk_prepare_enable(keypad->clk);
 	pxa27x_keypad_config(keypad);
 
 	return 0;
@@ -410,7 +410,7 @@ static void pxa27x_keypad_close(struct input_dev *dev)
 	struct pxa27x_keypad *keypad = input_get_drvdata(dev);
 
 	/* Disable clock unit */
-	clk_disable(keypad->clk);
+	clk_disable_unprepare(keypad->clk);
 }
 
 #ifdef CONFIG_PM
@@ -419,10 +419,14 @@ static int pxa27x_keypad_suspend(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
 
-	clk_disable(keypad->clk);
-
+	/*
+	 * If the keypad is used a wake up source, clock can not be disabled.
+	 * Or it can not detect the key pressing.
+	 */
 	if (device_may_wakeup(&pdev->dev))
 		enable_irq_wake(keypad->irq);
+	else
+		clk_disable_unprepare(keypad->clk);
 
 	return 0;
 }
@@ -433,19 +437,24 @@ static int pxa27x_keypad_resume(struct device *dev)
 	struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
 	struct input_dev *input_dev = keypad->input_dev;
 
-	if (device_may_wakeup(&pdev->dev))
+	/*
+	 * If the keypad is used as wake up source, the clock is not turned
+	 * off. So do not need configure it again.
+	 */
+	if (device_may_wakeup(&pdev->dev)) {
 		disable_irq_wake(keypad->irq);
+	} else {
+		mutex_lock(&input_dev->mutex);
 
-	mutex_lock(&input_dev->mutex);
+		if (input_dev->users) {
+			/* Enable unit clock */
+			clk_prepare_enable(keypad->clk);
+			pxa27x_keypad_config(keypad);
+		}
 
-	if (input_dev->users) {
-		/* Enable unit clock */
-		clk_enable(keypad->clk);
-		pxa27x_keypad_config(keypad);
+		mutex_unlock(&input_dev->mutex);
 	}
 
-	mutex_unlock(&input_dev->mutex);
-
 	return 0;
 }
 
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask
  2012-04-01  2:08 [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
@ 2012-04-01  2:08 ` Chao Xie
  2012-04-02  9:37   ` Haojian Zhuang
  2012-04-01  2:08 ` [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active Chao Xie
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Chao Xie @ 2012-04-01  2:08 UTC (permalink / raw)
  To: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

When direcct_key_num is 0, the mask should be 0.
When direcct_key_num is 1, the mask should be 0b1.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 drivers/input/keyboard/pxa27x_keypad.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index b07771e..5d71720 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -383,7 +383,7 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
 	if (pdata->direct_key_num > direct_key_num)
 		direct_key_num = pdata->direct_key_num;
 
-	keypad->direct_key_mask = ((2 << direct_key_num) - 1) & ~mask;
+	keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
 
 	/* enable direct key */
 	if (direct_key_num)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active
  2012-04-01  2:08 [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
  2012-04-01  2:08 ` [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
@ 2012-04-01  2:08 ` Chao Xie
  2012-04-02  9:38   ` Haojian Zhuang
  2012-04-01  2:08 ` [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask Chao Xie
  2012-04-02  9:37 ` [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Haojian Zhuang
  3 siblings, 1 reply; 10+ messages in thread
From: Chao Xie @ 2012-04-01  2:08 UTC (permalink / raw)
  To: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

KPDK_DK only indicates the pin level of direct key.
So it is related to board, and low level may be active which
indicates that a key is pressed.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 arch/arm/plat-pxa/include/plat/pxa27x_keypad.h |    2 ++
 drivers/input/keyboard/pxa27x_keypad.c         |   10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
index abcc36e..7ffb16b 100644
--- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
+++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
@@ -44,6 +44,8 @@ struct pxa27x_keypad_platform_data {
 	/* direct keys */
 	int		direct_key_num;
 	unsigned int	direct_key_map[MAX_DIRECT_KEY_NUM];
+	/* the key output may be low active */
+	int		direct_key_low_active;
 
 	/* rotary encoders 0 */
 	int		enable_rotary0;
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 5d71720..a60f14e 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -311,7 +311,15 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
 	if (pdata->enable_rotary0 || pdata->enable_rotary1)
 		pxa27x_keypad_scan_rotary(keypad);
 
-	new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
+	/*
+	 * The KPDR_DK only output the key pin level, so it relates to board,
+	 * and low level may be active.
+	 */
+	if (pdata->direct_key_low_active)
+		new_state = ~KPDK_DK(kpdk) & keypad->direct_key_mask;
+	else
+		new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
+
 	bits_changed = keypad->direct_key_state ^ new_state;
 
 	if (bits_changed == 0)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
  2012-04-01  2:08 [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
  2012-04-01  2:08 ` [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
  2012-04-01  2:08 ` [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active Chao Xie
@ 2012-04-01  2:08 ` Chao Xie
  2012-04-02  9:38   ` Haojian Zhuang
  2012-04-02  9:37 ` [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Haojian Zhuang
  3 siblings, 1 reply; 10+ messages in thread
From: Chao Xie @ 2012-04-01  2:08 UTC (permalink / raw)
  To: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

Direct keys usage may not start from KP_DKIN0, add a msk option
to configure the specifics for platforms that can skip some keys.

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 arch/arm/plat-pxa/include/plat/pxa27x_keypad.h |    2 ++
 drivers/input/keyboard/pxa27x_keypad.c         |    9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
index 7ffb16b..5ce8d5e 100644
--- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
+++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
@@ -46,6 +46,8 @@ struct pxa27x_keypad_platform_data {
 	unsigned int	direct_key_map[MAX_DIRECT_KEY_NUM];
 	/* the key output may be low active */
 	int		direct_key_low_active;
+	/* give board a chance to choose the start direct key */
+	unsigned int	direct_key_mask;
 
 	/* rotary encoders 0 */
 	int		enable_rotary0;
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index a60f14e..7f7b724 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -391,7 +391,14 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
 	if (pdata->direct_key_num > direct_key_num)
 		direct_key_num = pdata->direct_key_num;
 
-	keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
+	/*
+	 * Direct keys usage may not start from KP_DKIN0, check the platfrom
+	 * mask data to config the specific.
+	 */
+	if (pdata->direct_key_mask)
+		keypad->direct_key_mask = pdata->direct_key_mask;
+	else
+		keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
 
 	/* enable direct key */
 	if (direct_key_num)
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source
  2012-04-01  2:08 [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
                   ` (2 preceding siblings ...)
  2012-04-01  2:08 ` [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask Chao Xie
@ 2012-04-02  9:37 ` Haojian Zhuang
  2012-04-27  9:04   ` Haojian Zhuang
  3 siblings, 1 reply; 10+ messages in thread
From: Haojian Zhuang @ 2012-04-02  9:37 UTC (permalink / raw)
  To: Chao Xie, Dmitry Torokhov
  Cc: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
> When the keypad is used as wake up source, the clock can not
> be disabled. Or it can not detect key pressing.
> If the keypad is used as wake up source, when resume back,
> do not enable the clock and configure it again because the
> register content is retained.
>
> Signed-off-by: Chao Xie <chao.xie@marvell.com>
> ---
>  drivers/input/keyboard/pxa27x_keypad.c |   33 ++++++++++++++++++++-----------
>  1 files changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index 29fe1b2..b07771e 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -399,7 +399,7 @@ static int pxa27x_keypad_open(struct input_dev *dev)
>        struct pxa27x_keypad *keypad = input_get_drvdata(dev);
>
>        /* Enable unit clock */
> -       clk_enable(keypad->clk);
> +       clk_prepare_enable(keypad->clk);
>        pxa27x_keypad_config(keypad);
>
>        return 0;
> @@ -410,7 +410,7 @@ static void pxa27x_keypad_close(struct input_dev *dev)
>        struct pxa27x_keypad *keypad = input_get_drvdata(dev);
>
>        /* Disable clock unit */
> -       clk_disable(keypad->clk);
> +       clk_disable_unprepare(keypad->clk);
>  }
>
>  #ifdef CONFIG_PM
> @@ -419,10 +419,14 @@ static int pxa27x_keypad_suspend(struct device *dev)
>        struct platform_device *pdev = to_platform_device(dev);
>        struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
>
> -       clk_disable(keypad->clk);
> -
> +       /*
> +        * If the keypad is used a wake up source, clock can not be disabled.
> +        * Or it can not detect the key pressing.
> +        */
>        if (device_may_wakeup(&pdev->dev))
>                enable_irq_wake(keypad->irq);
> +       else
> +               clk_disable_unprepare(keypad->clk);
>
>        return 0;
>  }
> @@ -433,19 +437,24 @@ static int pxa27x_keypad_resume(struct device *dev)
>        struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
>        struct input_dev *input_dev = keypad->input_dev;
>
> -       if (device_may_wakeup(&pdev->dev))
> +       /*
> +        * If the keypad is used as wake up source, the clock is not turned
> +        * off. So do not need configure it again.
> +        */
> +       if (device_may_wakeup(&pdev->dev)) {
>                disable_irq_wake(keypad->irq);
> +       } else {
> +               mutex_lock(&input_dev->mutex);
>
> -       mutex_lock(&input_dev->mutex);
> +               if (input_dev->users) {
> +                       /* Enable unit clock */
> +                       clk_prepare_enable(keypad->clk);
> +                       pxa27x_keypad_config(keypad);
> +               }
>
> -       if (input_dev->users) {
> -               /* Enable unit clock */
> -               clk_enable(keypad->clk);
> -               pxa27x_keypad_config(keypad);
> +               mutex_unlock(&input_dev->mutex);
>        }
>
> -       mutex_unlock(&input_dev->mutex);
> -
>        return 0;
>  }
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Hi Dmitry,

I just found that you're not looped in this mail thread. Could I merge
them into arch-pxa tree?

Best Regards
Haojian
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask
  2012-04-01  2:08 ` [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
@ 2012-04-02  9:37   ` Haojian Zhuang
  0 siblings, 0 replies; 10+ messages in thread
From: Haojian Zhuang @ 2012-04-02  9:37 UTC (permalink / raw)
  To: Chao Xie, Dmitry Torokhov
  Cc: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
> When direcct_key_num is 0, the mask should be 0.
> When direcct_key_num is 1, the mask should be 0b1.
>
> Signed-off-by: Chao Xie <chao.xie@marvell.com>
> ---
>  drivers/input/keyboard/pxa27x_keypad.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index b07771e..5d71720 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -383,7 +383,7 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
>        if (pdata->direct_key_num > direct_key_num)
>                direct_key_num = pdata->direct_key_num;
>
> -       keypad->direct_key_mask = ((2 << direct_key_num) - 1) & ~mask;
> +       keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
>
>        /* enable direct key */
>        if (direct_key_num)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Loop Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active
  2012-04-01  2:08 ` [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active Chao Xie
@ 2012-04-02  9:38   ` Haojian Zhuang
  0 siblings, 0 replies; 10+ messages in thread
From: Haojian Zhuang @ 2012-04-02  9:38 UTC (permalink / raw)
  To: Chao Xie, Dmitry Torokhov
  Cc: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
> KPDK_DK only indicates the pin level of direct key.
> So it is related to board, and low level may be active which
> indicates that a key is pressed.
>
> Signed-off-by: Chao Xie <chao.xie@marvell.com>
> ---
>  arch/arm/plat-pxa/include/plat/pxa27x_keypad.h |    2 ++
>  drivers/input/keyboard/pxa27x_keypad.c         |   10 +++++++++-
>  2 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> index abcc36e..7ffb16b 100644
> --- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> +++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> @@ -44,6 +44,8 @@ struct pxa27x_keypad_platform_data {
>        /* direct keys */
>        int             direct_key_num;
>        unsigned int    direct_key_map[MAX_DIRECT_KEY_NUM];
> +       /* the key output may be low active */
> +       int             direct_key_low_active;
>
>        /* rotary encoders 0 */
>        int             enable_rotary0;
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index 5d71720..a60f14e 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -311,7 +311,15 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
>        if (pdata->enable_rotary0 || pdata->enable_rotary1)
>                pxa27x_keypad_scan_rotary(keypad);
>
> -       new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
> +       /*
> +        * The KPDR_DK only output the key pin level, so it relates to board,
> +        * and low level may be active.
> +        */
> +       if (pdata->direct_key_low_active)
> +               new_state = ~KPDK_DK(kpdk) & keypad->direct_key_mask;
> +       else
> +               new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
> +
>        bits_changed = keypad->direct_key_state ^ new_state;
>
>        if (bits_changed == 0)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Loop Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
  2012-04-01  2:08 ` [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask Chao Xie
@ 2012-04-02  9:38   ` Haojian Zhuang
  0 siblings, 0 replies; 10+ messages in thread
From: Haojian Zhuang @ 2012-04-02  9:38 UTC (permalink / raw)
  To: Chao Xie, Dmitry Torokhov
  Cc: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
> Direct keys usage may not start from KP_DKIN0, add a msk option
> to configure the specifics for platforms that can skip some keys.
>
> Signed-off-by: Chao Xie <chao.xie@marvell.com>
> ---
>  arch/arm/plat-pxa/include/plat/pxa27x_keypad.h |    2 ++
>  drivers/input/keyboard/pxa27x_keypad.c         |    9 ++++++++-
>  2 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> index 7ffb16b..5ce8d5e 100644
> --- a/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> +++ b/arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
> @@ -46,6 +46,8 @@ struct pxa27x_keypad_platform_data {
>        unsigned int    direct_key_map[MAX_DIRECT_KEY_NUM];
>        /* the key output may be low active */
>        int             direct_key_low_active;
> +       /* give board a chance to choose the start direct key */
> +       unsigned int    direct_key_mask;
>
>        /* rotary encoders 0 */
>        int             enable_rotary0;
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index a60f14e..7f7b724 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -391,7 +391,14 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
>        if (pdata->direct_key_num > direct_key_num)
>                direct_key_num = pdata->direct_key_num;
>
> -       keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
> +       /*
> +        * Direct keys usage may not start from KP_DKIN0, check the platfrom
> +        * mask data to config the specific.
> +        */
> +       if (pdata->direct_key_mask)
> +               keypad->direct_key_mask = pdata->direct_key_mask;
> +       else
> +               keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
>
>        /* enable direct key */
>        if (direct_key_num)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Loop Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source
  2012-04-02  9:37 ` [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Haojian Zhuang
@ 2012-04-27  9:04   ` Haojian Zhuang
  2012-10-28  8:39     ` Vasily Khoruzhick
  0 siblings, 1 reply; 10+ messages in thread
From: Haojian Zhuang @ 2012-04-27  9:04 UTC (permalink / raw)
  To: Chao Xie, Dmitry Torokhov
  Cc: linux-input, eric.y.miao, linux-arm-kernel, haojian.zhuang

On Mon, Apr 2, 2012 at 5:37 PM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote:
> On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
>> When the keypad is used as wake up source, the clock can not
>> be disabled. Or it can not detect key pressing.
>> If the keypad is used as wake up source, when resume back,
>> do not enable the clock and configure it again because the
>> register content is retained.
>>
>> Signed-off-by: Chao Xie <chao.xie@marvell.com>
>> ---
>
> Hi Dmitry,
>
> I just found that you're not looped in this mail thread. Could I merge
> them into arch-pxa tree?
>
> Best Regards
> Haojian

Applied

Regards
Haojian

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source
  2012-04-27  9:04   ` Haojian Zhuang
@ 2012-10-28  8:39     ` Vasily Khoruzhick
  0 siblings, 0 replies; 10+ messages in thread
From: Vasily Khoruzhick @ 2012-10-28  8:39 UTC (permalink / raw)
  To: Haojian Zhuang
  Cc: Chao Xie, Dmitry Torokhov, eric.y.miao, haojian.zhuang,
	linux-arm-kernel, linux-input

On Fri, Apr 27, 2012 at 12:04 PM, Haojian Zhuang
<haojian.zhuang@gmail.com> wrote:
> On Mon, Apr 2, 2012 at 5:37 PM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote:
>> On Sun, Apr 1, 2012 at 10:08 AM, Chao Xie <chao.xie@marvell.com> wrote:
>>> When the keypad is used as wake up source, the clock can not
>>> be disabled. Or it can not detect key pressing.
>>> If the keypad is used as wake up source, when resume back,
>>> do not enable the clock and configure it again because the
>>> register content is retained.
>>>
>>> Signed-off-by: Chao Xie <chao.xie@marvell.com>
>>> ---
>>
>> Hi Dmitry,
>>
>> I just found that you're not looped in this mail thread. Could I merge
>> them into arch-pxa tree?
>>
>> Best Regards
>> Haojian
>
> Applied
>
> Regards
> Haojian

Hi,

This patch breaks pxa27x_keypad on pxa270-based Zipit Z2 device. After
resume keypad is not working anymore.
Reverting this patch fixes issue. Looks like it's necessary to call
pxa27x_keypad_config() on resume (at least on pxa27x?)

Regards
Vasily

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-10-28  8:40 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-01  2:08 [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
2012-04-01  2:08 ` [PATCH V3 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
2012-04-02  9:37   ` Haojian Zhuang
2012-04-01  2:08 ` [PATCH V3 3/4] Input: pxa27x_keypad direct key may be low active Chao Xie
2012-04-02  9:38   ` Haojian Zhuang
2012-04-01  2:08 ` [PATCH V3 4/4] Input: pxa27x_keypad add choice to set direct_key_mask Chao Xie
2012-04-02  9:38   ` Haojian Zhuang
2012-04-02  9:37 ` [PATCH V3 1/4] Input: pxa27x_keypad keep clock on as wakeup source Haojian Zhuang
2012-04-27  9:04   ` Haojian Zhuang
2012-10-28  8:39     ` Vasily Khoruzhick

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).