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.
103 lines
3.2 KiB
Diff
103 lines
3.2 KiB
Diff
From 77bb01d1919bcb6787d5cde9056936420288ab34 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Wed, 14 Mar 2012 10:45:23 +0100
|
|
Subject: [PATCH 28/47] MIPS: ath79: add GPIO support code for AR934X
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
|
|
Cc: linux-mips@linux-mips.org
|
|
Cc: mcgrof@infradead.org
|
|
Patchwork: https://patchwork.linux-mips.org/patch/3508/
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/ath79/gpio.c | 47 +++++++++++++++++++++++-
|
|
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 +
|
|
2 files changed, 47 insertions(+), 1 deletions(-)
|
|
|
|
--- a/arch/mips/ath79/gpio.c
|
|
+++ b/arch/mips/ath79/gpio.c
|
|
@@ -1,9 +1,12 @@
|
|
/*
|
|
* Atheros AR71XX/AR724X/AR913X GPIO API support
|
|
*
|
|
- * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
|
|
+ * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
|
|
+ * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
|
|
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
|
|
*
|
|
+ * Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
|
|
+ *
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published
|
|
* by the Free Software Foundation.
|
|
@@ -89,6 +92,42 @@ static int ath79_gpio_direction_output(s
|
|
return 0;
|
|
}
|
|
|
|
+static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
|
+{
|
|
+ void __iomem *base = ath79_gpio_base;
|
|
+ unsigned long flags;
|
|
+
|
|
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
|
|
+
|
|
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) | (1 << offset),
|
|
+ base + AR71XX_GPIO_REG_OE);
|
|
+
|
|
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
|
+ int value)
|
|
+{
|
|
+ void __iomem *base = ath79_gpio_base;
|
|
+ unsigned long flags;
|
|
+
|
|
+ spin_lock_irqsave(&ath79_gpio_lock, flags);
|
|
+
|
|
+ if (value)
|
|
+ __raw_writel(1 << offset, base + AR71XX_GPIO_REG_SET);
|
|
+ else
|
|
+ __raw_writel(1 << offset, base + AR71XX_GPIO_REG_CLEAR);
|
|
+
|
|
+ __raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << offset),
|
|
+ base + AR71XX_GPIO_REG_OE);
|
|
+
|
|
+ spin_unlock_irqrestore(&ath79_gpio_lock, flags);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static struct gpio_chip ath79_gpio_chip = {
|
|
.label = "ath79",
|
|
.get = ath79_gpio_get_value,
|
|
@@ -155,11 +194,17 @@ void __init ath79_gpio_init(void)
|
|
ath79_gpio_count = AR913X_GPIO_COUNT;
|
|
else if (soc_is_ar933x())
|
|
ath79_gpio_count = AR933X_GPIO_COUNT;
|
|
+ else if (soc_is_ar934x())
|
|
+ ath79_gpio_count = AR934X_GPIO_COUNT;
|
|
else
|
|
BUG();
|
|
|
|
ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
|
|
ath79_gpio_chip.ngpio = ath79_gpio_count;
|
|
+ if (soc_is_ar934x()) {
|
|
+ ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
|
|
+ ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
|
|
+ }
|
|
|
|
err = gpiochip_add(&ath79_gpio_chip);
|
|
if (err)
|
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
@@ -367,5 +367,6 @@
|
|
#define AR724X_GPIO_COUNT 18
|
|
#define AR913X_GPIO_COUNT 22
|
|
#define AR933X_GPIO_COUNT 30
|
|
+#define AR934X_GPIO_COUNT 23
|
|
|
|
#endif /* __ASM_MACH_AR71XX_REGS_H */
|