From patchwork Thu Oct 30 11:18:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 5196141 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 424799F349 for ; Thu, 30 Oct 2014 11:25:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46B0F201FE for ; Thu, 30 Oct 2014 11:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3645820254 for ; Thu, 30 Oct 2014 11:25:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759676AbaJ3LZU (ORCPT ); Thu, 30 Oct 2014 07:25:20 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:58182 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759675AbaJ3LZR (ORCPT ); Thu, 30 Oct 2014 07:25:17 -0400 Received: by mail-wg0-f49.google.com with SMTP id x13so5367296wgg.8 for ; Thu, 30 Oct 2014 04:25:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=QeB3v2mlNwzKE6dUGC/9H13ZbMWEA146xXPlPz7UEDU=; b=Kk5Dz+9IRu/FtBt4Yes3yDHc54wQjWPHg9BytvL2rMUG7xQ8gMxnLQqvHO/vfOAcc6 ecK1VHrhJX4af7wX3wc7a4flitjZVVpNCEc2n32ljyZ4/lsiWyn7ZSdTQWpku1zMlS3w Y574yeHVxfcFeHlfLG1OMnjQPp17jBzHHEJWSIvWiW3jrL4bRFuRqWu6uCX/OGkw1Vyl dZDRDUBusEyruDbhyjN9fZpZjN6LwRV4AXgbWSuRZMFZXGrGqyol67zAzfex8onxttzA uyBnjh33HGOt8lGlFmScBYs1i2pXWQLPGwixr48uVWc6nWwjMmnLb0hl3GnSwdPMpup0 f4ow== X-Received: by 10.194.85.229 with SMTP id k5mr18760362wjz.19.1414667903637; Thu, 30 Oct 2014 04:18:23 -0700 (PDT) Received: from localhost ([77.209.29.132]) by mx.google.com with ESMTPSA id q5sm21850147wiy.16.2014.10.30.04.18.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Oct 2014 04:18:23 -0700 (PDT) From: Xose Vazquez Perez Cc: =?UTF-8?q?Canek=20Pel=C3=A1ez=20Vald=C3=A9s?= , stable@vger.kernel.org, Stanislaw Gruszka , Helmut Schaa , "John W. Linville" , users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org Subject: [PATCH -stable] rt2x00: support Ralink 5362. Date: Thu, 30 Oct 2014 12:18:17 +0100 Message-Id: <1414667897-2277-1-git-send-email-xose.vazquez@gmail.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 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-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Canek Peláez Valdés Cc: stable@vger.kernel.org Acked-by: Stanislaw Gruszka Cc: Stanislaw Gruszka Cc: Helmut Schaa Cc: John W. Linville Cc: users@rt2x00.serialmonkey.com Cc: linux-wireless@vger.kernel.org Signed-off-by: Canek Peláez Valdés Signed-off-by: John W. Linville --- drivers/net/wireless/rt2x00/rt2800.h | 4 +++- drivers/net/wireless/rt2x00/rt2800lib.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index a394a9a..b7434df 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h @@ -52,6 +52,7 @@ * RF5592 2.4G/5G 2T2R * RF3070 2.4G 1T1R * RF5360 2.4G 1T1R + * RF5362 2.4G 1T1R * RF5370 2.4G 1T1R * RF5390 2.4G 1T1R */ @@ -72,6 +73,7 @@ #define RF3070 0x3070 #define RF3290 0x3290 #define RF5360 0x5360 +#define RF5362 0x5362 #define RF5370 0x5370 #define RF5372 0x5372 #define RF5390 0x5390 @@ -2145,7 +2147,7 @@ struct mac_iveiv_entry { /* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */ #define RFCSR3_PA1_BIAS_CCK FIELD8(0x70) #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80) -/* Bits for RF3290/RF5360/RF5370/RF5372/RF5390/RF5392 */ +/* Bits for RF3290/RF5360/RF5362/RF5370/RF5372/RF5390/RF5392 */ #define RFCSR3_VCOCAL_EN FIELD8(0x80) /* Bits for RF3050 */ #define RFCSR3_BIT1 FIELD8(0x02) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 893c9d5..9f57a2d 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -3186,6 +3186,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, break; case RF3070: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -3203,6 +3204,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2x00_rf(rt2x00dev, RF3290) || rt2x00_rf(rt2x00dev, RF3322) || rt2x00_rf(rt2x00dev, RF5360) || + rt2x00_rf(rt2x00dev, RF5362) || rt2x00_rf(rt2x00dev, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || rt2x00_rf(rt2x00dev, RF5390) || @@ -4317,6 +4319,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) case RF3070: case RF3290: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7095,6 +7098,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) case RF3320: case RF3322: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7551,6 +7555,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) case RF3320: case RF3322: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: @@ -7680,6 +7685,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) case RF3070: case RF3290: case RF5360: + case RF5362: case RF5370: case RF5372: case RF5390: