From de250603bc3769d6b17d58acf343d6b2afd60213 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 24 Jan 2012 09:25:57 +0000 Subject: [PATCH] --- yaml --- r: 296274 b: refs/heads/master c: 49e01e3fb6efe1b0abfa2d5675f88f07989d621f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-sa1100/assabet.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0643c050485f..6aff9af401e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f592e6d1a6711b2ef140b5c76342dbe2506c8cb +refs/heads/master: 49e01e3fb6efe1b0abfa2d5675f88f07989d621f diff --git a/trunk/arch/arm/mach-sa1100/assabet.c b/trunk/arch/arm/mach-sa1100/assabet.c index 6356896587bf..e3805d4c052a 100644 --- a/trunk/arch/arm/mach-sa1100/assabet.c +++ b/trunk/arch/arm/mach-sa1100/assabet.c @@ -214,6 +214,14 @@ static void __init assabet_init(void) GPCR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM; GPDR |= GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM; + /* + * Also set GPIO27 as an output; this is used to clock UART3 + * via the FPGA and as otherwise has no pullups or pulldowns, + * so stop it floating. + */ + GPCR = GPIO_GPIO27; + GPDR |= GPIO_GPIO27; + /* * Set up registers for sleep mode. */