80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
|
Date: Fri, 24 Jul 2015 09:10:00 +0000
|
|
Subject: ar71xx: Allow to use ath79_gpio_output_select on QCA955x
|
|
|
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
|
|
|
Backport of r46459
|
|
|
|
Forwarded: https://patchwork.ozlabs.org/patch/624182/
|
|
|
|
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
|
|
new file mode 100644
|
|
index 0000000..e71b6e2
|
|
--- /dev/null
|
|
+++ b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
|
|
@@ -0,0 +1,63 @@
|
|
+--- a/arch/mips/ath79/gpio.c
|
|
++++ b/arch/mips/ath79/gpio.c
|
|
+@@ -187,15 +187,30 @@ 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() && !soc_is_qca956x());
|
|
++ 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 if (soc_is_qca956x()) {
|
|
++ gpio_count = QCA956X_GPIO_COUNT;
|
|
++ reg_base = QCA956X_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
|
|
+@@ -875,6 +875,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
|
|
+@@ -1014,6 +1022,8 @@
|
|
+ #define AR934X_GPIO_OUT_EXT_LNA0 46
|
|
+ #define AR934X_GPIO_OUT_EXT_LNA1 47
|
|
+
|
|
++#define QCA955X_GPIO_OUT_GPIO 0
|
|
++
|
|
+ /*
|
|
+ * MII_CTRL block
|
|
+ */
|