2 files changed, 18 insertions, 20 deletions

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 9ae2271f93c4..8bf947dcb2e8 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -130,24 +130,24 @@ static unsigned long tosa_pin_config[] = {
         GPIO47_STUART_TXD,
 
         /* Keybd */
-        GPIO58_GPIO,
-        GPIO59_GPIO,
-        GPIO60_GPIO,
-        GPIO61_GPIO,
-        GPIO62_GPIO,
-        GPIO63_GPIO,
-        GPIO64_GPIO,
-        GPIO65_GPIO,
-        GPIO66_GPIO,
-        GPIO67_GPIO,
-        GPIO68_GPIO,
-        GPIO69_GPIO,
-        GPIO70_GPIO,
-        GPIO71_GPIO,
-        GPIO72_GPIO,
-        GPIO73_GPIO,
-        GPIO74_GPIO,
-        GPIO75_GPIO,
+        GPIO58_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO59_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO60_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO61_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO62_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO63_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO64_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO65_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO66_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO67_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO68_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO69_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO70_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO71_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO72_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO73_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO74_GPIO | MFP_LPM_DRIVE_LOW,
+        GPIO75_GPIO | MFP_LPM_DRIVE_LOW,
 
         /* SPI */
         GPIO81_SSP2_CLK_OUT,
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c
index 94e444b4ee15..b12b7ee4b6aa 100644
--- a/drivers/input/keyboard/tosakbd.c
+++ b/drivers/input/keyboard/tosakbd.c
@@ -215,8 +215,6 @@ static int tosakbd_suspend(struct platform_device *dev, pm_message_t state)
         unsigned long flags;
 
         spin_lock_irqsave(&tosakbd->lock, flags);
-        PGSR1 = (PGSR1 & ~TOSA_GPIO_LOW_STROBE_BIT);
-        PGSR2 = (PGSR2 & ~TOSA_GPIO_HIGH_STROBE_BIT);
         tosakbd->suspended = 1;
         spin_unlock_irqrestore(&tosakbd->lock, flags);