* [PATCH 1/4] Input: pxa27x_keypad keep clock on as wakeup source
@ 2012-03-28 5:08 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-input, eric.y.miao, haojian.zhuang, linux-arm-kernel
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 | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 29fe1b2..1c5752f 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -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(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 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_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] 12+ messages in thread* [PATCH 1/4] Input: pxa27x_keypad keep clock on as wakeup source
@ 2012-03-28 5:08 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-arm-kernel
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 | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 29fe1b2..1c5752f 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -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(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 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_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] 12+ messages in thread* [PATCH 2/4] Input: pxa27x_keypad bug fix for direct_key_mask
2012-03-28 5:08 ` Chao Xie
@ 2012-03-28 5:08 ` Chao Xie
-1 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-input, eric.y.miao, haojian.zhuang, linux-arm-kernel
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 1c5752f..f9a76d4 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] 12+ messages in thread
* [PATCH 2/4] Input: pxa27x_keypad bug fix for direct_key_mask
@ 2012-03-28 5:08 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-arm-kernel
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 1c5752f..f9a76d4 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] 12+ messages in thread
* [PATCH 3/4] Input: pxa27x_keypad direct key may be low active
2012-03-28 5:08 ` Chao Xie
@ 2012-03-28 5:08 ` Chao Xie
-1 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-input, eric.y.miao, haojian.zhuang, linux-arm-kernel
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 f9a76d4..b41ebda 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] 12+ messages in thread* [PATCH 3/4] Input: pxa27x_keypad direct key may be low active
@ 2012-03-28 5:08 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-arm-kernel
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 f9a76d4..b41ebda 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] 12+ messages in thread
* [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
2012-03-28 5:08 ` Chao Xie
@ 2012-03-28 5:08 ` Chao Xie
-1 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-input, eric.y.miao, haojian.zhuang, linux-arm-kernel
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 | 7 ++++++-
2 files changed, 8 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 b41ebda..661892b 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -391,7 +391,12 @@ 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
+ * msk 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] 12+ messages in thread* [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
@ 2012-03-28 5:08 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-28 5:08 UTC (permalink / raw)
To: linux-arm-kernel
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 | 7 ++++++-
2 files changed, 8 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 b41ebda..661892b 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -391,7 +391,12 @@ 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
+ * msk 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] 12+ messages in thread* Re: [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
2012-03-28 5:08 ` Chao Xie
@ 2012-03-28 18:04 ` Sergei Shtylyov
-1 siblings, 0 replies; 12+ messages in thread
From: Sergei Shtylyov @ 2012-03-28 18:04 UTC (permalink / raw)
To: Chao Xie; +Cc: linux-input, eric.y.miao, haojian.zhuang, linux-arm-kernel
Hello.
On 03/28/2012 09:08 AM, Chao Xie 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>
[...]
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index b41ebda..661892b 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -391,7 +391,12 @@ 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
> + * msk data to config the specific */
The preferred multi-line comment style is not this one. You got it right in
the previous patch. :-)
WBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
@ 2012-03-28 18:04 ` Sergei Shtylyov
0 siblings, 0 replies; 12+ messages in thread
From: Sergei Shtylyov @ 2012-03-28 18:04 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 03/28/2012 09:08 AM, Chao Xie 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>
[...]
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index b41ebda..661892b 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -391,7 +391,12 @@ 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
> + * msk data to config the specific */
The preferred multi-line comment style is not this one. You got it right in
the previous patch. :-)
WBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread* RE: [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
2012-03-28 18:04 ` Sergei Shtylyov
@ 2012-03-29 9:15 ` Chao Xie
-1 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-29 9:15 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: linux-input, eric.y.miao, Haojian Zhuang, linux-arm-kernel
Thanks. I will sent V2 patches.
-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov@mvista.com]
Sent: Thursday, March 29, 2012 2:04 AM
To: Chao Xie
Cc: linux-input@vger.kernel.org; eric.y.miao@gmail.com; Haojian Zhuang; linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
Hello.
On 03/28/2012 09:08 AM, Chao Xie 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>
[...]
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index b41ebda..661892b 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -391,7 +391,12 @@ 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
> + * msk data to config the specific */
The preferred multi-line comment style is not this one. You got it right in
the previous patch. :-)
WBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
@ 2012-03-29 9:15 ` Chao Xie
0 siblings, 0 replies; 12+ messages in thread
From: Chao Xie @ 2012-03-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Thanks. I will sent V2 patches.
-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov at mvista.com]
Sent: Thursday, March 29, 2012 2:04 AM
To: Chao Xie
Cc: linux-input at vger.kernel.org; eric.y.miao at gmail.com; Haojian Zhuang; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask
Hello.
On 03/28/2012 09:08 AM, Chao Xie 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>
[...]
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index b41ebda..661892b 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -391,7 +391,12 @@ 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
> + * msk data to config the specific */
The preferred multi-line comment style is not this one. You got it right in
the previous patch. :-)
WBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-03-29 9:15 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-28 5:08 [PATCH 1/4] Input: pxa27x_keypad keep clock on as wakeup source Chao Xie
2012-03-28 5:08 ` Chao Xie
2012-03-28 5:08 ` [PATCH 2/4] Input: pxa27x_keypad bug fix for direct_key_mask Chao Xie
2012-03-28 5:08 ` Chao Xie
2012-03-28 5:08 ` [PATCH 3/4] Input: pxa27x_keypad direct key may be low active Chao Xie
2012-03-28 5:08 ` Chao Xie
2012-03-28 5:08 ` [PATCH 4/4] Input: pxa27x_keypad add choice to set direct_key_mask Chao Xie
2012-03-28 5:08 ` Chao Xie
2012-03-28 18:04 ` Sergei Shtylyov
2012-03-28 18:04 ` Sergei Shtylyov
2012-03-29 9:15 ` Chao Xie
2012-03-29 9:15 ` Chao Xie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.