Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c867155c authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] 5064/1: pxa: explicitly specify tosa keyboard GPIOs' low power states to DRIVE_LOW 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Acked-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 86159a98

arch/arm/mach-pxa/tosa.c

+18 −18
Original line number Original line Diff line number Diff line
@@ -130,24 +130,24 @@ static unsigned long tosa_pin_config[] = { 
	GPIO47_STUART_TXD,

	GPIO47_STUART_TXD,





	/* Keybd */

	/* Keybd */

	GPIO58_GPIO,

	GPIO58_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO59_GPIO,

	GPIO59_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO60_GPIO,

	GPIO60_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO61_GPIO,

	GPIO61_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO62_GPIO,

	GPIO62_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO63_GPIO,

	GPIO63_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO64_GPIO,

	GPIO64_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO65_GPIO,

	GPIO65_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO66_GPIO,

	GPIO66_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO67_GPIO,

	GPIO67_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO68_GPIO,

	GPIO68_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO69_GPIO,

	GPIO69_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO70_GPIO,

	GPIO70_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO71_GPIO,

	GPIO71_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO72_GPIO,

	GPIO72_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO73_GPIO,

	GPIO73_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO74_GPIO,

	GPIO74_GPIO | MFP_LPM_DRIVE_LOW,

	GPIO75_GPIO,

	GPIO75_GPIO | MFP_LPM_DRIVE_LOW,





	/* SPI */

	/* SPI */

	GPIO81_SSP2_CLK_OUT,

	GPIO81_SSP2_CLK_OUT,

drivers/input/keyboard/tosakbd.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -215,8 +215,6 @@ static int tosakbd_suspend(struct platform_device *dev, pm_message_t state) 
	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&tosakbd->lock, flags);

	spin_lock_irqsave(&tosakbd->lock, flags);

	PGSR1 = (PGSR1 & ~TOSA_GPIO_LOW_STROBE_BIT);

	PGSR2 = (PGSR2 & ~TOSA_GPIO_HIGH_STROBE_BIT);

	tosakbd->suspended = 1;

	tosakbd->suspended = 1;

	spin_unlock_irqrestore(&tosakbd->lock, flags);

	spin_unlock_irqrestore(&tosakbd->lock, flags);