From patchwork Thu Nov 5 08:50:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 7559121 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E8FD2BEEA4 for ; Thu, 5 Nov 2015 08:51:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10E0F207EA for ; Thu, 5 Nov 2015 08:51:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20B51207F7 for ; Thu, 5 Nov 2015 08:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161135AbbKEIvh (ORCPT ); Thu, 5 Nov 2015 03:51:37 -0500 Received: from mail-lf0-f41.google.com ([209.85.215.41]:35176 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032970AbbKEIvf (ORCPT ); Thu, 5 Nov 2015 03:51:35 -0500 Received: by lfbn126 with SMTP id n126so54559279lfb.2 for ; Thu, 05 Nov 2015 00:51:33 -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:in-reply-to:references; bh=YhuAPc+3Gf/n7zRrXuxOjBXfjJqRMBpKjv6gCn6ItKM=; b=vQzyOlbPCUewaTHnBciwKMRoZqSw3ImfBTh3i9aHmiDyNsBqbEkmEYb2/C2ROfDvyA p4QW8rrgjtcUN7TYXUIG7bkxXCGAygJ8hZgc+Ne3U/KvKy48K6scPItzR3xEN/LzQ3or aNnZPXoLNwxkkK2lVewmjSod4lQo//R6xivFI= 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:in-reply-to :references; bh=YhuAPc+3Gf/n7zRrXuxOjBXfjJqRMBpKjv6gCn6ItKM=; b=EJY6VjS4vUgh01GA/pbffSmypgy6dvK5VvTRXfleWHiD8INbwe2k39bIApoxQjY8aT 0mWKIjKZq5lB+hi/78YVZQivF2dlcRHYfBDwYgPLboCP9qNnF6TctGcugsSxZ1ipwz2A 0U6GwTB31J0jPPkrF490LzCiZ1j+Tm0+2eT1KFAa3UKOh7ufEAMuPdfi/OFYaKtOHDu/ U7SviAYuzKOnPIFC6QLaBPHV4Us3rpR1HcwYy4YYAb8FRX6TMe96TebRIsM9iIPCV7Un sd3tGMYT5g2aVp7nTbceevWiJuQF3bcA4cicCeEdIhdK01vXuKHfediW2dlDEL4iX9RF I0jg== X-Gm-Message-State: ALoCoQkuH52ffIBjXIY/ClzsCiJVoKvwoE5U9NPdcZ4mSEIY2TwZf8c8LuXir0AFlwckucs3iDnqPcXy9QI1/6r54gsdZITpChJE+bQE5+UtJjTLZXQbp58X8/DpJiwJ+NIvshd2736k X-Received: by 10.25.17.103 with SMTP id g100mr1650789lfi.110.1446713493208; Thu, 05 Nov 2015 00:51:33 -0800 (PST) Received: from uw000975.eu.tieto.com ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id m139sm366156lfg.17.2015.11.05.00.51.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 00:51:32 -0800 (PST) From: Bartosz Markowski To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Bartosz Markowski Subject: [PATCH v2 4/4] ath10k: add QCA9377 hw1.0 support Date: Thu, 5 Nov 2015 09:50:43 +0100 Message-Id: <1446713443-22542-5-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1446713443-22542-1-git-send-email-bartosz.markowski@tieto.com> References: <1446713443-22542-1-git-send-email-bartosz.markowski@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 Add new BMI target version and chip id revision. Register it on supported chips list. Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/core.c | 18 ++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 3 +++ drivers/net/wireless/ath/ath10k/pci.c | 2 ++ 3 files changed, 23 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 9b32cb38eb45..c02e7038a1e6 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -161,6 +161,24 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { }, }, { + .id = QCA9377_HW_1_0_DEV_VERSION, + .dev_id = QCA9377_1_0_DEVICE_ID, + .name = "qca9377 hw1.0", + .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR, + .uart_pin = 6, + .otp_exe_param = 0, + .channel_counters_freq_hz = 88000, + .max_probe_resp_desc_thres = 0, + .fw = { + .dir = QCA9377_HW_1_0_FW_DIR, + .fw = QCA9377_HW_1_0_FW_FILE, + .otp = QCA9377_HW_1_0_OTP_FILE, + .board = QCA9377_HW_1_0_BOARD_DATA_FILE, + .board_size = QCA9377_BOARD_DATA_SZ, + .board_ext_size = QCA9377_BOARD_EXT_DATA_SZ, + }, + }, + { .id = QCA9377_HW_1_1_DEV_VERSION, .dev_id = QCA9377_1_0_DEVICE_ID, .name = "qca9377 hw1.1", diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 3a5c68ac5d34..8ef3c0e487b8 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -48,6 +48,8 @@ #define QCA6174_HW_3_0_VERSION 0x05020000 #define QCA6174_HW_3_2_VERSION 0x05030000 +/* QCA9377 target BMI version signatures */ +#define QCA9377_HW_1_0_DEV_VERSION 0x05020000 #define QCA9377_HW_1_1_DEV_VERSION 0x05020001 enum qca6174_pci_rev { @@ -69,6 +71,7 @@ enum qca6174_chip_id_rev { }; enum qca9377_chip_id_rev { + QCA9377_HW_1_0_CHIP_ID_REV = 0x0, QCA9377_HW_1_1_CHIP_ID_REV = 0x1, }; diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 0be43b80a9a4..6c46814012ef 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -86,6 +86,8 @@ static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = { { QCA6174_2_1_DEVICE_ID, QCA6174_HW_3_2_CHIP_ID_REV }, { QCA99X0_2_0_DEVICE_ID, QCA99X0_HW_2_0_CHIP_ID_REV }, + + { QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_0_CHIP_ID_REV }, { QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_1_CHIP_ID_REV }, };