diff options
| author | John Crispin <john@openwrt.org> | 2016-03-23 12:52:27 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-03-23 12:52:27 +0000 |
| commit | 0afb47718e5dde09231e816e99a382456e064479 (patch) | |
| tree | 5bfab01aa51b3ebee02753d661e1afab34c1ee9d | |
| parent | 63a9c61fb609311b1afb6ff3815daa61a00f6fd3 (diff) | |
| download | upstream-0afb47718e5dde09231e816e99a382456e064479.tar.gz upstream-0afb47718e5dde09231e816e99a382456e064479.tar.bz2 upstream-0afb47718e5dde09231e816e99a382456e064479.zip | |
ar71xx: Add support for ath79_gpio_function_* on QCA955X
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
SVN-Revision: 49074
2 files changed, 21 insertions, 5 deletions
diff --git a/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch index 9de1ec4793..eb30b44d6a 100644 --- a/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch +++ b/target/linux/ar71xx/patches-4.1/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch @@ -1,6 +1,14 @@ --- a/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; unsigned long flags; diff --git a/target/linux/ar71xx/patches-4.4/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-4.4/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch index a54c12b1a0..4ea67fdc3a 100644 --- a/target/linux/ar71xx/patches-4.4/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch +++ b/target/linux/ar71xx/patches-4.4/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch @@ -1,6 +1,14 @@ --- a/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 __iomem *base = ath79_gpio_base; @@ -9,6 +17,9 @@ u32 t, s; - BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x()); +- +- if (gpio >= AR934X_GPIO_COUNT) +- return; + if (soc_is_ar934x()) + reg_base = AR934X_GPIO_REG_OUT_FUNC0; + else if (soc_is_qca953x()) @@ -20,9 +31,6 @@ + else + BUG(); -- if (gpio >= AR934X_GPIO_COUNT) -- return; -- - reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4); + reg = reg_base + 4 * (gpio / 4); s = 8 * (gpio % 4); |