From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 03/11] mmc: sdio: Move SDIO IDs from mwifiex driver to common include file Date: Fri, 22 May 2020 16:44:04 +0200 Message-Id: <20200522144412.19712-4-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 QWRkIF9XTEFOIHN1ZmZpeCB0byBtYWNybyBuYW1lcyBmb3IgY29uc2lzdGVuY3kgd2l0aCBvdGhl ciBNYXJ2ZWxsIG1hY3Jvcy4KVGhlc2UgSURzIHJlcHJlc2VudHMgd2xhbiBmdW5jdGlvbiBvZiBj b21ibyBidC93bGFuIGNhcmRzLiBPdGhlciBmdW5jdGlvbnMKb2YgdGhlc2UgY2FyZHMgaGF2ZSBk aWZmZXJlbnQgSURzLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9y Zz4KLS0tCiBkcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvc2Rpby5jIHwgMzgg KysrKystLS0tLS0tLS0tLS0tLS0tCiBpbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oICAgICAg ICAgICAgICAgIHwgMTAgKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyks IDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL21hcnZl bGwvbXdpZmlleC9zZGlvLmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgv c2Rpby5jCmluZGV4IDZhMmRjYjAxY2FmNC4uYTA0Mjk2NTk2MmEyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvc2Rpby5jCisrKyBiL2RyaXZlcnMvbmV0 L3dpcmVsZXNzL21hcnZlbGwvbXdpZmlleC9zZGlvLmMKQEAgLTQ4MCw0NSArNDgwLDI1IEBAIHN0 YXRpYyB2b2lkIG13aWZpZXhfc2Rpb19jb3JlZHVtcChzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJCXNj aGVkdWxlX3dvcmsoJmNhcmQtPndvcmspOwogfQogCi0vKiBEZXZpY2UgSUQgZm9yIFNEODc4NiAq LwotI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg3ODYgICAoMHg5MTE2KQotLyogRGV2 aWNlIElEIGZvciBTRDg3ODcgKi8KLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzg3 ICAgKDB4OTExOSkKLS8qIERldmljZSBJRCBmb3IgU0Q4Nzk3ICovCi0jZGVmaW5lIFNESU9fREVW SUNFX0lEX01BUlZFTExfODc5NyAgICgweDkxMjkpCi0vKiBEZXZpY2UgSUQgZm9yIFNEODg5NyAq LwotI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4OTcgICAoMHg5MTJkKQotLyogRGV2 aWNlIElEIGZvciBTRDg4ODcgKi8KLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3 ICAgKDB4OTEzNSkKLS8qIERldmljZSBJRCBmb3IgU0Q4ODAxICovCi0jZGVmaW5lIFNESU9fREVW SUNFX0lEX01BUlZFTExfODgwMSAgICgweDkxMzkpCi0vKiBEZXZpY2UgSUQgZm9yIFNEODk3NyAq LwotI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5NzcgICAoMHg5MTQ1KQotLyogRGV2 aWNlIElEIGZvciBTRDg5ODcgKi8KLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTg3 ICAgKDB4OTE0OSkKLS8qIERldmljZSBJRCBmb3IgU0Q4OTk3ICovCi0jZGVmaW5lIFNESU9fREVW SUNFX0lEX01BUlZFTExfODk5NyAgICgweDkxNDEpCi0KLQogLyogV0xBTiBJRHMgKi8KIHN0YXRp YyBjb25zdCBzdHJ1Y3Qgc2Rpb19kZXZpY2VfaWQgbXdpZmlleF9pZHNbXSA9IHsKLQl7U0RJT19E RVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzg2 KSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURf TUFSVkVMTF84Nzg2X1dMQU4pLAogCQkuZHJpdmVyX2RhdGEgPSAodW5zaWduZWQgbG9uZykgJm13 aWZpZXhfc2Rpb19zZDg3ODZ9LAotCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxM LCBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg3ODcpLAorCXtTRElPX0RFVklDRShTRElPX1ZFTkRP Ul9JRF9NQVJWRUxMLCBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg3ODdfV0xBTiksCiAJCS5kcml2 ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSAmbXdpZmlleF9zZGlvX3NkODc4N30sCi0Je1NESU9f REVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lEX01BUlZFTExfODc5 NyksCisJe1NESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lE X01BUlZFTExfODc5N19XTEFOKSwKIAkJLmRyaXZlcl9kYXRhID0gKHVuc2lnbmVkIGxvbmcpICZt d2lmaWV4X3NkaW9fc2Q4Nzk3fSwKLQl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVM TCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODk3KSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5E T1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODk3X1dMQU4pLAogCQkuZHJp dmVyX2RhdGEgPSAodW5zaWduZWQgbG9uZykgJm13aWZpZXhfc2Rpb19zZDg4OTd9LAotCXtTRElP X0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4 ODcpLAorCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCBTRElPX0RFVklDRV9J RF9NQVJWRUxMXzg4ODdfV0xBTiksCiAJCS5kcml2ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZt d2lmaWV4X3NkaW9fc2Q4ODg3fSwKLQl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVM TCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODAxKSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5E T1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODAxX1dMQU4pLAogCQkuZHJp dmVyX2RhdGEgPSAodW5zaWduZWQgbG9uZykmbXdpZmlleF9zZGlvX3NkODgwMX0sCi0Je1NESU9f REVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lEX01BUlZFTExfODk3 NyksCisJe1NESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNESU9fREVWSUNFX0lE X01BUlZFTExfODk3N19XTEFOKSwKIAkJLmRyaXZlcl9kYXRhID0gKHVuc2lnbmVkIGxvbmcpJm13 aWZpZXhfc2Rpb19zZDg5Nzd9LAotCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxM LCBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5ODcpLAorCXtTRElPX0RFVklDRShTRElPX1ZFTkRP Ul9JRF9NQVJWRUxMLCBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5ODdfV0xBTiksCiAJCS5kcml2 ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZtd2lmaWV4X3NkaW9fc2Q4OTg3fSwKLQl7U0RJT19E RVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTk3 KSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURf TUFSVkVMTF84OTk3X1dMQU4pLAogCQkuZHJpdmVyX2RhdGEgPSAodW5zaWduZWQgbG9uZykmbXdp ZmlleF9zZGlvX3NkODk5N30sCiAJe30sCiB9OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9t bWMvc2Rpb19pZHMuaCBiL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKaW5kZXggN2U5OTJh MGU2Y2MwLi45MDM2MWVhN2Y1ZWQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW1jL3NkaW9f aWRzLmgKKysrIGIvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaApAQCAtNTgsOCArNTgsMTgg QEAKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF9MSUJFUlRBUwkJMHg5MTAzCiAjZGVm aW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExfODY4OF9XTEFOCTB4OTEwNAogI2RlZmluZSBTRElP X0RFVklDRV9JRF9NQVJWRUxMXzg2ODhfQlQJCTB4OTEwNQorI2RlZmluZSBTRElPX0RFVklDRV9J RF9NQVJWRUxMXzg3ODZfV0xBTgkweDkxMTYKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVM TF84Nzg3X1dMQU4JMHg5MTE5CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExfODc5N19G MAkJMHg5MTI4CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExfODc5N19XTEFOCTB4OTEy OQorI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4OTdfV0xBTgkweDkxMmQKICNkZWZp bmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3X0YwCQkweDkxMzQKKyNkZWZpbmUgU0RJT19E RVZJQ0VfSURfTUFSVkVMTF84ODg3X1dMQU4JMHg5MTM1CisjZGVmaW5lIFNESU9fREVWSUNFX0lE X01BUlZFTExfODgwMV9XTEFOCTB4OTEzOQorI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxM Xzg5OTdfRjAJCTB4OTE0MAorI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5OTdfV0xB TgkweDkxNDEKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTc3X1dMQU4JMHg5MTQ1 CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExfODk4N19XTEFOCTB4OTE0OQogCiAjZGVm aW5lIFNESU9fVkVORE9SX0lEX01FRElBVEVLCQkJMHgwMzdhCiAKLS0gCjIuMjAuMQoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0aDEwayBtYWlsaW5n IGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK 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=ham 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 F30BAC433DF for ; Fri, 22 May 2020 14:45:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9B8921534 for ; Fri, 22 May 2020 14:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158754; bh=oq5ZCJlTZiGHXZ4dJp1898bt1twZklmXaQYyrfl6DbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Bb6JqDyA4qxjdNAHnqFVoTci0ePnY9LNow3Zi2onNWKS+TnJBn8mf+HEFRNeIn9WL 1Ag5AwMP8+y8SG/EPol1vjL5FODpTh7At/zE38kLqM1OylGbKmx9qeLhYXmB1qDPSO 53IIrAG4CCtnDdTgwI6sYATEJ3iizNFpFPULTbHs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730261AbgEVOpx (ORCPT ); Fri, 22 May 2020 10:45:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730061AbgEVOpt (ORCPT ); Fri, 22 May 2020 10:45:49 -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 7D03B2054F; Fri, 22 May 2020 14:45:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158748; bh=oq5ZCJlTZiGHXZ4dJp1898bt1twZklmXaQYyrfl6DbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vmqgPZnAGbdGZkJnNBSQtvm5P4tXIor1R1Pr7WCRLRgBOTPbUAUjAK2he5uiCxego drlx24+IBOOCbkZ0FQZXlUX7+1xhSyWF7QVA/EDbp8DY1BW6O8OQqdkK71TbvkC8Ko kzc3sqKQHGdA/xvwycnU4auvcNvKyXeXMq7du2Io= Received: by pali.im (Postfix) id A1CBE51E; Fri, 22 May 2020 16:45:46 +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 03/11] mmc: sdio: Move SDIO IDs from mwifiex driver to common include file Date: Fri, 22 May 2020 16:44:04 +0200 Message-Id: <20200522144412.19712-4-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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add _WLAN suffix to macro names for consistency with other Marvell macros. These IDs represents wlan function of combo bt/wlan cards. Other functions of these cards have different IDs. Signed-off-by: Pali Rohár --- drivers/net/wireless/marvell/mwifiex/sdio.c | 38 +++++---------------- include/linux/mmc/sdio_ids.h | 10 ++++++ 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index 6a2dcb01caf4..a042965962a2 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -480,45 +480,25 @@ static void mwifiex_sdio_coredump(struct device *dev) schedule_work(&card->work); } -/* Device ID for SD8786 */ -#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116) -/* Device ID for SD8787 */ -#define SDIO_DEVICE_ID_MARVELL_8787 (0x9119) -/* Device ID for SD8797 */ -#define SDIO_DEVICE_ID_MARVELL_8797 (0x9129) -/* Device ID for SD8897 */ -#define SDIO_DEVICE_ID_MARVELL_8897 (0x912d) -/* Device ID for SD8887 */ -#define SDIO_DEVICE_ID_MARVELL_8887 (0x9135) -/* Device ID for SD8801 */ -#define SDIO_DEVICE_ID_MARVELL_8801 (0x9139) -/* Device ID for SD8977 */ -#define SDIO_DEVICE_ID_MARVELL_8977 (0x9145) -/* Device ID for SD8987 */ -#define SDIO_DEVICE_ID_MARVELL_8987 (0x9149) -/* Device ID for SD8997 */ -#define SDIO_DEVICE_ID_MARVELL_8997 (0x9141) - - /* WLAN IDs */ static const struct sdio_device_id mwifiex_ids[] = { - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786_WLAN), .driver_data = (unsigned long) &mwifiex_sdio_sd8786}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_WLAN), .driver_data = (unsigned long) &mwifiex_sdio_sd8787}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_WLAN), .driver_data = (unsigned long) &mwifiex_sdio_sd8797}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_WLAN), .driver_data = (unsigned long) &mwifiex_sdio_sd8897}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8887}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8801}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8977}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8987}, - {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997), + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8997}, {}, }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 7e992a0e6cc0..90361ea7f5ed 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -58,8 +58,18 @@ #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 #define SDIO_DEVICE_ID_MARVELL_8688_WLAN 0x9104 #define SDIO_DEVICE_ID_MARVELL_8688_BT 0x9105 +#define SDIO_DEVICE_ID_MARVELL_8786_WLAN 0x9116 +#define SDIO_DEVICE_ID_MARVELL_8787_WLAN 0x9119 #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 +#define SDIO_DEVICE_ID_MARVELL_8797_WLAN 0x9129 +#define SDIO_DEVICE_ID_MARVELL_8897_WLAN 0x912d #define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134 +#define SDIO_DEVICE_ID_MARVELL_8887_WLAN 0x9135 +#define SDIO_DEVICE_ID_MARVELL_8801_WLAN 0x9139 +#define SDIO_DEVICE_ID_MARVELL_8997_F0 0x9140 +#define SDIO_DEVICE_ID_MARVELL_8997_WLAN 0x9141 +#define SDIO_DEVICE_ID_MARVELL_8977_WLAN 0x9145 +#define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x9149 #define SDIO_VENDOR_ID_MEDIATEK 0x037a -- 2.20.1