summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2011-05-09 14:41:46 +0300
committerAndi Kleen <ak@linux.intel.com>2011-08-01 13:55:02 -0700
commit16b9eeed2a368c85e42c680d7a25fee50c3ad828 (patch)
treeb81de89fa53e40cc129948beb3dfe2a5daf6c763
parent37f7a29f540ffaee81648ab757da701a7a8b3dcc (diff)
downloadlinux-stable-16b9eeed2a368c85e42c680d7a25fee50c3ad828.tar.gz
linux-stable-16b9eeed2a368c85e42c680d7a25fee50c3ad828.tar.bz2
linux-stable-16b9eeed2a368c85e42c680d7a25fee50c3ad828.zip
ARM: pxa/cm-x300: fix V3020 RTC functionality
[ upstream commit 6c7b3ea52e345ab614edb91d3f0e9f3bb3713871 ] While in sleep mode the CS# and other V3020 RTC GPIOs must be driven high, otherwise V3020 RTC fails to keep the right time in sleep mode. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: stable@kernel.org Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--arch/arm/mach-pxa/cm-x300.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index d717b49f0172..240455d6ec52 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -157,10 +157,10 @@ static mfp_cfg_t cm_x3xx_mfp_cfg[] __initdata = {
GPIO99_GPIO, /* Ethernet IRQ */
/* RTC GPIOs */
- GPIO95_GPIO, /* RTC CS */
- GPIO96_GPIO, /* RTC WR */
- GPIO97_GPIO, /* RTC RD */
- GPIO98_GPIO, /* RTC IO */
+ GPIO95_GPIO | MFP_LPM_DRIVE_HIGH, /* RTC CS */
+ GPIO96_GPIO | MFP_LPM_DRIVE_HIGH, /* RTC WR */
+ GPIO97_GPIO | MFP_LPM_DRIVE_HIGH, /* RTC RD */
+ GPIO98_GPIO, /* RTC IO */
/* Standard I2C */
GPIO21_I2C_SCL,