Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx: Add support for ath79_gpio_function_* on QCA955X

Browse source 
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>

SVN-Revision: 49074
This commit is contained in:
John Crispin 2016-03-23 12:52:27 +00:00
parent 63a9c61fb6
commit 0afb47718e
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
View file

@ -1,6 +1,14 @@
--- a/arch/mips/ath79/gpio.c --- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c
@@ -223,15 +223,30 @@ void __init ath79_gpio_output_select(uns @@ -186,6 +186,7 @@ static void __iomem *ath79_gpio_get_func
reg = AR71XX_GPIO_REG_FUNC;
else if (soc_is_ar934x() ||
soc_is_qca953x() ||
+ soc_is_qca955x() ||
soc_is_qca956x() ||
soc_is_tp9343())
reg = AR934X_GPIO_REG_FUNC;
@@ -223,15 +224,30 @@ void __init ath79_gpio_output_select(uns
{ {
void __iomem *base = ath79_gpio_base; void __iomem *base = ath79_gpio_base;
unsigned long flags; unsigned long flags;

16
target/linux/ar71xx/patches-4.4/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
View file

@ -1,6 +1,14 @@
--- a/arch/mips/ath79/gpio.c --- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c
@@ -64,15 +64,21 @@ void ath79_gpio_function_disable(u32 mas @@ -33,6 +33,7 @@ static void __iomem *ath79_gpio_get_func
reg = AR71XX_GPIO_REG_FUNC;
else if (soc_is_ar934x() ||
soc_is_qca953x() ||
+ soc_is_qca955x() ||
soc_is_qca956x() ||
soc_is_tp9343())
reg = AR934X_GPIO_REG_FUNC;
@@ -64,15 +65,21 @@ void ath79_gpio_function_disable(u32 mas
void __init ath79_gpio_output_select(unsigned gpio, u8 val) void __init ath79_gpio_output_select(unsigned gpio, u8 val)
{ {
void __iomem *base = ath79_gpio_base; void __iomem *base = ath79_gpio_base;
@ -9,6 +17,9 @@
u32 t, s; u32 t, s;
- BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x()); - BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
-
- if (gpio >= AR934X_GPIO_COUNT)
- return;
+ if (soc_is_ar934x()) + if (soc_is_ar934x())
+ reg_base = AR934X_GPIO_REG_OUT_FUNC0; + reg_base = AR934X_GPIO_REG_OUT_FUNC0;
+ else if (soc_is_qca953x()) + else if (soc_is_qca953x())
@ -20,9 +31,6 @@
+ else + else
+ BUG(); + BUG();
- if (gpio >= AR934X_GPIO_COUNT)
- return;
-
- reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4); - reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
+ reg = reg_base + 4 * (gpio / 4); + reg = reg_base + 4 * (gpio / 4);
s = 8 * (gpio % 4); s = 8 * (gpio % 4);