From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 05/11] mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file Date: Fri, 22 May 2020 16:44:06 +0200 Message-Id: <20200522144412.19712-6-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 IG1hY3Jvcy4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy9ibHVldG9vdGgvYnRtdGtzZGlvLmMgfCA0ICsrLS0KIGluY2x1ZGUvbGludXgv bW1jL3NkaW9faWRzLmggIHwgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibHVldG9vdGgvYnRtdGtzZGlv LmMgYi9kcml2ZXJzL2JsdWV0b290aC9idG10a3NkaW8uYwppbmRleCA1MTk3ODhjNDQyY2EuLmJm ZjA5NWJlMmY5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ibHVldG9vdGgvYnRtdGtzZGlvLmMKKysr IGIvZHJpdmVycy9ibHVldG9vdGgvYnRtdGtzZGlvLmMKQEAgLTUxLDkgKzUxLDkgQEAgc3RhdGlj IGNvbnN0IHN0cnVjdCBidG10a3NkaW9fZGF0YSBtdDc2NjhfZGF0YSA9IHsKIH07CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3Qgc2Rpb19kZXZpY2VfaWQgYnRtdGtzZGlvX3RhYmxlW10gPSB7Ci0Je1NE SU9fREVWSUNFKFNESU9fVkVORE9SX0lEX01FRElBVEVLLCAweDc2NjMpLAorCXtTRElPX0RFVklD RShTRElPX1ZFTkRPUl9JRF9NRURJQVRFSywgU0RJT19ERVZJQ0VfSURfTUVESUFURUtfTVQ3NjYz KSwKIAkgLmRyaXZlcl9kYXRhID0gKGtlcm5lbF91bG9uZ190KSZtdDc2NjNfZGF0YSB9LAotCXtT RElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9NRURJQVRFSywgMHg3NjY4KSwKKwl7U0RJT19ERVZJ Q0UoU0RJT19WRU5ET1JfSURfTUVESUFURUssIFNESU9fREVWSUNFX0lEX01FRElBVEVLX01UNzY2 OCksCiAJIC5kcml2ZXJfZGF0YSA9IChrZXJuZWxfdWxvbmdfdCkmbXQ3NjY4X2RhdGEgfSwKIAl7 IH0JLyogVGVybWluYXRpbmcgZW50cnkgKi8KIH07CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L21tYy9zZGlvX2lkcy5oIGIvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaAppbmRleCAxMjM3 ZTEwNDhkMDYuLmM5YWNhNTdkNGRlYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9tbWMvc2Rp b19pZHMuaAorKysgYi9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oCkBAIC04MCw2ICs4MCw4 IEBACiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX01BUlZFTExfODk4N19CVAkJMHg5MTRhCiAKICNk ZWZpbmUgU0RJT19WRU5ET1JfSURfTUVESUFURUsJCQkweDAzN2EKKyNkZWZpbmUgU0RJT19ERVZJ Q0VfSURfTUVESUFURUtfTVQ3NjYzCQkweDc2NjMKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfTUVE SUFURUtfTVQ3NjY4CQkweDc2NjgKIAogI2RlZmluZSBTRElPX1ZFTkRPUl9JRF9TSUFOTwkJCTB4 MDM5YQogI2RlZmluZSBTRElPX0RFVklDRV9JRF9TSUFOT19OT1ZBX0IwCQkweDAyMDEKLS0gCjIu MjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0 aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK 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 85CD0C433E0 for ; Fri, 22 May 2020 14:46:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FF69204EF for ; Fri, 22 May 2020 14:46:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158793; bh=fmZWyu8S8zz/WmoFW+uWpo4sd9DDFs+iV3itMZTeMR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Oxgw2wAak7KA4yClGAhqRe1Ho6aZo05NFdA2XlM2hTxsJJs9F44uPdydFEu9+0mqB HTf3AgQGpseFgb+/Az/MWAENKbKQLoLemvTvarJtSZk7L1H8nfoFp7gIRS5JppMp4Y IvD+X29h3oN4dqtMpKpnxxkMuzHwcCB/bcmHgdBg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730301AbgEVOp5 (ORCPT ); Fri, 22 May 2020 10:45:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730061AbgEVOp4 (ORCPT ); Fri, 22 May 2020 10:45:56 -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 5D853204EF; Fri, 22 May 2020 14:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158755; bh=fmZWyu8S8zz/WmoFW+uWpo4sd9DDFs+iV3itMZTeMR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oMliYZS+G4ZRp+xBCR+xbnXAAMh7UGnCuzkwQYS8ohlmf0AGqMfMh9j9ot4+ycbiY BpMyLY2icnsETEivqZGwzx8hDkx4nycPgULF3ulzlTbwmq7TlKa+/mc+4p6bGNAJ34 ElE/GMzYjlMwFIJE448OlJo78KRdeVt+IEEreRpE= Received: by pali.im (Postfix) id 93A9A51E; Fri, 22 May 2020 16:45:53 +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 05/11] mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file Date: Fri, 22 May 2020 16:44:06 +0200 Message-Id: <20200522144412.19712-6-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 macros. Signed-off-by: Pali Rohár --- drivers/bluetooth/btmtksdio.c | 4 ++-- include/linux/mmc/sdio_ids.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c index 519788c442ca..bff095be2f97 100644 --- a/drivers/bluetooth/btmtksdio.c +++ b/drivers/bluetooth/btmtksdio.c @@ -51,9 +51,9 @@ static const struct btmtksdio_data mt7668_data = { }; static const struct sdio_device_id btmtksdio_table[] = { - {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7663), + {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7663), .driver_data = (kernel_ulong_t)&mt7663_data }, - {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7668), + {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7668), .driver_data = (kernel_ulong_t)&mt7668_data }, { } /* Terminating entry */ }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 1237e1048d06..c9aca57d4dea 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -80,6 +80,8 @@ #define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a #define SDIO_VENDOR_ID_MEDIATEK 0x037a +#define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663 +#define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668 #define SDIO_VENDOR_ID_SIANO 0x039a #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 -- 2.20.1