From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 06/11] mmc: sdio: Move SDIO IDs from smssdio driver to common include file Date: Fri, 22 May 2020 16:44:07 +0200 Message-Id: <20200522144412.19712-7-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 IFNpYW5vIG1hY3Jvcy4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5v cmc+Ci0tLQogZHJpdmVycy9tZWRpYS9tbWMvc2lhbm8vc21zc2Rpby5jIHwgMTAgKysrKystLS0t LQogaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaCAgICAgIHwgIDUgKysrKysKIDIgZmlsZXMg Y2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL21lZGlhL21tYy9zaWFuby9zbXNzZGlvLmMgYi9kcml2ZXJzL21lZGlhL21tYy9zaWFu by9zbXNzZGlvLmMKaW5kZXggZGVmNWU5Mzg0OWQyLi4wNjViNTcyZTAyNzIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvbWVkaWEvbW1jL3NpYW5vL3Ntc3NkaW8uYworKysgYi9kcml2ZXJzL21lZGlhL21t Yy9zaWFuby9zbXNzZGlvLmMKQEAgLTU4LDE1ICs1OCwxNSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IHNkaW9fZGV2aWNlX2lkIHNtc3NkaW9faWRzW10gPSB7CiAJIC5kcml2ZXJfZGF0YSA9IFNNUzFY WFhfQk9BUkRfU0lBTk9fVkVHQX0sCiAJe1NESU9fREVWSUNFKFNESU9fVkVORE9SX0lEX1NJQU5P LCBTRElPX0RFVklDRV9JRF9TSUFOT19WRU5JQ0UpLAogCSAuZHJpdmVyX2RhdGEgPSBTTVMxWFhY X0JPQVJEX1NJQU5PX1ZFR0F9LAotCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9TSUFOTywg MHgzMDIpLAorCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9TSUFOTywgU0RJT19ERVZJQ0Vf SURfU0lBTk9fTUlORyksCiAJLmRyaXZlcl9kYXRhID0gU01TMVhYWF9CT0FSRF9TSUFOT19NSU5H fSwKLQl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfU0lBTk8sIDB4NTAwKSwKKwl7U0RJT19E RVZJQ0UoU0RJT19WRU5ET1JfSURfU0lBTk8sIFNESU9fREVWSUNFX0lEX1NJQU5PX1BFTEUpLAog CS5kcml2ZXJfZGF0YSA9IFNNUzFYWFhfQk9BUkRfU0lBTk9fUEVMRX0sCi0Je1NESU9fREVWSUNF KFNESU9fVkVORE9SX0lEX1NJQU5PLCAweDYwMCksCisJe1NESU9fREVWSUNFKFNESU9fVkVORE9S X0lEX1NJQU5PLCBTRElPX0RFVklDRV9JRF9TSUFOT19SSU8pLAogCS5kcml2ZXJfZGF0YSA9IFNN UzFYWFhfQk9BUkRfU0lBTk9fUklPfSwKLQl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfU0lB Tk8sIDB4NzAwKSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfU0lBTk8sIFNESU9fREVW SUNFX0lEX1NJQU5PX0RFTlZFUl8yMTYwKSwKIAkuZHJpdmVyX2RhdGEgPSBTTVMxWFhYX0JPQVJE X1NJQU5PX0RFTlZFUl8yMTYwfSwKLQl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfU0lBTk8s IDB4ODAwKSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfU0lBTk8sIFNESU9fREVWSUNF X0lEX1NJQU5PX0RFTlZFUl8xNTMwKSwKIAkuZHJpdmVyX2RhdGEgPSBTTVMxWFhYX0JPQVJEX1NJ QU5PX0RFTlZFUl8xNTMwfSwKIAl7IC8qIGVuZDogYWxsIHplcm9lcyAqLyB9LAogfTsKZGlmZiAt LWdpdCBhL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmggYi9pbmNsdWRlL2xpbnV4L21tYy9z ZGlvX2lkcy5oCmluZGV4IGM5YWNhNTdkNGRlYS4uOWVjNjc1YTdhYzM3IDEwMDY0NAotLS0gYS9p bmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oCisrKyBiL2luY2x1ZGUvbGludXgvbW1jL3NkaW9f aWRzLmgKQEAgLTg4LDYgKzg4LDExIEBACiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX1NJQU5PX05J Q0UJCTB4MDIwMgogI2RlZmluZSBTRElPX0RFVklDRV9JRF9TSUFOT19WRUdBX0EwCQkweDAzMDAK ICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfU0lBTk9fVkVOSUNFCQkweDAzMDEKKyNkZWZpbmUgU0RJ T19ERVZJQ0VfSURfU0lBTk9fTUlORwkJMHgwMzAyCisjZGVmaW5lIFNESU9fREVWSUNFX0lEX1NJ QU5PX1BFTEUJCTB4MDUwMAorI2RlZmluZSBTRElPX0RFVklDRV9JRF9TSUFOT19SSU8JCTB4MDYw MAorI2RlZmluZSBTRElPX0RFVklDRV9JRF9TSUFOT19ERU5WRVJfMjE2MAkweDA3MDAKKyNkZWZp bmUgU0RJT19ERVZJQ0VfSURfU0lBTk9fREVOVkVSXzE1MzAJMHgwODAwCiAjZGVmaW5lIFNESU9f REVWSUNFX0lEX1NJQU5PX05PVkFfQTAJCTB4MTEwMAogI2RlZmluZSBTRElPX0RFVklDRV9JRF9T SUFOT19TVEVMTEFSIAkJMHg1MzQ3CiAKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBrQGxp c3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0 aW5mby9hdGgxMGsK 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 89A53C433E2 for ; Fri, 22 May 2020 14:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60F522054F for ; Fri, 22 May 2020 14:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158760; bh=FK2cjUuXlz/7vUmgD5dr+Rxd2hc1F0f/Urz70jIMZa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AsNh4S8WUofAiMFlx63V9sgWRTrc8NCZ0XSIHDgwZpi0sSCbW2VTqmY6gp34KxoAO nA73yhvXINAHiAbDbdTLaUwDKDWIpulYJOZFlASH64GRY+HugQtP4VNnvA1tpkAYJi bMlrBLn0I7T09MsfRmuIXRXERYlSHXJg/LhtO4lk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730325AbgEVOp7 (ORCPT ); Fri, 22 May 2020 10:45:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:48438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730311AbgEVOp6 (ORCPT ); Fri, 22 May 2020 10:45:58 -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 BFD8320727; Fri, 22 May 2020 14:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158757; bh=FK2cjUuXlz/7vUmgD5dr+Rxd2hc1F0f/Urz70jIMZa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4RGsK78MnWMvmiJBT2se89kpkaB0qz25O7LIel5g4KT4tf6cSu6RGEEHAp9j9sjs sK/teQ9m8Di3KhBmn5dUiez6gg8GmzdC6PGfJXWc+BAeE8sq4+l4tHgwd1oVnYsNrC NNgAol6PCO16S/2N/bcbwUCFXI+seymMU3u2HK+Y= Received: by pali.im (Postfix) id 049BC51E; Fri, 22 May 2020 16:45:56 +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 06/11] mmc: sdio: Move SDIO IDs from smssdio driver to common include file Date: Fri, 22 May 2020 16:44:07 +0200 Message-Id: <20200522144412.19712-7-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 Siano macros. Signed-off-by: Pali Rohár --- drivers/media/mmc/siano/smssdio.c | 10 +++++----- include/linux/mmc/sdio_ids.h | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/media/mmc/siano/smssdio.c b/drivers/media/mmc/siano/smssdio.c index def5e93849d2..065b572e0272 100644 --- a/drivers/media/mmc/siano/smssdio.c +++ b/drivers/media/mmc/siano/smssdio.c @@ -58,15 +58,15 @@ static const struct sdio_device_id smssdio_ids[] = { .driver_data = SMS1XXX_BOARD_SIANO_VEGA}, {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_VENICE), .driver_data = SMS1XXX_BOARD_SIANO_VEGA}, - {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x302), + {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_MING), .driver_data = SMS1XXX_BOARD_SIANO_MING}, - {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x500), + {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_PELE), .driver_data = SMS1XXX_BOARD_SIANO_PELE}, - {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x600), + {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_RIO), .driver_data = SMS1XXX_BOARD_SIANO_RIO}, - {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x700), + {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_2160), .driver_data = SMS1XXX_BOARD_SIANO_DENVER_2160}, - {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x800), + {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_1530), .driver_data = SMS1XXX_BOARD_SIANO_DENVER_1530}, { /* end: all zeroes */ }, }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index c9aca57d4dea..9ec675a7ac37 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -88,6 +88,11 @@ #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 #define SDIO_DEVICE_ID_SIANO_VEGA_A0 0x0300 #define SDIO_DEVICE_ID_SIANO_VENICE 0x0301 +#define SDIO_DEVICE_ID_SIANO_MING 0x0302 +#define SDIO_DEVICE_ID_SIANO_PELE 0x0500 +#define SDIO_DEVICE_ID_SIANO_RIO 0x0600 +#define SDIO_DEVICE_ID_SIANO_DENVER_2160 0x0700 +#define SDIO_DEVICE_ID_SIANO_DENVER_1530 0x0800 #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 -- 2.20.1