From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 118AFC433E0 for ; Fri, 22 May 2020 14:45:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E555120DD4 for ; Fri, 22 May 2020 14:45:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158746; bh=hRb2VDYaeeagfmMwuXWOO5MTiJ36qdN4nrC0CGCu3qE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IHnbAu8hOHo9gmf9J79qtFyC1XWOVPHiQTXRbzm6ui/9dHpXyMkB2oHxJ0sk6PaPI ZXzj1mFqc6f3V42FvyO+e2oPZmt2zEa5q3r2r4OPSgUls4IVwRk6XyCIZUHPhi2CYv 3D86QsR2AIfusCnCaf7O6SV3hYAwmZIcgsIz6yqY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730065AbgEVOpn (ORCPT ); Fri, 22 May 2020 10:45:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:48042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730036AbgEVOpn (ORCPT ); Fri, 22 May 2020 10:45:43 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7FCF9204EF; Fri, 22 May 2020 14:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158742; bh=hRb2VDYaeeagfmMwuXWOO5MTiJ36qdN4nrC0CGCu3qE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LrqjOWo/J/e9nqoi7yNeP3vN8U5uj740diXbXu7bs4TXKUlq/Wfi+mfz8xQW2v7va UE5FWy17VeukuVoiZIHjzYXyVZvElDUFhPCwCXBb0Lnaf1D+85JNr0lkHuTgn2olws Zz2NEZtpFTLaUVIZ0OyqdWrQPDa5G9Esdeu3kbD0= Received: by pali.im (Postfix) id CB79251E; Fri, 22 May 2020 16:45:40 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: Matthias Brugger , Mauro Carvalho Chehab , Kalle Valo , Amitkumar Karwar , Ganapathi Bhat , Xinming Hu , linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, b43-dev@lists.infradead.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 01/11] mmc: sdio: Fix macro name for Marvell device with ID 0x9134 Date: Fri, 22 May 2020 16:44:02 +0200 Message-Id: <20200522144412.19712-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Marvell SDIO device ID 0x9134 is used in SDIO Common CIS (Card Information Structure) and not in SDIO wlan function (with ID 1). SDIO Common CIS is accessed by function ID 0. So change this misleading macro name to SDIO_DEVICE_ID_MARVELL_8887_F0 as it does not refer to wlan function. It refers to function 0. Wlan module on this SDIO card is available at function ID 1 and is identified by different SDIO device ID 0x9135. Kernel quirks for SDIO devices are matched against device ID from SDIO Common CIS. Therefore device ID used in quirk is correct, just has misleading name. Signed-off-by: Pali Rohár --- drivers/mmc/core/quirks.h | 2 +- include/linux/mmc/sdio_ids.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index 3dba15bccce2..472fa2fdcf13 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -139,7 +139,7 @@ static const struct mmc_fixup sdio_fixup_methods[] = { SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_F0, add_quirk, MMC_QUIRK_BROKEN_IRQ_POLLING), - SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887WLAN, + SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_F0, add_limit_rate_quirk, 150000000), END_FIXUP diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 2e9a6e4634eb..96f43e0dc78f 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -59,7 +59,7 @@ #define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104 #define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105 #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 -#define SDIO_DEVICE_ID_MARVELL_8887WLAN 0x9134 +#define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134 #define SDIO_VENDOR_ID_MEDIATEK 0x037a -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 01/11] mmc: sdio: Fix macro name for Marvell device with ID 0x9134 Date: Fri, 22 May 2020 16:44:02 +0200 Message-Id: <20200522144412.19712-2-pali@kernel.org> In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com, libertas-dev@lists.infradead.org, Xinming Hu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Amitkumar Karwar , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Ganapathi Bhat , ath10k@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , brcm80211-dev-list@cypress.com, Kalle Valo , b43-dev@lists.infradead.org TWFydmVsbCBTRElPIGRldmljZSBJRCAweDkxMzQgaXMgdXNlZCBpbiBTRElPIENvbW1vbiBDSVMg KENhcmQgSW5mb3JtYXRpb24KU3RydWN0dXJlKSBhbmQgbm90IGluIFNESU8gd2xhbiBmdW5jdGlv biAod2l0aCBJRCAxKS4gU0RJTyBDb21tb24gQ0lTIGlzCmFjY2Vzc2VkIGJ5IGZ1bmN0aW9uIElE IDAuCgpTbyBjaGFuZ2UgdGhpcyBtaXNsZWFkaW5nIG1hY3JvIG5hbWUgdG8gU0RJT19ERVZJQ0Vf SURfTUFSVkVMTF84ODg3X0YwIGFzCml0IGRvZXMgbm90IHJlZmVyIHRvIHdsYW4gZnVuY3Rpb24u IEl0IHJlZmVycyB0byBmdW5jdGlvbiAwLgoKV2xhbiBtb2R1bGUgb24gdGhpcyBTRElPIGNhcmQg aXMgYXZhaWxhYmxlIGF0IGZ1bmN0aW9uIElEIDEgYW5kIGlzCmlkZW50aWZpZWQgYnkgZGlmZmVy ZW50IFNESU8gZGV2aWNlIElEIDB4OTEzNS4gS2VybmVsIHF1aXJrcyBmb3IgU0RJTwpkZXZpY2Vz IGFyZSBtYXRjaGVkIGFnYWluc3QgZGV2aWNlIElEIGZyb20gU0RJTyBDb21tb24gQ0lTLiBUaGVy ZWZvcmUKZGV2aWNlIElEIHVzZWQgaW4gcXVpcmsgaXMgY29ycmVjdCwganVzdCBoYXMgbWlzbGVh ZGluZyBuYW1lLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4K LS0tCiBkcml2ZXJzL21tYy9jb3JlL3F1aXJrcy5oICAgIHwgMiArLQogaW5jbHVkZS9saW51eC9t bWMvc2Rpb19pZHMuaCB8IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbW1jL2NvcmUvcXVpcmtzLmggYi9k cml2ZXJzL21tYy9jb3JlL3F1aXJrcy5oCmluZGV4IDNkYmExNWJjY2NlMi4uNDcyZmEyZmRjZjEz IDEwMDY0NAotLS0gYS9kcml2ZXJzL21tYy9jb3JlL3F1aXJrcy5oCisrKyBiL2RyaXZlcnMvbW1j L2NvcmUvcXVpcmtzLmgKQEAgLTEzOSw3ICsxMzksNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IG1t Y19maXh1cCBzZGlvX2ZpeHVwX21ldGhvZHNbXSA9IHsKIAlTRElPX0ZJWFVQKFNESU9fVkVORE9S X0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lEX01BUlZFTExfODc5N19GMCwKIAkJICAgYWRkX3F1 aXJrLCBNTUNfUVVJUktfQlJPS0VOX0lSUV9QT0xMSU5HKSwKIAotCVNESU9fRklYVVAoU0RJT19W RU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3V0xBTiwKKwlTRElP X0ZJWFVQKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lEX01BUlZFTExfODg4 N19GMCwKIAkJICAgYWRkX2xpbWl0X3JhdGVfcXVpcmssIDE1MDAwMDAwMCksCiAKIAlFTkRfRklY VVAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmggYi9pbmNsdWRlL2xp bnV4L21tYy9zZGlvX2lkcy5oCmluZGV4IDJlOWE2ZTQ2MzRlYi4uOTZmNDNlMGRjNzhmIDEwMDY0 NAotLS0gYS9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oCisrKyBiL2luY2x1ZGUvbGludXgv bW1jL3NkaW9faWRzLmgKQEAgLTU5LDcgKzU5LDcgQEAKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURf TUFSVkVMTF84Njg4V0xBTgkJMHg5MTA0CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExf ODY4OEJUCQkweDkxMDUKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzk3X0YwCQkw eDkxMjgKLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3V0xBTgkweDkxMzQKKyNk ZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3X0YwCQkweDkxMzQKIAogI2RlZmluZSBT RElPX1ZFTkRPUl9JRF9NRURJQVRFSwkJCTB4MDM3YQogCi0tIAoyLjIwLjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0 CmF0aDEwa0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vYXRoMTBrCg==