From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 04/11] mmc: sdio: Move SDIO IDs from btmrvl driver to common include file Date: Fri, 22 May 2020 16:44:05 +0200 Message-Id: <20200522144412.19712-5-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 RGVmaW5lIGFwcHJvcHJpYXRlIG1hY3JvIG5hbWVzIGZvciBjb25zaXN0ZW5jeSB3aXRoIG90aGVy IE1hcnZlbGwgbWFjcm9zLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVs Lm9yZz4KLS0tCiBkcml2ZXJzL2JsdWV0b290aC9idG1ydmxfc2Rpby5jIHwgMTggKysrKysrKysr LS0tLS0tLS0tCiBpbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oICAgIHwgIDggKysrKysrKysK IDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2JsdWV0b290aC9idG1ydmxfc2Rpby5jIGIvZHJpdmVycy9ibHVldG9v dGgvYnRtcnZsX3NkaW8uYwppbmRleCAwZjNhMDIwNzAzYWIuLmEyOTZmODUyNjQzMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ibHVldG9vdGgvYnRtcnZsX3NkaW8uYworKysgYi9kcml2ZXJzL2JsdWV0 b290aC9idG1ydmxfc2Rpby5jCkBAIC0zNTUsMzEgKzM1NSwzMSBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGJ0bXJ2bF9zZGlvX2RldmljZSBidG1ydmxfc2Rpb19zZDg5OTcgPSB7CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3Qgc2Rpb19kZXZpY2VfaWQgYnRtcnZsX3NkaW9faWRzW10gPSB7CiAJLyogTWFy dmVsbCBTRDg2ODggQmx1ZXRvb3RoIGRldmljZSAqLwotCXsgU0RJT19ERVZJQ0UoU0RJT19WRU5E T1JfSURfTUFSVkVMTCwgMHg5MTA1KSwKKwl7IFNESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01B UlZFTEwsIFNESU9fREVWSUNFX0lEX01BUlZFTExfODY4OF9CVCksCiAJCQkuZHJpdmVyX2RhdGEg PSAodW5zaWduZWQgbG9uZykmYnRtcnZsX3NkaW9fc2Q4Njg4IH0sCiAJLyogTWFydmVsbCBTRDg3 ODcgQmx1ZXRvb3RoIGRldmljZSAqLwotCXsgU0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFS VkVMTCwgMHg5MTFBKSwKKwl7IFNESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEwsIFNE SU9fREVWSUNFX0lEX01BUlZFTExfODc4N19CVCksCiAJCQkuZHJpdmVyX2RhdGEgPSAodW5zaWdu ZWQgbG9uZykmYnRtcnZsX3NkaW9fc2Q4Nzg3IH0sCiAJLyogTWFydmVsbCBTRDg3ODcgQmx1ZXRv b3RoIEFNUCBkZXZpY2UgKi8KLQl7IFNESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01BUlZFTEws IDB4OTExQiksCisJeyBTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCBTRElPX0RF VklDRV9JRF9NQVJWRUxMXzg3ODdfQlRfQU1QKSwKIAkJCS5kcml2ZXJfZGF0YSA9ICh1bnNpZ25l ZCBsb25nKSZidG1ydmxfc2Rpb19zZDg3ODcgfSwKIAkvKiBNYXJ2ZWxsIFNEODc5NyBCbHVldG9v dGggZGV2aWNlICovCi0JeyBTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCAweDkx MkEpLAorCXsgU0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0Vf SURfTUFSVkVMTF84Nzk3X0JUKSwKIAkJCS5kcml2ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZi dG1ydmxfc2Rpb19zZDg3OTcgfSwKIAkvKiBNYXJ2ZWxsIFNEODg4NyBCbHVldG9vdGggZGV2aWNl ICovCi0JeyBTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCAweDkxMzYpLAorCXsg U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVM TF84ODg3X0JUKSwKIAkJCS5kcml2ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZidG1ydmxfc2Rp b19zZDg4ODcgfSwKIAkvKiBNYXJ2ZWxsIFNEODg5NyBCbHVldG9vdGggZGV2aWNlICovCi0JeyBT RElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCAweDkxMkUpLAorCXsgU0RJT19ERVZJ Q0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODk3X0JU KSwKIAkJCS5kcml2ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZidG1ydmxfc2Rpb19zZDg4OTcg fSwKIAkvKiBNYXJ2ZWxsIFNEODk3NyBCbHVldG9vdGggZGV2aWNlICovCi0JeyBTRElPX0RFVklD RShTRElPX1ZFTkRPUl9JRF9NQVJWRUxMLCAweDkxNDYpLAorCXsgU0RJT19ERVZJQ0UoU0RJT19W RU5ET1JfSURfTUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTc3X0JUKSwKIAkJCS5k cml2ZXJfZGF0YSA9ICh1bnNpZ25lZCBsb25nKSZidG1ydmxfc2Rpb19zZDg5NzcgfSwKIAkvKiBN YXJ2ZWxsIFNEODk4NyBCbHVldG9vdGggZGV2aWNlICovCi0JeyBTRElPX0RFVklDRShTRElPX1ZF TkRPUl9JRF9NQVJWRUxMLCAweDkxNEEpLAorCXsgU0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURf TUFSVkVMTCwgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTg3X0JUKSwKIAkJCS5kcml2ZXJfZGF0 YSA9ICh1bnNpZ25lZCBsb25nKSZidG1ydmxfc2Rpb19zZDg5ODcgfSwKIAkvKiBNYXJ2ZWxsIFNE ODk5NyBCbHVldG9vdGggZGV2aWNlICovCi0JeyBTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9N QVJWRUxMLCAweDkxNDIpLAorCXsgU0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfTUFSVkVMTCwg U0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTk3X0JUKSwKIAkJCS5kcml2ZXJfZGF0YSA9ICh1bnNp Z25lZCBsb25nKSZidG1ydmxfc2Rpb19zZDg5OTcgfSwKIAogCXsgfQkvKiBUZXJtaW5hdGluZyBl bnRyeSAqLwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaCBiL2luY2x1 ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKaW5kZXggOTAzNjFlYTdmNWVkLi4xMjM3ZTEwNDhkMDYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKKysrIGIvaW5jbHVkZS9s aW51eC9tbWMvc2Rpb19pZHMuaApAQCAtNjAsMTYgKzYwLDI0IEBACiAjZGVmaW5lIFNESU9fREVW SUNFX0lEX01BUlZFTExfODY4OF9CVAkJMHg5MTA1CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01B UlZFTExfODc4Nl9XTEFOCTB4OTExNgogI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg3 ODdfV0xBTgkweDkxMTkKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzg3X0JUCQkw eDkxMWEKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzg3X0JUX0FNUAkweDkxMWIK ICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzk3X0YwCQkweDkxMjgKICNkZWZpbmUg U0RJT19ERVZJQ0VfSURfTUFSVkVMTF84Nzk3X1dMQU4JMHg5MTI5CisjZGVmaW5lIFNESU9fREVW SUNFX0lEX01BUlZFTExfODc5N19CVAkJMHg5MTJhCiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01B UlZFTExfODg5N19XTEFOCTB4OTEyZAorI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4 OTdfQlQJCTB4OTEyZQogI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4ODdfRjAJCTB4 OTEzNAogI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg4ODdfV0xBTgkweDkxMzUKKyNk ZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84ODg3X0JUCQkweDkxMzYKICNkZWZpbmUgU0RJ T19ERVZJQ0VfSURfTUFSVkVMTF84ODAxX1dMQU4JMHg5MTM5CiAjZGVmaW5lIFNESU9fREVWSUNF X0lEX01BUlZFTExfODk5N19GMAkJMHg5MTQwCiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZF TExfODk5N19XTEFOCTB4OTE0MQorI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5OTdf QlQJCTB4OTE0MgogI2RlZmluZSBTRElPX0RFVklDRV9JRF9NQVJWRUxMXzg5NzdfV0xBTgkweDkx NDUKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTc3X0JUCQkweDkxNDYKICNkZWZp bmUgU0RJT19ERVZJQ0VfSURfTUFSVkVMTF84OTg3X1dMQU4JMHg5MTQ5CisjZGVmaW5lIFNESU9f REVWSUNFX0lEX01BUlZFTExfODk4N19CVAkJMHg5MTRhCiAKICNkZWZpbmUgU0RJT19WRU5ET1Jf SURfTUVESUFURUsJCQkweDAzN2EKIAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KYXRoMTBrIG1haWxpbmcgbGlzdAphdGgxMGtAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2F0aDEwawo= 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 42D0EC433DF for ; Fri, 22 May 2020 14:46:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21687204EF for ; Fri, 22 May 2020 14:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158799; bh=JuVtsoJtqiGRmlRjn0aQhleeQaWm700qqmuKFp/zUsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EPAwkZzlYqLE20UWSBiJxdebwax92ZcF/ZJbM4EeickISIFbtwGQciAPRb7f4ZxH0 u+BTCrOXgjHC+4Pirp5gUoNRC16WCduzTLpqaumgPUHL6xQfJEzPwODTRywJLWOXeG OefALq7GXG6iJ24s7hLR9ICa33O3I/VVjSSSliqs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730357AbgEVOqe (ORCPT ); Fri, 22 May 2020 10:46:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:48314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730089AbgEVOpx (ORCPT ); Fri, 22 May 2020 10:45:53 -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 05EF420727; Fri, 22 May 2020 14:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158752; bh=JuVtsoJtqiGRmlRjn0aQhleeQaWm700qqmuKFp/zUsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KA9a1lxgJE9kGo8WzKl//DiDJ0mIhN5vTC2JDL6dMQ5+Zm9/Q5w7ftISDJaERGnsw WU7zCHsKRoAdfuF/WFi0DnRc7O+PXFrI8NmSYE5774cBV0eCl8oz+xEw8kDjsPAbmz iHLXemt9FudqdZVrtqvwWCywY1qzI8i/HFMoFqWo= Received: by pali.im (Postfix) id 3FEBD51E; Fri, 22 May 2020 16:45:50 +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 04/11] mmc: sdio: Move SDIO IDs from btmrvl driver to common include file Date: Fri, 22 May 2020 16:44:05 +0200 Message-Id: <20200522144412.19712-5-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 Define appropriate macro names for consistency with other Marvell macros. Signed-off-by: Pali Rohár --- drivers/bluetooth/btmrvl_sdio.c | 18 +++++++++--------- include/linux/mmc/sdio_ids.h | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 0f3a020703ab..a296f8526433 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -355,31 +355,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { static const struct sdio_device_id btmrvl_sdio_ids[] = { /* Marvell SD8688 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8688_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8688 }, /* Marvell SD8787 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8787 }, /* Marvell SD8787 Bluetooth AMP device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT_AMP), .driver_data = (unsigned long)&btmrvl_sdio_sd8787 }, /* Marvell SD8797 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8797 }, /* Marvell SD8887 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9136), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8887 }, /* Marvell SD8897 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8897 }, /* Marvell SD8977 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8977 }, /* Marvell SD8987 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8987 }, /* Marvell SD8997 Bluetooth device */ - { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142), + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_BT), .driver_data = (unsigned long)&btmrvl_sdio_sd8997 }, { } /* Terminating entry */ diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 90361ea7f5ed..1237e1048d06 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -60,16 +60,24 @@ #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_8787_BT 0x911a +#define SDIO_DEVICE_ID_MARVELL_8787_BT_AMP 0x911b #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 #define SDIO_DEVICE_ID_MARVELL_8797_WLAN 0x9129 +#define SDIO_DEVICE_ID_MARVELL_8797_BT 0x912a #define SDIO_DEVICE_ID_MARVELL_8897_WLAN 0x912d +#define SDIO_DEVICE_ID_MARVELL_8897_BT 0x912e #define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134 #define SDIO_DEVICE_ID_MARVELL_8887_WLAN 0x9135 +#define SDIO_DEVICE_ID_MARVELL_8887_BT 0x9136 #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_8997_BT 0x9142 #define SDIO_DEVICE_ID_MARVELL_8977_WLAN 0x9145 +#define SDIO_DEVICE_ID_MARVELL_8977_BT 0x9146 #define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x9149 +#define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a #define SDIO_VENDOR_ID_MEDIATEK 0x037a -- 2.20.1