From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 10/11] mmc: sdio: Fix Cypress SDIO IDs macros in common include file Date: Fri, 22 May 2020 16:44:11 +0200 Message-Id: <20200522144412.19712-11-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 QWxsIG1hY3JvIG5hbWVzIGZvciBTRElPIGRldmljZSBJRHMgYXJlIHByZWZpeGVkIGJ5IHZlbmRv ciBuYW1lIHRvIHdoaWNoCmRldmljZSBJRCBiZWxvbmdzLiBTbyBmb3IgY29uc2lzdGVuY3kgYWRk IEJyb2FkY29tIHN0cmluZyB2ZW5kb3IgcHJlZml4IHRvCmFsbCBDeXByZXNzIG1hY3JvIG5hbWVz IGFzIHRoZXkgYmVsb25nIHRvIFNESU8gQnJvYWRjb20gdmVuZG9yIElELgoKQ2hhbmdlIGFsc28g Q3lwcmVzcyA0MzAxMiB2YWx1ZSBmcm9tIGRlY2ltYWwgZG8gaGV4YWRlY2ltYWwgbm90YXRpb24g dG8gYmUKY29uc2lzdGVudCB3aXRoIGFsbCBvdGhlciB2YWx1ZXMuCgpTaWduZWQtb2ZmLWJ5OiBQ YWxpIFJvaMOhciA8cGFsaUBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2Jy b2FkY29tL2JyY204MDIxMS9icmNtZm1hYy9iY21zZGguYyB8IDYgKysrLS0tCiBkcml2ZXJzL25l dC93aXJlbGVzcy9icm9hZGNvbS9icmNtODAyMTEvYnJjbWZtYWMvc2Rpby5jICAgfCA0ICsrLS0K IGluY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmggICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8IDYgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9icm9hZGNvbS9icmNtODAy MTEvYnJjbWZtYWMvYmNtc2RoLmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9icm9hZGNvbS9icmNt ODAyMTEvYnJjbWZtYWMvYmNtc2RoLmMKaW5kZXggYjY4NGE1YjZkOTA0Li5hMWZkYjYxOGNmMTQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2Jyb2FkY29tL2JyY204MDIxMS9icmNt Zm1hYy9iY21zZGguYworKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9icm9hZGNvbS9icmNtODAy MTEvYnJjbWZtYWMvYmNtc2RoLmMKQEAgLTk3MCw5ICs5NzAsOSBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IHNkaW9fZGV2aWNlX2lkIGJyY21mX3NkbW1jX2lkc1tdID0gewogCUJSQ01GX1NESU9fREVW SUNFKFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzNTQpLAogCUJSQ01GX1NESU9fREVWSUNFKFNE SU9fREVWSUNFX0lEX0JST0FEQ09NXzQzNTYpLAogCUJSQ01GX1NESU9fREVWSUNFKFNESU9fREVW SUNFX0lEX0JST0FEQ09NXzQzNTkpLAotCUJSQ01GX1NESU9fREVWSUNFKFNESU9fREVWSUNFX0lE X0NZUFJFU1NfNDM3MyksCi0JQlJDTUZfU0RJT19ERVZJQ0UoU0RJT19ERVZJQ0VfSURfQ1lQUkVT U180MzAxMiksCi0JQlJDTUZfU0RJT19ERVZJQ0UoU0RJT19ERVZJQ0VfSURfQ1lQUkVTU184OTM1 OSksCisJQlJDTUZfU0RJT19ERVZJQ0UoU0RJT19ERVZJQ0VfSURfQlJPQURDT01fQ1lQUkVTU180 MzczKSwKKwlCUkNNRl9TRElPX0RFVklDRShTRElPX0RFVklDRV9JRF9CUk9BRENPTV9DWVBSRVNT XzQzMDEyKSwKKwlCUkNNRl9TRElPX0RFVklDRShTRElPX0RFVklDRV9JRF9CUk9BRENPTV9DWVBS RVNTXzg5MzU5KSwKIAl7IC8qIGVuZDogYWxsIHplcm9lcyAqLyB9CiB9OwogTU9EVUxFX0RFVklD RV9UQUJMRShzZGlvLCBicmNtZl9zZG1tY19pZHMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQv d2lyZWxlc3MvYnJvYWRjb20vYnJjbTgwMjExL2JyY21mbWFjL3NkaW8uYyBiL2RyaXZlcnMvbmV0 L3dpcmVsZXNzL2Jyb2FkY29tL2JyY204MDIxMS9icmNtZm1hYy9zZGlvLmMKaW5kZXggM2EwODI1 MmYxYTUzLi4xYzk1NjE2NjVhNjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2Jy b2FkY29tL2JyY204MDIxMS9icmNtZm1hYy9zZGlvLmMKKysrIGIvZHJpdmVycy9uZXQvd2lyZWxl c3MvYnJvYWRjb20vYnJjbTgwMjExL2JyY21mbWFjL3NkaW8uYwpAQCAtNDE4Nyw3ICs0MTg3LDcg QEAgc3RhdGljIHZvaWQgYnJjbWZfc2Rpb19maXJtd2FyZV9jYWxsYmFjayhzdHJ1Y3QgZGV2aWNl ICpkZXYsIGludCBlcnIsCiAJCQkJICAgYnVzLT5ob3N0aW50bWFzaywgTlVMTCk7CiAKIAkJc3dp dGNoIChzZGlvZC0+ZnVuYzEtPmRldmljZSkgewotCQljYXNlIFNESU9fREVWSUNFX0lEX0NZUFJF U1NfNDM3MzoKKwkJY2FzZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV9DWVBSRVNTXzQzNzM6CiAJ CQlicmNtZl9kYmcoSU5GTywgInNldCBGMiB3YXRlcm1hcmsgdG8gMHgleCo0IGJ5dGVzXG4iLAog CQkJCSAgQ1lfNDM3M19GMl9XQVRFUk1BUkspOwogCQkJYnJjbWZfc2Rpb2Rfd3JpdGViKHNkaW9k LCBTQlNESU9fV0FURVJNQVJLLApAQCAtNDIwMSw3ICs0MjAxLDcgQEAgc3RhdGljIHZvaWQgYnJj bWZfc2Rpb19maXJtd2FyZV9jYWxsYmFjayhzdHJ1Y3QgZGV2aWNlICpkZXYsIGludCBlcnIsCiAJ CQkJCSAgIENZXzQzNzNfRjJfV0FURVJNQVJLIHwKIAkJCQkJICAgU0JTRElPX01FU0JVU1lDVFJM X0VOQUIsICZlcnIpOwogCQkJYnJlYWs7Ci0JCWNhc2UgU0RJT19ERVZJQ0VfSURfQ1lQUkVTU180 MzAxMjoKKwkJY2FzZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV9DWVBSRVNTXzQzMDEyOgogCQkJ YnJjbWZfZGJnKElORk8sICJzZXQgRjIgd2F0ZXJtYXJrIHRvIDB4JXgqNCBieXRlc1xuIiwKIAkJ CQkgIENZXzQzMDEyX0YyX1dBVEVSTUFSSyk7CiAJCQlicmNtZl9zZGlvZF93cml0ZWIoc2Rpb2Qs IFNCU0RJT19XQVRFUk1BUkssCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lk cy5oIGIvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaAppbmRleCA4ZTdhMDY4M2I5MjcuLmIx OTIwMGFlYTU2YSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaAorKysg Yi9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oCkBAIC01OCw5ICs1OCw5IEBACiAjZGVmaW5l IFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzNTQJCTB4NDM1NAogI2RlZmluZSBTRElPX0RFVklD RV9JRF9CUk9BRENPTV80MzU2CQkweDQzNTYKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURD T01fNDM1OQkJMHg0MzU5Ci0jZGVmaW5lIFNESU9fREVWSUNFX0lEX0NZUFJFU1NfNDM3MwkJMHg0 MzczCi0jZGVmaW5lIFNESU9fREVWSUNFX0lEX0NZUFJFU1NfNDMwMTIJCTQzMDEyCi0jZGVmaW5l IFNESU9fREVWSUNFX0lEX0NZUFJFU1NfODkzNTkJCTB4NDM1NQorI2RlZmluZSBTRElPX0RFVklD RV9JRF9CUk9BRENPTV9DWVBSRVNTXzQzNzMJMHg0MzczCisjZGVmaW5lIFNESU9fREVWSUNFX0lE X0JST0FEQ09NX0NZUFJFU1NfNDMwMTIJMHhhODA0CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JS T0FEQ09NX0NZUFJFU1NfODkzNTkJMHg0MzU1CiAKICNkZWZpbmUgU0RJT19WRU5ET1JfSURfSU5U RUwJCQkweDAwODkKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfSU5URUxfSVdNQzMyMDBXSU1BWAkw eDE0MDIKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcK aHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK 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 C838DC433E1 for ; Fri, 22 May 2020 14:46:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FDA22054F for ; Fri, 22 May 2020 14:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158777; bh=TJohxP7W9jg/tdaIFO6IgAHGCrICOTbIc/uilKm/8Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IdHulUzysJMosIN2kPKwCTIa7fDkGFzg1peoaJ1Sdbrxxxq0CvFdfADpt/Z3/I/DV FUR3ApMFrK7rkruJop+JIvqk1jvkjl858pgTg9zw0WYBI7Tit8jTvQ1kvkVVFSQu89 SDrtaYIU6U69wMPEt/oltmK8HnqeYzkljCyZibtE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730449AbgEVOqL (ORCPT ); Fri, 22 May 2020 10:46:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:48700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730427AbgEVOqI (ORCPT ); Fri, 22 May 2020 10:46:08 -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 600162054F; Fri, 22 May 2020 14:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158767; bh=TJohxP7W9jg/tdaIFO6IgAHGCrICOTbIc/uilKm/8Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0tmb1v0XU35+tUH6DDmz3g8ydeL47t0zXZM93MTVX34VGrqnEHSD3SE4WgZUUui0R kwXHdMPvtB16hmvqI0wplZanV9HIRyrBokqMVm1qcACmcMEB5o6NPmIFpP6ucuef3u gcSDdyYJtjWyI+jvGmpKI5HpNSfQZ4W9GmgxnEkA= Received: by pali.im (Postfix) id 99D2751E; Fri, 22 May 2020 16:46:05 +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 10/11] mmc: sdio: Fix Cypress SDIO IDs macros in common include file Date: Fri, 22 May 2020 16:44:11 +0200 Message-Id: <20200522144412.19712-11-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 All macro names for SDIO device IDs are prefixed by vendor name to which device ID belongs. So for consistency add Broadcom string vendor prefix to all Cypress macro names as they belong to SDIO Broadcom vendor ID. Change also Cypress 43012 value from decimal do hexadecimal notation to be consistent with all other values. Signed-off-by: Pali Rohár --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +++--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-- include/linux/mmc/sdio_ids.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index b684a5b6d904..a1fdb618cf14 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -970,9 +970,9 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359), - BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373), - BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_43012), - BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_89359), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359), { /* end: all zeroes */ } }; MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 3a08252f1a53..1c9561665a67 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4187,7 +4187,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, bus->hostintmask, NULL); switch (sdiod->func1->device) { - case SDIO_DEVICE_ID_CYPRESS_4373: + case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373: brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n", CY_4373_F2_WATERMARK); brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, @@ -4201,7 +4201,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB, &err); break; - case SDIO_DEVICE_ID_CYPRESS_43012: + case SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012: brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n", CY_43012_F2_WATERMARK); brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 8e7a0683b927..b19200aea56a 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -58,9 +58,9 @@ #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 #define SDIO_DEVICE_ID_BROADCOM_4359 0x4359 -#define SDIO_DEVICE_ID_CYPRESS_4373 0x4373 -#define SDIO_DEVICE_ID_CYPRESS_43012 43012 -#define SDIO_DEVICE_ID_CYPRESS_89359 0x4355 +#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373 0x4373 +#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012 0xa804 +#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359 0x4355 #define SDIO_VENDOR_ID_INTEL 0x0089 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 -- 2.20.1