aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-08-04 23:09:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-08-04 23:09:28 +0000
commitaa2ad5da8efcf11fab0a830aec20d2c3c7193d9d (patch)
tree57b6b1c72c7519a3bd7b013b51307b30838cc059 /target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
parent97f04ee142efe0df286b67f5ae64ca9085584f6d (diff)
downloadmaster-187ad058-aa2ad5da8efcf11fab0a830aec20d2c3c7193d9d.tar.gz
master-187ad058-aa2ad5da8efcf11fab0a830aec20d2c3c7193d9d.tar.bz2
master-187ad058-aa2ad5da8efcf11fab0a830aec20d2c3c7193d9d.zip
ar71xx: remove linux 3.18 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46553 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch60
1 files changed, 0 insertions, 60 deletions
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 24ce7d83c5..0000000000
--- a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/arch/mips/ath79/gpio.c
-+++ b/arch/mips/ath79/gpio.c
-@@ -185,15 +185,27 @@ 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() && !soc_is_qca953x());
-+ if (soc_is_ar934x()) {
-+ gpio_count = AR934X_GPIO_COUNT;
-+ reg_base = AR934X_GPIO_REG_OUT_FUNC0;
-+ } else if (soc_is_qca953x()) {
-+ gpio_count = QCA953X_GPIO_COUNT;
-+ reg_base = QCA953X_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
-@@ -868,6 +868,14 @@
- #define QCA953X_GPIO_OUT_MUX_LED_LINK4 44
- #define QCA953X_GPIO_OUT_MUX_LED_LINK5 45
-
-+#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
-@@ -1007,6 +1015,8 @@
- #define AR934X_GPIO_OUT_EXT_LNA0 46
- #define AR934X_GPIO_OUT_EXT_LNA1 47
-
-+#define QCA955X_GPIO_OUT_GPIO 0
-+
- /*
- * MII_CTRL block
- */