From patchwork Thu Jul 6 12:11:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 9828093 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 C95E3602BD for ; Thu, 6 Jul 2017 12:12:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8765328639 for ; Thu, 6 Jul 2017 12:12:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C13628651; Thu, 6 Jul 2017 12:12:21 +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_SIGNED, 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 1233B28647 for ; Thu, 6 Jul 2017 12:12:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752352AbdGFMMT (ORCPT ); Thu, 6 Jul 2017 08:12:19 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:5296 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbdGFMMS (ORCPT ); Thu, 6 Jul 2017 08:12:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1499343138; x=1530879138; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pDc9La5jic27hqZ+YC0PbyTon0IVVgMWWKJWURQJc+M=; b=DWZbz2D4u6ou5qDLuSjy8SzjZSIZoPptbQ2fH9kWfmYUYaMCq3bh+xsb epN0Y51RGXxmqSvhoOkXIkrJoGSBbM8hTcw8zQGeM7dU/NbFJYPq1NN9V 7tAfpxSCVn7WHxBxNR1nA2q3g5xJRdSxrfJCeDUuGfOAJo/+6ptDNnGYz c=; X-IronPort-AV: E=Sophos;i="5.40,317,1496127600"; d="scan'208";a="298215007" Received: from unknown (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by wolverine01.qualcomm.com with ESMTP; 06 Jul 2017 05:12:18 -0700 X-IronPort-AV: E=McAfee;i="5800,7501,8582"; a="1451842404" X-MGA-submission: =?us-ascii?q?MDGUiPOU4eQ4Qb5d+rbC8jh/6onnNbJ+bLGOZ4?= =?us-ascii?q?hx+mAAFMxg1qtT0u9rUbEYZrfJOusPi/0XZbo29JGVhTFeUYewG0uTjS?= =?us-ascii?q?cFIY4UiS+0GBEz0pZwKIeXE+c9PEk/ib9cxgrRGr/myNAlfLQTXlDe/F?= =?us-ascii?q?6j?= Received: from nasanexm01e.na.qualcomm.com ([10.85.0.31]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 06 Jul 2017 05:12:17 -0700 Received: from eusanexr01a.eu.qualcomm.com (10.85.0.97) by NASANEXM01E.na.qualcomm.com (10.85.0.31) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Thu, 6 Jul 2017 05:12:17 -0700 Received: from potku.adurom.net (10.80.80.8) by eusanexr01a.eu.qualcomm.com (10.85.0.97) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Thu, 6 Jul 2017 05:12:15 -0700 Subject: [PATCH v3 1/2] ath10k: various usb related definitions From: Kalle Valo To: CC: Date: Thu, 6 Jul 2017 15:11:56 +0300 Message-ID: <149934311592.20024.14245790092679266925.stgit@potku.adurom.net> In-Reply-To: <149934296332.20024.5652905816164718891.stgit@potku.adurom.net> References: <149934296332.20024.5652905816164718891.stgit@potku.adurom.net> User-Agent: StGit/0.17.1-17-ge4e0 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To eusanexr01a.eu.qualcomm.com (10.85.0.97) 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 From: Erik Stromdahl Definitions for USB based chipsets Signed-off-by: Erik Stromdahl Patchwork-Id: 9738771 Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/core.c | 1 + drivers/net/wireless/ath/ath10k/core.h | 3 +++ drivers/net/wireless/ath/ath10k/debug.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 75c5c903c8a6..c8016e752838 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1454,6 +1454,7 @@ static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name, { switch (ar->hif.bus) { case ATH10K_BUS_SDIO: + case ATH10K_BUS_USB: scnprintf(fw_name, fw_name_len, "%s-%s-%d.bin", ATH10K_FW_FILE_BASE, ath10k_bus_str(ar->hif.bus), fw_api); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 1aa5cf12fce0..bcbde3bc0086 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -92,6 +92,7 @@ enum ath10k_bus { ATH10K_BUS_PCI, ATH10K_BUS_AHB, ATH10K_BUS_SDIO, + ATH10K_BUS_USB, }; static inline const char *ath10k_bus_str(enum ath10k_bus bus) @@ -103,6 +104,8 @@ static inline const char *ath10k_bus_str(enum ath10k_bus bus) return "ahb"; case ATH10K_BUS_SDIO: return "sdio"; + case ATH10K_BUS_USB: + return "usb"; } return "unknown"; diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h index 257d10985c6e..548ad5483a4a 100644 --- a/drivers/net/wireless/ath/ath10k/debug.h +++ b/drivers/net/wireless/ath/ath10k/debug.h @@ -40,6 +40,8 @@ enum ath10k_debug_mask { ATH10K_DBG_AHB = 0x00008000, ATH10K_DBG_SDIO = 0x00010000, ATH10K_DBG_SDIO_DUMP = 0x00020000, + ATH10K_DBG_USB = 0x00040000, + ATH10K_DBG_USB_BULK = 0x00080000, ATH10K_DBG_ANY = 0xffffffff, };