From 240cff7d6a70e697f7b7825df60767809c2c836e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 7 Jul 2015 22:44:28 +0000
Subject: Revert "ar71xx: Allow to use ath79_gpio_output_select on QCA955x"
(r46240)
It breaks the build
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46256
---
...79-add-gpio-func-register-for-QCA955x-SoC.patch | 57 ----------------------
1 file changed, 57 deletions(-)
delete mode 100644 target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
(limited to 'target/linux/ar71xx')
diff --git a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
deleted file mode 100644
index 2355ad7..0000000
--- a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/arch/mips/ath79/gpio.c
-+++ b/arch/mips/ath79/gpio.c
-@@ -185,15 +185,24 @@ void __init ath79_gpio_output_select(uns
- {
- void __iomem *base = ath79_gpio_base;
- unsigned long flags;
-- unsigned int reg;
-+ unsigned int reg, reg_base;
-+ unsigned long gpio_count;
- u32 t, s;
-
-- BUG_ON(!soc_is_ar934x());
-+ if (soc_is_ar934x()) {
-+ gpio_count = AR934X_GPIO_COUNT;
-+ reg_base = AR934X_GPIO_REG_OUT_FUNC0;
-+ } else if (soc_is_qca955x()) {
-+ gpio_count = QCA955X_GPIO_COUNT;
-+ reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
-+ } else {
-+ BUG();
-+ }
-
-- if (gpio >= AR934X_GPIO_COUNT)
-+ if (gpio >= gpio_count)
- return;
-
-- reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
-+ reg = reg_base + 4 * (gpio / 4);
- s = 8 * (gpio % 4);
-
- spin_lock_irqsave(&ath79_gpio_lock, flags);
---- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -786,6 +786,14 @@
- #define AR934X_GPIO_REG_OUT_FUNC5 0x40
- #define AR934X_GPIO_REG_FUNC 0x6c
-
-+#define QCA955X_GPIO_REG_OUT_FUNC0 0x2c
-+#define QCA955X_GPIO_REG_OUT_FUNC1 0x30
-+#define QCA955X_GPIO_REG_OUT_FUNC2 0x34
-+#define QCA955X_GPIO_REG_OUT_FUNC3 0x38
-+#define QCA955X_GPIO_REG_OUT_FUNC4 0x3c
-+#define QCA955X_GPIO_REG_OUT_FUNC5 0x40
-+#define QCA955X_GPIO_REG_FUNC 0x6c
-+
- #define QCA956X_GPIO_REG_OUT_FUNC0 0x2c
- #define QCA956X_GPIO_REG_OUT_FUNC1 0x30
- #define QCA956X_GPIO_REG_OUT_FUNC2 0x34
-@@ -907,6 +915,8 @@
- #define AR934X_GPIO_OUT_EXT_LNA0 46
- #define AR934X_GPIO_OUT_EXT_LNA1 47
-
-+#define QCA955X_GPIO_OUT_GPIO 0
-+
- /*
- * MII_CTRL block
- */
--
cgit v1.1