You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
3.2 KiB
Diff
111 lines
3.2 KiB
Diff
From 2e6a41e0be6a09ed839e3afbe1fb413a015d8870 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Tue, 29 Jan 2013 08:19:12 +0000
|
|
Subject: [PATCH] MIPS: ath79: fix GPIO function selection for AR934x SoCs
|
|
|
|
commit 8838becdf5f7261d7f5dfbbe957fe9b9ed188aec upstream.
|
|
|
|
GPIO function selection is not working on the AR934x
|
|
SoCs because the offset of the function selection
|
|
register is different on those.
|
|
|
|
Add a helper routine which returns the correct
|
|
register address based on the SoC type, and use
|
|
that in the 'ath79_gpio_function_*' routines.
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
Patchwork: http://patchwork.linux-mips.org/patch/4870/
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
arch/mips/ath79/gpio.c | 38 ++++++++++++++++--------
|
|
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 2 ++
|
|
2 files changed, 28 insertions(+), 12 deletions(-)
|
|
|
|
--- a/arch/mips/ath79/gpio.c
|
|
+++ b/arch/mips/ath79/gpio.c
|
|
@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip
|
|
.base = 0,
|
|
};
|
|
|
|
+static void __iomem *ath79_gpio_get_function_reg(void)
|
|
+{
|
|
+ u32 reg = 0;
|
|
+
|
|
+ if (soc_is_ar71xx() ||
|
|
+ soc_is_ar724x() ||
|
|
+ soc_is_ar913x() ||
|
|
+ soc_is_ar933x())
|
|
+ reg = AR71XX_GPIO_REG_FUNC;
|
|
+ else if (soc_is_ar934x())
|
|
+ reg = AR934X_GPIO_REG_FUNC;
|
|
+ else
|
|
+ BUG();
|
|
+
|
|
+ return ath79_gpio_base + reg;
|
|
+}
|
|
+
|
|
void ath79_gpio_function_enable(u32 mask)
|
|
{
|
|
- void __iomem *base = ath79_gpio_base;
|
|
+ void __iomem *reg = ath79_gpio_get_function_reg();
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&ath79_gpio_lock, flags);
|
|
|
|
- __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) | mask,
|
|
- base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_writel(__raw_readl(reg) | mask, reg);
|
|
/* flush write */
|
|
- __raw_readl(base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_readl(reg);
|
|
|
|
spin_unlock_irqrestore(&ath79_gpio_lock, flags);
|
|
}
|
|
|
|
void ath79_gpio_function_disable(u32 mask)
|
|
{
|
|
- void __iomem *base = ath79_gpio_base;
|
|
+ void __iomem *reg = ath79_gpio_get_function_reg();
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&ath79_gpio_lock, flags);
|
|
|
|
- __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~mask,
|
|
- base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_writel(__raw_readl(reg) & ~mask, reg);
|
|
/* flush write */
|
|
- __raw_readl(base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_readl(reg);
|
|
|
|
spin_unlock_irqrestore(&ath79_gpio_lock, flags);
|
|
}
|
|
|
|
void ath79_gpio_function_setup(u32 set, u32 clear)
|
|
{
|
|
- void __iomem *base = ath79_gpio_base;
|
|
+ void __iomem *reg = ath79_gpio_get_function_reg();
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&ath79_gpio_lock, flags);
|
|
|
|
- __raw_writel((__raw_readl(base + AR71XX_GPIO_REG_FUNC) & ~clear) | set,
|
|
- base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_writel((__raw_readl(reg) & ~clear) | set, reg);
|
|
/* flush write */
|
|
- __raw_readl(base + AR71XX_GPIO_REG_FUNC);
|
|
+ __raw_readl(reg);
|
|
|
|
spin_unlock_irqrestore(&ath79_gpio_lock, flags);
|
|
}
|
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
@@ -401,6 +401,8 @@
|
|
#define AR71XX_GPIO_REG_INT_ENABLE 0x24
|
|
#define AR71XX_GPIO_REG_FUNC 0x28
|
|
|
|
+#define AR934X_GPIO_REG_FUNC 0x6c
|
|
+
|
|
#define AR71XX_GPIO_COUNT 16
|
|
#define AR7240_GPIO_COUNT 18
|
|
#define AR7241_GPIO_COUNT 20
|