From 80fd80dbba8376a072c81d6cbfc5974ce49beb0e Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Tue, 30 Jan 2007 11:01:23 +0100
Subject: [PATCH] --- yaml --- r: 47022 b: refs/heads/master c:
 e7f70b8cc69b1bcc56ed8d70f8e3671ec3956374 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/avr32/mach-at32ap/pio.c            | 23 ++++++++++++++++++-
 trunk/include/asm-avr32/arch-at32ap/portmux.h |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fed860d89da7..46cdebd3d5ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dde251033f3e54619317269a908ce40e6f3a8d04
+refs/heads/master: e7f70b8cc69b1bcc56ed8d70f8e3671ec3956374
diff --git a/trunk/arch/avr32/mach-at32ap/pio.c b/trunk/arch/avr32/mach-at32ap/pio.c
index c3f596ce5267..9ba5654cde11 100644
--- a/trunk/arch/avr32/mach-at32ap/pio.c
+++ b/trunk/arch/avr32/mach-at32ap/pio.c
@@ -135,7 +135,28 @@ void __init at32_select_gpio(unsigned int pin, unsigned long flags)
 	dump_stack();
 }
 
-/*--------------------------------------------------------------------------*/
+/* Reserve a pin, preventing anyone else from changing its configuration. */
+void __init at32_reserve_pin(unsigned int pin)
+{
+	struct pio_device *pio;
+	unsigned int pin_index = pin & 0x1f;
+
+	pio = gpio_to_pio(pin);
+	if (unlikely(!pio)) {
+		printk("pio: invalid pin %u\n", pin);
+		goto fail;
+	}
+
+	if (unlikely(test_and_set_bit(pin_index, &pio->pinmux_mask))) {
+		printk("%s: pin %u is busy\n", pio->name, pin_index);
+		goto fail;
+	}
+
+	return;
+
+fail:
+	dump_stack();
+}
 
 /*--------------------------------------------------------------------------*/
 
diff --git a/trunk/include/asm-avr32/arch-at32ap/portmux.h b/trunk/include/asm-avr32/arch-at32ap/portmux.h
index 2ba611e0e134..9930871decde 100644
--- a/trunk/include/asm-avr32/arch-at32ap/portmux.h
+++ b/trunk/include/asm-avr32/arch-at32ap/portmux.h
@@ -23,5 +23,6 @@
 void at32_select_periph(unsigned int pin, unsigned int periph,
 			unsigned long flags);
 void at32_select_gpio(unsigned int pin, unsigned long flags);
+void at32_reserve_pin(unsigned int pin);
 
 #endif /* __ASM_ARCH_PORTMUX_H__ */