From dec75fa3b0f3dc9ffebdf2c4d0f373cdab492e1b Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 17 Jul 2012 11:35:34 -0400 Subject: [PATCH 108/123] 505-MIPS-ath79-add-ath79_gpio_function_select Import of the above patch from openwrt trunk, as of this commit: ---------- commit c1d79f64eed0a7ac36b5b9bca52275b397bec424 Author: nbd Date: Mon Jul 16 16:26:51 2012 +0000 uboot-ar71xx: fix compile on recent mac os x versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32750 3c298f89-4303-0410-b956-a3cf2f4a3e73 ---------- Path to patch in the repo is: target/linux/ar71xx/patches-3.3 Repo is: git://nbd.name/openwrt.git Signed-off-by: Paul Gortmaker --- arch/mips/ath79/common.h | 1 + arch/mips/ath79/gpio.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h index 561906c..125583c 100644 --- a/arch/mips/ath79/common.h +++ b/arch/mips/ath79/common.h @@ -26,6 +26,7 @@ void ath79_ddr_wb_flush(unsigned int reg); void ath79_gpio_function_enable(u32 mask); void ath79_gpio_function_disable(u32 mask); void ath79_gpio_function_setup(u32 set, u32 clear); +void ath79_gpio_output_select(unsigned gpio, u8 val); void ath79_gpio_init(void); #endif /* __ATH79_COMMON_H */ diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c index ee36e5a..a68d29f 100644 --- a/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c @@ -184,6 +184,34 @@ void ath79_gpio_function_setup(u32 set, u32 clear) spin_unlock_irqrestore(&ath79_gpio_lock, flags); } +void __init ath79_gpio_output_select(unsigned gpio, u8 val) +{ + void __iomem *base = ath79_gpio_base; + unsigned long flags; + unsigned int reg; + u32 t, s; + + BUG_ON(!soc_is_ar934x()); + + if (gpio >= AR934X_GPIO_COUNT) + return; + + reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4); + s = 8 * (gpio % 4); + + spin_lock_irqsave(&ath79_gpio_lock, flags); + + t = __raw_readl(base + reg); + t &= ~(0xff << s); + t |= val << s; + __raw_writel(t, base + reg); + + /* flush write */ + (void) __raw_readl(base + reg); + + spin_unlock_irqrestore(&ath79_gpio_lock, flags); +} + void __init ath79_gpio_init(void) { int err; -- 1.7.9.7