From de223ceaf2fd0c9e7892dbaf6a12058fc3fc6269 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 5 May 2014 03:59:21 +0200 Subject: [PATCH] Update QCA953x support This should fix the TX power problems with the TL-WR841N/ND v9. --- ...7-ar71xx-add-support-for-QCA953x-SoC.patch | 36 ++++++++++++++----- ...port-for-the-TP-LINK-TL-WR841N-ND-v9.patch | 8 ++--- ...rt-for-TL-WR842N-v2-and-TL-MR3420-v2.patch | 30 +++------------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch b/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch index 6e2afc71..3a99f092 100644 --- a/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch +++ b/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch @@ -121,12 +121,12 @@ index 5a0b950..1a9b0df 100644 pdata->mii_bus_dev = &ath79_mdio1_device.dev; break; -diff --git a/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch +diff --git a/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch new file mode 100644 -index 0000000..bd08685 +index 0000000..063af94 --- /dev/null -+++ b/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch -@@ -0,0 +1,584 @@ ++++ b/target/linux/ar71xx/patches-3.3/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch +@@ -0,0 +1,604 @@ +From 5300a7cd7ed2f88488ddba62947b9c6bb9663777 Mon Sep 17 00:00:00 2001 +Message-Id: <5300a7cd7ed2f88488ddba62947b9c6bb9663777.1396122227.git.mschiffer@universe-factory.net> +From: Matthias Schiffer @@ -151,7 +151,7 @@ index 0000000..bd08685 + +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig -+@@ -698,6 +698,10 @@ config SOC_AR934X ++@@ -688,6 +688,10 @@ config SOC_AR934X + select PCI_AR724X if PCI + def_bool n + @@ -162,7 +162,7 @@ index 0000000..bd08685 + config SOC_QCA955X + select USB_ARCH_HAS_EHCI + select HW_HAS_PCI -+@@ -741,7 +745,7 @@ config ATH79_DEV_USB ++@@ -731,7 +735,7 @@ config ATH79_DEV_USB + def_bool n + + config ATH79_DEV_WMAC @@ -309,7 +309,25 @@ index 0000000..bd08685 + platform_device_register(&ath79_uart_device); +--- a/arch/mips/ath79/dev-wmac.c ++++ b/arch/mips/ath79/dev-wmac.c -+@@ -147,6 +147,24 @@ static void ar934x_wmac_setup(void) ++@@ -99,7 +99,7 @@ static int ar933x_wmac_reset(void) ++ return -ETIMEDOUT; ++ } ++ ++-static int ar933x_r1_get_wmac_revision(void) +++static int ar93xx_get_soc_revision(void) ++ { ++ return ath79_soc_rev; ++ } ++@@ -124,7 +124,7 @@ static void __init ar933x_wmac_setup(voi ++ ath79_wmac_data.is_clk_25mhz = true; ++ ++ if (ath79_soc_rev == 1) ++- ath79_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision; +++ ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision; ++ ++ ath79_wmac_data.external_reset = ar933x_wmac_reset; ++ } ++@@ -147,6 +147,26 @@ static void ar934x_wmac_setup(void) + ath79_wmac_data.is_clk_25mhz = true; + } + @@ -329,12 +347,14 @@ index 0000000..bd08685 ++ ath79_wmac_data.is_clk_25mhz = false; ++ else ++ ath79_wmac_data.is_clk_25mhz = true; +++ +++ ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision; ++} ++ + static void qca955x_wmac_setup(void) + { + u32 t; -+@@ -314,6 +332,8 @@ void __init ath79_register_wmac(u8 *cal_ ++@@ -314,6 +334,8 @@ void __init ath79_register_wmac(u8 *cal_ + ar933x_wmac_setup(); + else if (soc_is_ar934x()) + ar934x_wmac_setup(); diff --git a/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch b/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch index 201d629e..721f206c 100644 --- a/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch +++ b/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch @@ -251,11 +251,11 @@ index 01d1e67..c270f73 100644 $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4)) $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4310V1)) $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI UBNTUNIFIOUTDOOR)) -diff --git a/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch +diff --git a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch new file mode 100644 -index 0000000..ebc82c6 +index 0000000..37425a6 --- /dev/null -+++ b/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch ++++ b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch @@ -0,0 +1,38 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig @@ -287,7 +287,7 @@ index 0000000..ebc82c6 + obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h -+@@ -91,6 +91,7 @@ enum ath79_mach_type { ++@@ -90,6 +90,7 @@ enum ath79_mach_type { + ATH79_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */ + ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */ + ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */ diff --git a/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch b/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch index b0955be6..ff50ae72 100644 --- a/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch +++ b/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch @@ -413,32 +413,10 @@ index 8a1c770..9766afe 100644 ATH79_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */ ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */ ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ -diff --git a/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch -index bd08685..d111353 100644 ---- a/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch -+++ b/target/linux/ar71xx/patches-3.3/705-MIPS-ath79-add-support-for-QCA953x-SoC.patch -@@ -22,7 +22,7 @@ some bits' meanings are slightly different. - - --- a/arch/mips/ath79/Kconfig - +++ b/arch/mips/ath79/Kconfig --@@ -698,6 +698,10 @@ config SOC_AR934X -+@@ -688,6 +688,10 @@ config SOC_AR934X - select PCI_AR724X if PCI - def_bool n - -@@ -33,7 +33,7 @@ some bits' meanings are slightly different. - config SOC_QCA955X - select USB_ARCH_HAS_EHCI - select HW_HAS_PCI --@@ -741,7 +745,7 @@ config ATH79_DEV_USB -+@@ -731,7 +735,7 @@ config ATH79_DEV_USB - def_bool n - - config ATH79_DEV_WMAC -diff --git a/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch -index ebc82c6..dcbb112 100644 ---- a/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch -+++ b/target/linux/ar71xx/patches-3.3/706-MIPS-ath79-TL-WR841v9-support.patch +diff --git a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch +index 37425a6..612970b 100644 +--- a/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch ++++ b/target/linux/ar71xx/patches-3.3/708-MIPS-ath79-TL-WR841v9-support.patch @@ -33,6 +33,6 @@ ATH79_MACH_TL_WR841N_V7, /* TP-LINK TL-WR841N/ND v7 */ ATH79_MACH_TL_WR841N_V8, /* TP-LINK TL-WR841N/ND v8 */