1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index 54ed8e2e1c02..f1d20817ef29 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -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);