From patchwork Sun Oct 14 16:38:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10640743 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-2.web.codeaurora.org (Postfix) with ESMTP id 9865E13AD for ; Sun, 14 Oct 2018 16:38:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89FE72993B for ; Sun, 14 Oct 2018 16:38:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C9B52993E; Sun, 14 Oct 2018 16:38:38 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 22E512993B for ; Sun, 14 Oct 2018 16:38:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726422AbeJOAUL (ORCPT ); Sun, 14 Oct 2018 20:20:11 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52678 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbeJOAUK (ORCPT ); Sun, 14 Oct 2018 20:20:10 -0400 Received: by mail-wm1-f68.google.com with SMTP id 189-v6so16566059wmw.2 for ; Sun, 14 Oct 2018 09:38:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gd6dGZ7Q0uspSBNc+W1kS58F/T9Jfd86k7qe5wXW22o=; b=NUzjP7utFU8i/JCrDQhgk+Hs0PGwetTbuF4LgCx8sPbyqloMVqIzUbSvTXcKSjuKhW fQXBK0T8WVZl/GKYuKwyz6s6029O+Gm9T/Ah297cyijYw76fsx900ezTnHVKYaspc9Fy oVa/rQmz//njGzoQpVhOQLj70xGhMrVdtZkd+WCA/aGnY6r8RNjfiuCE10Zo2ZHJUhtj gekdTP2ZJFYUCQMCMWAbLLbPYBa6vUUhAlOFloGcMeO0mCOdLtEg3jc3amuGlAEzpCuC YZbSjKazg6X2RLALNqEgmgmihw3MmXAc5LfQdN3xW0gs58q8x5vwtGHhum5JzzAGwpOD XBGg== X-Gm-Message-State: ABuFfoh7wiuabTsoEGQVLfUBJwa1eeAPJhDtSFchRmhB0uvWa6gnFLA2 nxrUkOVbPCE0aXqbNQ5zoc47gw== X-Google-Smtp-Source: ACcGV60HkwUAjiIjeDGBexPGUW8JJ0BLjDc/K6enUbkMHYHqaZGJhQFd7KX7x+t6SpaFpffyQKdijg== X-Received: by 2002:a1c:2ecc:: with SMTP id u195-v6mr11185649wmu.137.1539535113562; Sun, 14 Oct 2018 09:38:33 -0700 (PDT) Received: from localhost.localdomain ([151.66.57.235]) by smtp.gmail.com with ESMTPSA id m143-v6sm7506910wmd.29.2018.10.14.09.38.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Oct 2018 09:38:32 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Cc: sgruszka@redhat.com, linux-wireless@vger.kernel.org Subject: [PATCH 1/2] mt76x2: align mt76x2 and mt76x2u firmware Date: Sun, 14 Oct 2018 18:38:05 +0200 Message-Id: <86b689536dd6625cad8df22f6fb6ef4442049098.1539534731.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: References: MIME-Version: 1.0 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 Unify firmware version used on mt76x2e and mt76x2u drivers Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 3 --- drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h index ab93125f46de..b546fe83a40d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h @@ -31,9 +31,6 @@ #define MT7662_ROM_PATCH "mt7662_rom_patch.bin" #define MT7662_EEPROM_SIZE 512 -#define MT7662U_FIRMWARE "mediatek/mt7662u.bin" -#define MT7662U_ROM_PATCH "mediatek/mt7662u_rom_patch.bin" - #define MT_CALIBRATE_INTERVAL HZ #include "../mt76x02.h" diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c index 57baf8d1c830..4d1788eb3812 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c @@ -131,8 +131,8 @@ static int __maybe_unused mt76x2u_resume(struct usb_interface *intf) } MODULE_DEVICE_TABLE(usb, mt76x2u_device_table); -MODULE_FIRMWARE(MT7662U_FIRMWARE); -MODULE_FIRMWARE(MT7662U_ROM_PATCH); +MODULE_FIRMWARE(MT7662_FIRMWARE); +MODULE_FIRMWARE(MT7662_ROM_PATCH); static struct usb_driver mt76x2u_driver = { .name = KBUILD_MODNAME, diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c index 3f1e558e5e6d..a40aa838b6b2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c @@ -117,7 +117,7 @@ static int mt76x2u_mcu_load_rom_patch(struct mt76x02_dev *dev) return 0; } - err = request_firmware(&fw, MT7662U_ROM_PATCH, dev->mt76.dev); + err = request_firmware(&fw, MT7662_ROM_PATCH, dev->mt76.dev); if (err < 0) return err; @@ -183,7 +183,7 @@ static int mt76x2u_mcu_load_firmware(struct mt76x02_dev *dev) int err, len, ilm_len, dlm_len; const struct firmware *fw; - err = request_firmware(&fw, MT7662U_FIRMWARE, dev->mt76.dev); + err = request_firmware(&fw, MT7662_FIRMWARE, dev->mt76.dev); if (err < 0) return err;