From patchwork Thu Apr 5 12:22:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 10324503 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 78A8D6032A for ; Thu, 5 Apr 2018 12:22:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6916E2909B for ; Thu, 5 Apr 2018 12:22:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D546290D0; Thu, 5 Apr 2018 12:22:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48C8C2909B for ; Thu, 5 Apr 2018 12:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbeDEMWi (ORCPT ); Thu, 5 Apr 2018 08:22:38 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:43855 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbeDEMWh (ORCPT ); Thu, 5 Apr 2018 08:22:37 -0400 Received: by mail-wr0-f194.google.com with SMTP id p53so28061830wrc.10 for ; Thu, 05 Apr 2018 05:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YaTFOacP7Adsh7UkECDA/MODJNwWCVHPRQ20YqoB1do=; b=JWguCkAgz8a+P2mHfcdNSnTlnefIpqoWeQBI+i+Te+VRzzgqAK9a+4dXhP8X0eEVdP ZBllgUwdFQ0LVFbtdamvWDsoA4oaAzDQPuYZZRJ6S1eyZA4OiY2/OFnsljVXiAHTCnuI Hw5VacHyj+5MrhCzM73VB8PL4m6FD81HHevNeVYMnLsmgS0rsnTPkaecEaqzeaCAotp3 uff6A1/CRIx9jse+kPUXunjxbfIXwyV8PmC4xmfi4nFLQXxB1fachjGVJ2ABmyozWS5F 5iT+bRy6AP7P7Ip5tXp1DfWVcsSJ5zTyVw1TxPpMvEmV1k8qHt7k+Kq4XMUlFfdsaTRM V0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YaTFOacP7Adsh7UkECDA/MODJNwWCVHPRQ20YqoB1do=; b=qQ0HYwkOqPCa9MYET2kEZpSxY3I3K9Uafocw6SmFoyRj87sQdqqJQ3kqn/uV3Y028f RJkqyxR3QdhrHTy/DwvXrLjx/Ydt+kFF9als8Svu1M3VIfk6qyPQqH0mWrBp5K7dVIBP tYelUobW/mqGY2OgA+5ZT3vS5YLBsbs2510YkbiDZtT0uwJOH8b8mGRDTPXNw2X/OFeN YhZ9v75edPxJMg1CTrS13DuZJDQOCDLkJ9Aohk5/tsa3pdCgHCDTTlh5RYXPeHmXB9SA 1rEyP5cCQtICIwHcyXuQ3TVY4FM0+BVkyqySCfNr9eslQ9TWxZlgT9wm4QazSJqcIT2w ULcg== X-Gm-Message-State: AElRT7F8lL4MkeHtSS5e08J1x3hujSJj28sqtez+s+DlbBtcW9039bm7 vG1tcl9CmYGRbl7pFh6AZA== X-Google-Smtp-Source: AIpwx4/mUPYKX23SxbYUDymYhDYGI2fHCfTXe0z7lMuvZ8MupuSbyYtpTObTemtfRbJUM5Cqh4JRDg== X-Received: by 10.223.160.78 with SMTP id l14mr14593508wrl.153.1522930955458; Thu, 05 Apr 2018 05:22:35 -0700 (PDT) Received: from localhost ([46.222.141.206]) by smtp.gmail.com with ESMTPSA id m83sm3430963wma.17.2018.04.05.05.22.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Apr 2018 05:22:34 -0700 (PDT) From: Xose Vazquez Perez Cc: Xose Vazquez Perez , Stanislaw Gruszka , Helmut Schaa , Gertjan van Wingerde , Jakub Kicinski , wireless newbie , Kalle Valo , linux wireless ml Subject: [PATCH] wireless: rt2x00: rt2800: add antenna diversity for RT5370G Date: Thu, 5 Apr 2018 14:22:32 +0200 Message-Id: <20180405122232.1694-1-xose.vazquez@gmail.com> X-Mailer: git-send-email 2.14.3 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP RT5370G has hardware RX antenna diversity like RT5390R. Based on DPO_RT5572_LinuxSTA_2.6.1.3_20121022.tar.bz2 manufacturer driver: https://d86o2zu8ugzlg.cloudfront.net/mediatek-craft/drivers/DPO_RT5572_LinuxSTA_2.6.1.3_20121022.tar.bz2 Cc: Stanislaw Gruszka Cc: Helmut Schaa Cc: Gertjan van Wingerde Cc: Jakub Kicinski Cc: wireless newbie Cc: Kalle Valo Cc: linux wireless ml Signed-off-by: Xose Vazquez Perez Acked-by: Stanislaw Gruszka --- drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h index 6a8c93fb6a43..7a133e94b1bf 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -94,6 +94,7 @@ #define REV_RT3390E 0x0211 #define REV_RT3593E 0x0211 #define REV_RT5390F 0x0502 +#define REV_RT5370G 0x0503 #define REV_RT5390R 0x1502 #define REV_RT5592C 0x0221 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 429d07b651dd..e827dc522580 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -6220,8 +6220,9 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) rt2800_register_write(rt2x00dev, GPIO_CTRL, reg); } - /* This chip has hardware antenna diversity*/ - if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R)) { + /* These chips have hardware RX antenna diversity */ + if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R) || + rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5370G)) { rt2800_bbp_write(rt2x00dev, 150, 0); /* Disable Antenna Software OFDM */ rt2800_bbp_write(rt2x00dev, 151, 0); /* Disable Antenna Software CCK */ rt2800_bbp_write(rt2x00dev, 154, 0); /* Clear previously selected antenna */ @@ -8748,7 +8749,9 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) rt2x00dev->default_ant.rx = ANTENNA_A; } - if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R)) { + /* These chips have hardware RX antenna diversity */ + if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390R) || + rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5370G)) { rt2x00dev->default_ant.tx = ANTENNA_HW_DIVERSITY; /* Unused */ rt2x00dev->default_ant.rx = ANTENNA_HW_DIVERSITY; /* Unused */ }