From patchwork Thu Jan 29 12:24:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5741981 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DD6CB9F399 for ; Thu, 29 Jan 2015 12:26:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04FC32021B for ; Thu, 29 Jan 2015 12:26:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 32DDC20219 for ; Thu, 29 Jan 2015 12:26:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YGoAS-0002go-W5; Thu, 29 Jan 2015 12:25:52 +0000 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YGoAQ-0002ZA-MB for ath10k@lists.infradead.org; Thu, 29 Jan 2015 12:25:51 +0000 Received: by mail-wg0-f50.google.com with SMTP id b13so22969062wgh.9 for ; Thu, 29 Jan 2015 04:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=biw813PRoYfIGsdo3n9f9nnFb0dwUP8Ox60PgmmGnp0=; b=dL62OyDqaiXXjdFOirZ+oM1HRElq2m05xugDU89VKfnvhzedoFsobZcZGtJkX/9gJE 14085CPKOnzt17c6wYWq8gM6XIWyIkS8akSaP7o53AK5VkTaFbuuusdbA4an/wDAYjI5 r2u3T94yc/YdzbJUZiJaqbxzdxVvlE75uxFGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=biw813PRoYfIGsdo3n9f9nnFb0dwUP8Ox60PgmmGnp0=; b=Tmxgp4Jh+gfmPlD3QVWnSmK9AUZelCQCKJK8L6cKxVt4QAsfEAKzq3MKsYMbI78B1g 9MXMcluYLeGPYrLCCwkrRLmqsUwQsZtLKIhuFMnkrl0/WsakjuFwABHHNcmXMj+waMvU O/JTZ/w4V/rQktvZsJWTgtE6vY21Ab7vD5nS8axgMqDImgk2cdKanExy2XbMLjTyIgFY /MOQ09TaeRkjCgnzNO8kw2+yHNGfnI/Mx5hs660LCfOXIbfd0qGbzmZDQ2Eht//CpKoq 8Ivmgl9QFI20iyiPQ0Ikihzko3ic471GNnETCLJRQ8TIX0K6s4sHI/BQGrg/l74K+j3s nxWA== X-Gm-Message-State: ALoCoQkNbVrtNQ9nVyLBhNGW3SlZEIJtnhppOzULhLaVxXOF32H5mXZuoPS2HefzwCFLENPK2LSaJwDDoB8+YgLGAGNkqP/mRKPrxzlfGLUotu9JowP9ZOnCK1nMfF517KBppp7A6Za4lUYPZa9hGu/R1e+Pe/IFndHO//mMjfkjZcaLmVg/E4c= X-Received: by 10.194.90.143 with SMTP id bw15mr499423wjb.132.1422534325441; Thu, 29 Jan 2015 04:25:25 -0800 (PST) Received: from bob.homerouter.cpe (apn-31-1-134-151.dynamic.gprs.plus.pl. [31.1.134.151]) by mx.google.com with ESMTPSA id hr1sm2298513wib.1.2015.01.29.04.25.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jan 2015 04:25:24 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH] ath10k: enable qca6174 hw3.2 Date: Thu, 29 Jan 2015 13:24:33 +0100 Message-Id: <1422534273-18427-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150129_042550_873520_7BEBF851 X-CRM114-Status: UNSURE ( 7.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 The 3.2 revision has a different target BMI version so it wasn't recognized by ath10k (despite the chip_id rev being on the supported list already). Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.c | 14 ++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 5e9e1a6..36a8fcf 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -85,6 +85,20 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ, }, }, + { + .id = QCA6174_HW_3_2_VERSION, + .name = "qca6174 hw3.2", + .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR, + .uart_pin = 6, + .fw = { + .dir = QCA6174_HW_3_0_FW_DIR, + .fw = QCA6174_HW_3_0_FW_FILE, + .otp = QCA6174_HW_3_0_OTP_FILE, + .board = QCA6174_HW_3_0_BOARD_DATA_FILE, + .board_size = QCA6174_BOARD_DATA_SZ, + .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ, + }, + }, }; static void ath10k_send_suspend_complete(struct ath10k *ar) diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 5771278..460771f 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -40,6 +40,7 @@ #define QCA6174_HW_1_3_VERSION 0x05000003 #define QCA6174_HW_2_1_VERSION 0x05010000 #define QCA6174_HW_3_0_VERSION 0x05020000 +#define QCA6174_HW_3_2_VERSION 0x05030000 enum qca6174_pci_rev { QCA6174_PCI_REV_1_1 = 0x11,