Input: pxa27x_keypad keep clock on as wakeup source
Subsystems (4)
PATCH v2 1/4 Input: pxa27x_keypad keep clock on as wakeup source
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.
--- drivers/input/keyboard/pxa27x_keypad.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-)
drivers/input/keyboard/pxa27x_keypad.c +18 -9
@@ -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 ; }
Signature · 1 line
1.7.0.4
PATCH v2 2/4 Input: pxa27x_keypad bug fix for direct_key_mask
When direcct_key_num is 0, the mask should be 0. When direcct_key_num is 1, the mask should be 0b1.
--- drivers/input/keyboard/pxa27x_keypad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/input/keyboard/pxa27x_keypad.c +1 -1
@@ -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)
Signature · 1 line
1.7.0.4
PATCH v2 3/4 Input: pxa27x_keypad direct key may be low active
In reply to Chao XieKPDK_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.
--- arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 2 ++ drivers/input/keyboard/pxa27x_keypad.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-)
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +2 -0
@@ -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;
drivers/input/keyboard/pxa27x_keypad.c +9 -1
@@ -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 )
Signature · 1 line
1.7.0.4
PATCH v2 4/4 Input: pxa27x_keypad add choice to set direct_key_mask
In reply to Chao XieDirect keys usage may not start from KP_DKIN0, add a msk option to configure the specifics for platforms that can skip some keys.
--- arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 2 ++ drivers/input/keyboard/pxa27x_keypad.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-)
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +2 -0
@@ -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;
drivers/input/keyboard/pxa27x_keypad.c +8 -1
@@ -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)
Signature · 1 line
1.7.0.4
PATCH v2 4/4 Input: pxa27x_keypad add choice to set direct_key_mask
Quoted 4 lines · Chao Xie
Direct keys usage may not start from
KP_DKIN0, add a msk option to configure the specifics for platforms that can skip some keys.Change-Id: Ia8fd28254fec9595dcf39f12a78392c1e8b675eb
You need remove Change-Id
Quoted 47 lines
Signed-off-by Chao Xie <[email protected]>---
?arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | ? ?2 ++ ?drivers/input/keyboard/pxa27x_keypad.c ? ? ? ? | ? ?9 ++++++++- ?2 files changed, 10 insertions(+), 1 deletions(-)arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0
-0@@ -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;drivers/input/keyboard/pxa27x_keypad.c +8
-1@@ -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 at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/4 Input: pxa27x_keypad add choice to set direct_key_mask
In reply to Chao XieHello.
Quoted 4 lines · Chao Xie
Direct keys usage may not start from
KP_DKIN0, add a msk option to configure the specifics for platforms that can skip some keys.Change-Id: Ia8fd28254fec9595dcf39f12a78392c1e8b675eb
Remove this line please -- it has no place in upstream patch.
Quoted 1 line
Signed-off-by Chao Xie <[email protected]>
WBR, Sergei
PATCH v2 1/4 Input: pxa27x_keypad keep clock on as wakeup source
In reply to Chao XieQuoted 19 lines · Chao Xie
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 <[email protected]>---
?drivers/input/keyboard/pxa27x_keypad.c | ? 27 ++++++++++++++++++--------- ?1 files changed, 18 insertions(+), 9 deletions(-)drivers/input/keyboard/pxa27x_keypad.c +0
-0@@ -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);
drivers/input/keyboard/pxa27x_keypad.c static int pxa27x_keypad_suspend(struct device *dev) · line 429
Quoted 10 lines
drivers/input/keyboard/pxa27x_keypad.c +6
-2- ? ? ? 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);
I prefer to add one patch to use clk_prepare_enable() & clk_disable_unprepare() in keypad driver.
Quoted 43 lines
drivers/input/keyboard/pxa27x_keypad.c +12
-8? ? ? ?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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/4 Input: pxa27x_keypad keep clock on as wakeup source
In reply to Chao XieHello.
Quoted 15 lines · Chao Xie
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<[email protected]>--- drivers/input/keyboard/pxa27x_keypad.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-)drivers/input/keyboard/pxa27x_keypad.c +0
-0
[...]
drivers/input/keyboard/pxa27x_keypad.c static int pxa27x_keypad_resume(struct device *dev) · line 446
Quoted 11 lines
drivers/input/keyboard/pxa27x_keypad.c +5
-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 {
According to CodingStyle, {} should be an all branches of *if* statement,
if it's used at least in one branch.
WBR, Sergei