[ARM] 5064/1: pxa: explicitly specify tosa keyboard GPIOs' low power states to DRIVE_LOW
authoreric miao <eric.y.miao@gmail.com>
Mon, 26 May 2008 02:28:50 +0000 (03:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 12:21:56 +0000 (13:21 +0100)
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-pxa/tosa.c
drivers/input/keyboard/tosakbd.c

index 9ae2271f93c44688e52bb592828211402b4d056e..8bf947dcb2e8968ecbdb7878db553de834824ded 100644 (file)
@@ -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,
index 94e444b4ee1523c4539b687383eaa9c35a52fcfe..b12b7ee4b6aa304e9096e9b50afbaeca1beae24b 100644 (file)
@@ -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);