From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 8 Mar 2010 12:10:14 +0000 (+0000)
Subject: ar71xx: add ar71xx_gpio_function_setup
X-Git-Tag: reboot~20768
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c1be20c2ab42a335eba4891c176fdb1f67bcd0d;p=oweals%2Fopenwrt.git

ar71xx: add ar71xx_gpio_function_setup

SVN-Revision: 20053
---

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
index c1990ad453..25b506cb54 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx SoC GPIO API support
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -109,6 +109,8 @@ void ar71xx_gpio_function_enable(u32 mask)
 	spin_lock_irqsave(&ar71xx_gpio_lock, flags);
 
 	ar71xx_gpio_wr(GPIO_REG_FUNC, ar71xx_gpio_rr(GPIO_REG_FUNC) | mask);
+	/* flush write */
+	(void) ar71xx_gpio_rr(GPIO_REG_FUNC);
 
 	spin_unlock_irqrestore(&ar71xx_gpio_lock, flags);
 }
@@ -120,10 +122,27 @@ void ar71xx_gpio_function_disable(u32 mask)
 	spin_lock_irqsave(&ar71xx_gpio_lock, flags);
 
 	ar71xx_gpio_wr(GPIO_REG_FUNC, ar71xx_gpio_rr(GPIO_REG_FUNC) & ~mask);
+	/* flush write */
+	(void) ar71xx_gpio_rr(GPIO_REG_FUNC);
 
 	spin_unlock_irqrestore(&ar71xx_gpio_lock, flags);
 }
 
+void ar71xx_gpio_function_setup(u32 set, u32 clear)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&ar71xx_gpio_lock, flags);
+
+	ar71xx_gpio_wr(GPIO_REG_FUNC,
+		       (ar71xx_gpio_rr(GPIO_REG_FUNC) & ~clear) | set);
+	/* flush write */
+	(void) ar71xx_gpio_rr(GPIO_REG_FUNC);
+
+	spin_unlock_irqrestore(&ar71xx_gpio_lock, flags);
+}
+EXPORT_SYMBOL(ar71xx_gpio_function_setup);
+
 void __init ar71xx_gpio_init(void)
 {
 	int err;
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
index 00e7cbc4b7..e9e68f16df 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
@@ -269,6 +269,7 @@ static inline u32 ar71xx_gpio_rr(unsigned reg)
 void ar71xx_gpio_init(void) __init;
 void ar71xx_gpio_function_enable(u32 mask);
 void ar71xx_gpio_function_disable(u32 mask);
+void ar71xx_gpio_function_setup(u32 set, u32 clear);
 
 /*
  * DDR_CTRL block