From 1df901ff3fc26be51a7a9b25f4f50be2d397eeb4 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 18 Jan 2012 12:52:59 +0000
Subject: [PATCH] --- yaml --- r: 296351 b: refs/heads/master c:
 058502eb38a0f687e5af37209488d03656f87ffe h: refs/heads/master i:   296349:
 2410f6f8fc9c62ff6895fbcc23bec2afc7ffc016   296347:
 82f4ce87424762eaf111085fb0d8fc91320b258d   296343:
 40fab3c5bde395073c763c11b215bb043bb0cb2e   296335:
 438c412f4e076652aaae69a7025ef768bd89ec8c   296319:
 b09588aceac5e751d4293da22cb257265f917f3b v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/video/sa1100fb.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1f8e1e7ef4b..71958af90100 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba5fd193f4fd35e5e1771de15cc1aba11d19590d
+refs/heads/master: 058502eb38a0f687e5af37209488d03656f87ffe
diff --git a/trunk/drivers/video/sa1100fb.c b/trunk/drivers/video/sa1100fb.c
index d1d97cab24c8..b644f0f1268c 100644
--- a/trunk/drivers/video/sa1100fb.c
+++ b/trunk/drivers/video/sa1100fb.c
@@ -761,8 +761,19 @@ static void sa1100fb_setup_gpio(struct sa1100fb_info *fbi)
 	}
 
 	if (mask) {
+		unsigned long flags;
+
+		/*
+		 * SA-1100 requires the GPIO direction register set
+		 * appropriately for the alternate function.  Hence
+		 * we set it here via bitmask rather than excessive
+		 * fiddling via the GPIO subsystem - and even then
+		 * we'll still have to deal with GAFR.
+		 */
+		local_irq_save(flags);
 		GPDR |= mask;
 		GAFR |= mask;
+		local_irq_restore(flags);
 	}
 }