Commit 108fcb42 authored by Michael Hennerich's avatar Michael Hennerich Committed by Dmitry Torokhov
Browse files

Input: bf54x-keys - add power management support 



Fix Bug: does nor properply resume after suspend mem
Fix for PM_SUSPEND_MEM: Save and restore peripheral base registers

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent d8c1f317

drivers/input/keyboard/bf54x-keys.c

+12 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *

 *

 * Modified:

 *               Copyright 2007 Analog Devices Inc.

 *               Copyright 2007-2008 Analog Devices Inc.

 *

 * Bugs:         Enter bugs at http://blackfin.uclinux.org/

 *
@@ -82,6 +82,9 @@ struct bf54x_kpad { 
	unsigned short *keycode;

	struct timer_list timer;

	unsigned int keyup_test_jiffies;

	unsigned short kpad_msel;

	unsigned short kpad_prescale;

	unsigned short kpad_ctl;

};



static inline int bfin_kpad_find_key(struct bf54x_kpad *bf54x_kpad,
@@ -361,6 +364,10 @@ static int bfin_kpad_suspend(struct platform_device *pdev, pm_message_t state) 
{

	struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);



	bf54x_kpad->kpad_msel = bfin_read_KPAD_MSEL();

	bf54x_kpad->kpad_prescale = bfin_read_KPAD_PRESCALE();

	bf54x_kpad->kpad_ctl = bfin_read_KPAD_CTL();



	if (device_may_wakeup(&pdev->dev))

		enable_irq_wake(bf54x_kpad->irq);
@@ -371,6 +378,10 @@ static int bfin_kpad_resume(struct platform_device *pdev) 
{

	struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);



	bfin_write_KPAD_MSEL(bf54x_kpad->kpad_msel);

	bfin_write_KPAD_PRESCALE(bf54x_kpad->kpad_prescale);

	bfin_write_KPAD_CTL(bf54x_kpad->kpad_ctl);



	if (device_may_wakeup(&pdev->dev))

		disable_irq_wake(bf54x_kpad->irq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE