ath79: wndr3700 series: fix wifi range & throughput

This patch adds ar71xx's GPIO setup for the 2.4GHz and 5GHz antennae
demultiplexer:

| 158         /* 2.4 GHz uses the first fixed antenna group (1, 0, 1, 0) */
| 159         ap9x_pci_setup_wmac_gpio(0, (0xf << 6), (0xa << 6));
| 160
| 161         /* 5 GHz uses the second fixed antenna group (0, 1, 1, 0) */
| 162         ap9x_pci_setup_wmac_gpio(1, (0xf << 6), (0x6 << 6));

This should restore the range and throughput of the 2.4GHz radio
on all the derived wndr3700 variants and versions with the AR7161 SoC.
A special case is the 5GHz radio. The original wndr3700(v1) will
benefit from this change. However the wndr3700v2 and later revisions
were unaffected by the missing bits, as there is no demultiplexer
present in the later designs.

This patch uses gpio-hogs within the device-tree for all
wndr3700/wndr3800/wndrmac variants.

Notes:

Based on the PCB pictures, the WNDR3700(v1) really had eight
independent antennae. Four antennae for each radio and all of
those were printed on the circut board.

The WNDR3700v2 and later have just six antennae. Four of those
are printed on the circuit board and serve the 2.4GHz radio.
Whereas the remaining two are special 5GHz Rayspan Patch Antennae
which are directly connected to the 5GHz radio.

Hannu Nyman dug pretty deep and unearthed a treasure of information
regarding the history of how these values came to be in the OpenWrt
archives: <https://dev.archive.openwrt.org/ticket/6533.html>.

Mark Mentovai came across the fixed antenna group when he was looking
into the driver:

    fixed_antenna_group 1, (0, 1, 0, 1)
    fixed_antenna_group 2, (0, 1, 1, 0)
    fixed_antenna_group 3, (1, 0, 0, 1)
    fixed_antenna_group 4, (1, 0, 1, 0)

Fixes: FS#3088
Reported-by: Luca Bensi
Reported-by: Maciej Mazur
Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Debugged-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
index 75c68d83c778f0bdc0fcf5a402358dd0edb549bd..38a1140968839df82a5a8978112532d5f7b99130 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
@@ -32,3 +32,24 @@
                read-only;
        };
 };
+
+&ath9k1 {
+       /* The original WNDR3700(v1) variant have four antennae dedicated
+        * to the 5GHz radio as well. Again, two antennae are available for
+        * each chain to switch between. The following configuration is the
+        * default setting which taken from the vendor's wifi
+        * code for that radio.
+        *
+        * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]:
+        *      [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0]
+        */
+       antenna-demux {
+               gpio-hog;
+               line-name = "fixed antenna group 2";
+               gpios = <6 GPIO_ACTIVE_LOW>,
+                       <7 GPIO_ACTIVE_HIGH>,
+                       <8 GPIO_ACTIVE_HIGH>,
+                       <9 GPIO_ACTIVE_LOW>;
+               output-high;
+       };
+};

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
index ab4f37da115ba46247f9111dcc6d816735f8c6e7..f1db1ffd5886f7c2cf474f94dd6b7fcd599ad625 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
@@ -160,6 +160,25 @@
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
+
+               /* all WNDR3700 variants have four antennae dedicated
+                * to the 2.4GHz radio. Two antennae are available for
+                * each chain. The following configuration is the
+                * default setting which taken from the vendor's wifi
+                * code for that radio.
+                *
+                * All possible options [GPIO6,GPIO7,GPIO8,GPIO9]:
+                *      [0,1,0,1], [0,1,1,0], [1,0,0,1], [1,0,1,0]
+                */
+               antenna-demux {
+                       gpio-hog;
+                       line-name = "fixed antenna group 1";
+                       gpios = <6 GPIO_ACTIVE_LOW>,
+                               <7 GPIO_ACTIVE_HIGH>,
+                               <8 GPIO_ACTIVE_LOW>,
+                               <9 GPIO_ACTIVE_HIGH>;
+                       output-high;
+               };
        };
 
        ath9k1: wifi@0,12 {