X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fpatches-4.14%2F739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch;fp=target%2Flinux%2Far71xx%2Fpatches-4.14%2F739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch;h=0000000000000000000000000000000000000000;hp=a65f7d993f858567415feadc2aeac447f4f321de;hb=4e4ee4649553ab536225060a27fc320bf54e458c;hpb=47b2ee2d9a9a1790f9bf8a528640c333af39e4ba

diff --git a/target/linux/ar71xx/patches-4.14/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-4.14/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
deleted file mode 100644
index a65f7d993f..0000000000
--- a/target/linux/ar71xx/patches-4.14/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/arch/mips/ath79/gpio.c
-+++ b/arch/mips/ath79/gpio.c
-@@ -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;
--	unsigned int reg;
-+	unsigned int reg, reg_base;
- 	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())
-+		reg_base = QCA953X_GPIO_REG_OUT_FUNC0;
-+	else if (soc_is_qca955x())
-+		reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
-+	else if (soc_is_qca956x())
-+		reg_base = QCA956X_GPIO_REG_OUT_FUNC0;
-+	else
-+		BUG();
- 
--	reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
-+	reg = reg_base + 4 * (gpio / 4);
- 	s = 8 * (gpio % 4);
- 
- 	t = __raw_readl(base + reg);