From patchwork Mon Oct 6 12:16:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 5036631 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C029DC11AB for ; Mon, 6 Oct 2014 12:17:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7F6F20149 for ; Mon, 6 Oct 2014 12:17:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3180E20148 for ; Mon, 6 Oct 2014 12:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752103AbaJFMRH (ORCPT ); Mon, 6 Oct 2014 08:17:07 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:40716 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbaJFMRF (ORCPT ); Mon, 6 Oct 2014 08:17:05 -0400 Received: by mail-wi0-f173.google.com with SMTP id fb4so4359246wid.6 for ; Mon, 06 Oct 2014 05:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=Iwe7CxSY+n2UmMOKRH7M9JO4iQv9f7dXecNYF/mRkKg=; b=HlgCQ5Gw7C4mzJ0hbZZjY8dNKHtgPaoIqmZ+Uz/OG1rzbDfcJpr9fp0MPcinJmBDxg s7d8Rz27ya3szdqYz5OhqRIYPDX289+5GHqiZLqfeGV3AjR44sM3oMCJp6Nyo60ToLOF nDerErHKoLf6QRGsA52ONKDRuB60adSwJWPw8= 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=Iwe7CxSY+n2UmMOKRH7M9JO4iQv9f7dXecNYF/mRkKg=; b=l5HHOV111i6HdSs8YI7lFrKmLhl3t8MaXnRljqiRC/8HcYO0u8UIGWk0ZBkSIiOOMx btQVLMwvLe5zrvczBH12w7I30FI0VzHgFOZMnD8Pyvunl8kNir4xeNUfcXIRC+Pj+ZDO /Qg/IyRlkpzGmFawqw6goeP0bwmc/6S3TU/2V5Qs6tscoulDuoe7ACJI55//OrtMxby/ kum7vsKwSvgWJX6/izzGEbydDqoAx4+/FoMQreeLQQK9ohWelKl7UGT3dvtrE+KV05Oz TYzBlbQoUn6cdge106NgWOemX7jL3JVLoY5bAET/fNbDhxiVukpv4umtkw27Vm4htiln lStw== X-Gm-Message-State: ALoCoQlMwYUOpWtx0iZvVT6mKwAyigdbTedZlWiX9DF+BGz7Du38WgSXDLxtRF0IBogx0XHBSo/8A8Mf0wCv9BU3EQ3qko3S0hDvdTX01u4voC71C+YCWvcXm+l50hW8sqBHnfINuYNe X-Received: by 10.180.182.166 with SMTP id ef6mr2718077wic.10.1412597822877; Mon, 06 Oct 2014 05:17:02 -0700 (PDT) Received: from uw000975.eu.tieto.com ([91.198.246.10]) by mx.google.com with ESMTPSA id kx2sm17150716wjb.6.2014.10.06.05.17.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 05:17:02 -0700 (PDT) From: Bartosz Markowski To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Bartosz Markowski Subject: [PATCH] ath10k: advertise all possible firmware(-api) files Date: Mon, 6 Oct 2014 14:16:41 +0200 Message-Id: <1412597801-19298-1-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 1.8.2 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=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB 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 This is required if we take into account possibility to load the driver from initrd (RAM disk), so in other words: very early in the boot process, before the file system is visible. In such case we need to have the firmware files accessible from ram disk too, and this patch guarantee this. Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/hw.h | 1 - drivers/net/wireless/ath/ath10k/pci.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 006a9cb..6dca960 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -28,7 +28,6 @@ #define QCA988X_HW_2_0_CHIP_ID_REV 0x2 #define QCA988X_HW_2_0_FW_DIR "ath10k/QCA988X/hw2.0" #define QCA988X_HW_2_0_FW_FILE "firmware.bin" -#define QCA988X_HW_2_0_FW_3_FILE "firmware-3.bin" #define QCA988X_HW_2_0_OTP_FILE "otp.bin" #define QCA988X_HW_2_0_BOARD_DATA_FILE "board.bin" #define QCA988X_HW_2_0_PATCH_LOAD_ADDR 0x1234 diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 8a04904..730bb18 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2600,5 +2600,7 @@ module_exit(ath10k_pci_exit); MODULE_AUTHOR("Qualcomm Atheros"); MODULE_DESCRIPTION("Driver support for Atheros QCA988X PCIe devices"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_FW_3_FILE); +MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_FW_FILE); +MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE); +MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API3_FILE); MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);