KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: add ar71xx_gpio_function_setup

Browse source 
SVN-Revision: 20053
This commit is contained in:
Gabor Juhos 2010-03-08 12:10:14 +00:00
parent 945cfb9059
commit 6c1be20c2a
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
View file

@ -1,7 +1,7 @@
/* /*
* Atheros AR71xx SoC GPIO API support * 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> * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
* *
* This program is free software; you can redistribute it and/or modify it * 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); spin_lock_irqsave(&ar71xx_gpio_lock, flags);
ar71xx_gpio_wr(GPIO_REG_FUNC, ar71xx_gpio_rr(GPIO_REG_FUNC) | mask); 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); 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); spin_lock_irqsave(&ar71xx_gpio_lock, flags);
ar71xx_gpio_wr(GPIO_REG_FUNC, ar71xx_gpio_rr(GPIO_REG_FUNC) & ~mask); 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); 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) void __init ar71xx_gpio_init(void)
{ {
int err; int err;

1
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
View file

@ -269,6 +269,7 @@ static inline u32 ar71xx_gpio_rr(unsigned reg)
void ar71xx_gpio_init(void) __init; void ar71xx_gpio_init(void) __init;
void ar71xx_gpio_function_enable(u32 mask); void ar71xx_gpio_function_enable(u32 mask);
void ar71xx_gpio_function_disable(u32 mask); void ar71xx_gpio_function_disable(u32 mask);
void ar71xx_gpio_function_setup(u32 set, u32 clear);
/* /*
* DDR_CTRL block * DDR_CTRL block