From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 07/11] mmc: sdio: Move SDIO IDs from ath6kl driver to common include file Date: Fri, 22 May 2020 16:44:08 +0200 Message-Id: <20200522144412.19712-8-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 QWxzbyByZXBsYWNlIGdlbmVyaWMgTUFOVUZBQ1RVUkVSIG1hY3JvcyBieSBwcm9wZXIgU0RJTyBJ RHMgbWFjcm9zLgoKQ2hlY2sgZm9yICJBUjYwMDMgb3IgbGF0ZXIiIGlzIHNsaWdodGx5IG1vZGlm aWVkIHRvIHVzZSBTRElPIGRldmljZSBJRHMuClRoaXMgYWxsb3dzIHJlbW92YWwgb2YgYWxsIGN1 c3RvbSBNQU5VRkFDVFVSRVIgbWFjcm9zIGZyb20gYXRoNmtsLgoKU2lnbmVkLW9mZi1ieTogUGFs aSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgv YXRoNmtsL2hpZi5oICB8ICA2IC0tLS0tLQogZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDZr bC9zZGlvLmMgfCAxNyArKysrKysrKy0tLS0tLS0tLQogaW5jbHVkZS9saW51eC9tbWMvc2Rpb19p ZHMuaCAgICAgICAgICAgfCAxMCArKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVs ZXNzL2F0aC9hdGg2a2wvaGlmLmggYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNmtsL2hp Zi5oCmluZGV4IGRjNmJkOGNkOWI4My4uYzZkYWZjMzg5MzZhIDEwMDY0NAotLS0gYS9kcml2ZXJz L25ldC93aXJlbGVzcy9hdGgvYXRoNmtsL2hpZi5oCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz L2F0aC9hdGg2a2wvaGlmLmgKQEAgLTM1LDEyICszNSw2IEBACiAjZGVmaW5lIE1BWF9TQ0FUVEVS X0VOVFJJRVNfUEVSX1JFUSAgICAgIDE2CiAjZGVmaW5lIE1BWF9TQ0FUVEVSX1JFUV9UUkFOU0ZF Ul9TSVpFICAgICgzMiAqIDEwMjQpCiAKLSNkZWZpbmUgTUFOVUZBQ1RVUkVSX0lEX0FSNjAwM19C QVNFICAgICAgICAweDMwMAotI2RlZmluZSBNQU5VRkFDVFVSRVJfSURfQVI2MDA0X0JBU0UgICAg ICAgIDB4NDAwCi0gICAgLyogU0RJTyBtYW51ZmFjdHVyZXIgSUQgYW5kIENvZGVzICovCi0jZGVm aW5lIE1BTlVGQUNUVVJFUl9JRF9BVEg2S0xfQkFTRV9NQVNLICAgICAweEZGMDAKLSNkZWZpbmUg TUFOVUZBQ1RVUkVSX0NPREUgICAgICAgICAgICAgICAgICAweDI3MQkvKiBBdGhlcm9zICovCi0K IC8qIE1haWxib3ggYWRkcmVzcyBpbiBTRElPIGFkZHJlc3Mgc3BhY2UgKi8KICNkZWZpbmUgSElG X01CT1hfQkFTRV9BRERSICAgICAgICAgICAgICAgICAweDgwMAogI2RlZmluZSBISUZfTUJPWF9X SURUSCAgICAgICAgICAgICAgICAgICAgIDB4ODAwCmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93 aXJlbGVzcy9hdGgvYXRoNmtsL3NkaW8uYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg2 a2wvc2Rpby5jCmluZGV4IGJiNTA2ODA1ODBmMy4uNmI1MWEyZGNlYWRjIDEwMDY0NAotLS0gYS9k cml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNmtsL3NkaW8uYworKysgYi9kcml2ZXJzL25ldC93 aXJlbGVzcy9hdGgvYXRoNmtsL3NkaW8uYwpAQCAtNzk5LDggKzc5OSw3IEBAIHN0YXRpYyBpbnQg YXRoNmtsX3NkaW9fY29uZmlnKHN0cnVjdCBhdGg2a2wgKmFyKQogCiAJc2Rpb19jbGFpbV9ob3N0 KGZ1bmMpOwogCi0JaWYgKChhcl9zZGlvLT5pZC0+ZGV2aWNlICYgTUFOVUZBQ1RVUkVSX0lEX0FU SDZLTF9CQVNFX01BU0spID49Ci0JICAgIE1BTlVGQUNUVVJFUl9JRF9BUjYwMDNfQkFTRSkgewor CWlmIChhcl9zZGlvLT5pZC0+ZGV2aWNlID49IFNESU9fREVWSUNFX0lEX0FUSEVST1NfQVI2MDAz XzAwKSB7CiAJCS8qIGVuYWJsZSA0LWJpdCBBU1lOQyBpbnRlcnJ1cHQgb24gQVI2MDAzIG9yIGxh dGVyICovCiAJCXJldCA9IGF0aDZrbF9zZGlvX2Z1bmMwX2NtZDUyX3dyX2J5dGUoZnVuYy0+Y2Fy ZCwKIAkJCQkJCUNDQ1JfU0RJT19JUlFfTU9ERV9SRUcsCkBAIC0xNDA5LDEzICsxNDA4LDEzIEBA IHN0YXRpYyB2b2lkIGF0aDZrbF9zZGlvX3JlbW92ZShzdHJ1Y3Qgc2Rpb19mdW5jICpmdW5jKQog fQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IHNkaW9fZGV2aWNlX2lkIGF0aDZrbF9zZGlvX2Rldmlj ZXNbXSA9IHsKLQl7U0RJT19ERVZJQ0UoTUFOVUZBQ1RVUkVSX0NPREUsIChNQU5VRkFDVFVSRVJf SURfQVI2MDAzX0JBU0UgfCAweDApKX0sCi0Je1NESU9fREVWSUNFKE1BTlVGQUNUVVJFUl9DT0RF LCAoTUFOVUZBQ1RVUkVSX0lEX0FSNjAwM19CQVNFIHwgMHgxKSl9LAotCXtTRElPX0RFVklDRShN QU5VRkFDVFVSRVJfQ09ERSwgKE1BTlVGQUNUVVJFUl9JRF9BUjYwMDRfQkFTRSB8IDB4MCkpfSwK LQl7U0RJT19ERVZJQ0UoTUFOVUZBQ1RVUkVSX0NPREUsIChNQU5VRkFDVFVSRVJfSURfQVI2MDA0 X0JBU0UgfCAweDEpKX0sCi0Je1NESU9fREVWSUNFKE1BTlVGQUNUVVJFUl9DT0RFLCAoTUFOVUZB Q1RVUkVSX0lEX0FSNjAwNF9CQVNFIHwgMHgyKSl9LAotCXtTRElPX0RFVklDRShNQU5VRkFDVFVS RVJfQ09ERSwgKE1BTlVGQUNUVVJFUl9JRF9BUjYwMDRfQkFTRSB8IDB4MTgpKX0sCi0Je1NESU9f REVWSUNFKE1BTlVGQUNUVVJFUl9DT0RFLCAoTUFOVUZBQ1RVUkVSX0lEX0FSNjAwNF9CQVNFIHwg MHgxOSkpfSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfQVRIRVJPUywgU0RJT19ERVZJ Q0VfSURfQVRIRVJPU19BUjYwMDNfMDApfSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURf QVRIRVJPUywgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDNfMDEpfSwKKwl7U0RJT19ERVZJ Q0UoU0RJT19WRU5ET1JfSURfQVRIRVJPUywgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDRf MDApfSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfQVRIRVJPUywgU0RJT19ERVZJQ0Vf SURfQVRIRVJPU19BUjYwMDRfMDEpfSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfQVRI RVJPUywgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDRfMDIpfSwKKwl7U0RJT19ERVZJQ0Uo U0RJT19WRU5ET1JfSURfQVRIRVJPUywgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDRfMTgp fSwKKwl7U0RJT19ERVZJQ0UoU0RJT19WRU5ET1JfSURfQVRIRVJPUywgU0RJT19ERVZJQ0VfSURf QVRIRVJPU19BUjYwMDRfMTkpfSwKIAl7fSwKIH07CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGlu dXgvbW1jL3NkaW9faWRzLmggYi9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oCmluZGV4IDll YzY3NWE3YWMzNy4uOTViNjdhYjdkMDZhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L21tYy9z ZGlvX2lkcy5oCisrKyBiL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKQEAgLTI0LDYgKzI0 LDE2IEBACiAvKgogICogVmVuZG9ycyBhbmQgZGV2aWNlcy4gIFNvcnQga2V5OiB2ZW5kb3IgZmly c3QsIGRldmljZSBuZXh0LgogICovCisKKyNkZWZpbmUgU0RJT19WRU5ET1JfSURfQVRIRVJPUwkJ CTB4MDI3MQorI2RlZmluZSBTRElPX0RFVklDRV9JRF9BVEhFUk9TX0FSNjAwM18wMAkweDAzMDAK KyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDNfMDEJMHgwMzAxCisjZGVmaW5l IFNESU9fREVWSUNFX0lEX0FUSEVST1NfQVI2MDA0XzAwCTB4MDQwMAorI2RlZmluZSBTRElPX0RF VklDRV9JRF9BVEhFUk9TX0FSNjAwNF8wMQkweDA0MDEKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURf QVRIRVJPU19BUjYwMDRfMDIJMHgwNDAyCisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0FUSEVST1Nf QVI2MDA0XzE4CTB4MDQxOAorI2RlZmluZSBTRElPX0RFVklDRV9JRF9BVEhFUk9TX0FSNjAwNF8x OQkweDA0MTkKKwogI2RlZmluZSBTRElPX1ZFTkRPUl9JRF9CUk9BRENPTQkJCTB4MDJkMAogI2Rl ZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzE0MwkJMHhhODg3CiAjZGVmaW5lIFNESU9f REVWSUNFX0lEX0JST0FEQ09NXzQzMjQxCQkweDQzMjQKLS0gCjIuMjAuMQoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QK YXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9hdGgxMGsK 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 DB42AC433DF for ; Fri, 22 May 2020 14:46:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7F54204EF for ; Fri, 22 May 2020 14:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158787; bh=8NLVpRbZ9BVGCWTSzZ0LcYnOFxjviPD4hKwEfLQKjkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LJuUQ4uTHlP13WjkeJ024UChuhBrYdAjAYnyClJ6PsNZ2kcP2CFyY2L0qEPgihi7N aK7AoNEqy8noGYuhVXJ4F6baBzKnt0v6WOuwXqRIV5P+MZBRkUtElYKOlGvENNT6aV ZTj9Dj6OPZZB6l+RfJzOLUhS/lVRt+RmB2ququcQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730362AbgEVOqC (ORCPT ); Fri, 22 May 2020 10:46:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:48500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730357AbgEVOqB (ORCPT ); Fri, 22 May 2020 10:46:01 -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 60DF52053B; 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=8NLVpRbZ9BVGCWTSzZ0LcYnOFxjviPD4hKwEfLQKjkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJlmtjMJMGRFGvCBTfXLTroUx4zFYQR1M8BRpOEOKuS/9mTVqF+U2NaRvKIIHitu6 Qp7FLN7G6reB0jwhmKQNqDJrwTvoN2/ethiYKSKd/XfyyyY6MBImIgktC9mmooYrqa NKBQ1W+FcGCCVTQWWH3mSt79AXrAoUquVdBRYR/I= Received: by pali.im (Postfix) id 97FDF51E; Fri, 22 May 2020 16:45:58 +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 07/11] mmc: sdio: Move SDIO IDs from ath6kl driver to common include file Date: Fri, 22 May 2020 16:44:08 +0200 Message-Id: <20200522144412.19712-8-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 Also replace generic MANUFACTURER macros by proper SDIO IDs macros. Check for "AR6003 or later" is slightly modified to use SDIO device IDs. This allows removal of all custom MANUFACTURER macros from ath6kl. Signed-off-by: Pali Rohár --- drivers/net/wireless/ath/ath6kl/hif.h | 6 ------ drivers/net/wireless/ath/ath6kl/sdio.c | 17 ++++++++--------- include/linux/mmc/sdio_ids.h | 10 ++++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h index dc6bd8cd9b83..c6dafc38936a 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.h +++ b/drivers/net/wireless/ath/ath6kl/hif.h @@ -35,12 +35,6 @@ #define MAX_SCATTER_ENTRIES_PER_REQ 16 #define MAX_SCATTER_REQ_TRANSFER_SIZE (32 * 1024) -#define MANUFACTURER_ID_AR6003_BASE 0x300 -#define MANUFACTURER_ID_AR6004_BASE 0x400 - /* SDIO manufacturer ID and Codes */ -#define MANUFACTURER_ID_ATH6KL_BASE_MASK 0xFF00 -#define MANUFACTURER_CODE 0x271 /* Atheros */ - /* Mailbox address in SDIO address space */ #define HIF_MBOX_BASE_ADDR 0x800 #define HIF_MBOX_WIDTH 0x800 diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index bb50680580f3..6b51a2dceadc 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -799,8 +799,7 @@ static int ath6kl_sdio_config(struct ath6kl *ar) sdio_claim_host(func); - if ((ar_sdio->id->device & MANUFACTURER_ID_ATH6KL_BASE_MASK) >= - MANUFACTURER_ID_AR6003_BASE) { + if (ar_sdio->id->device >= SDIO_DEVICE_ID_ATHEROS_AR6003_00) { /* enable 4-bit ASYNC interrupt on AR6003 or later */ ret = ath6kl_sdio_func0_cmd52_wr_byte(func->card, CCCR_SDIO_IRQ_MODE_REG, @@ -1409,13 +1408,13 @@ static void ath6kl_sdio_remove(struct sdio_func *func) } static const struct sdio_device_id ath6kl_sdio_devices[] = { - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6003_BASE | 0x0))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6003_BASE | 0x1))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x0))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x1))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x2))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x18))}, - {SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x19))}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6003_00)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6003_01)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6004_00)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6004_01)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6004_02)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6004_18)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6004_19)}, {}, }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 9ec675a7ac37..95b67ab7d06a 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -24,6 +24,16 @@ /* * Vendors and devices. Sort key: vendor first, device next. */ + +#define SDIO_VENDOR_ID_ATHEROS 0x0271 +#define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300 +#define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301 +#define SDIO_DEVICE_ID_ATHEROS_AR6004_00 0x0400 +#define SDIO_DEVICE_ID_ATHEROS_AR6004_01 0x0401 +#define SDIO_DEVICE_ID_ATHEROS_AR6004_02 0x0402 +#define SDIO_DEVICE_ID_ATHEROS_AR6004_18 0x0418 +#define SDIO_DEVICE_ID_ATHEROS_AR6004_19 0x0419 + #define SDIO_VENDOR_ID_BROADCOM 0x02d0 #define SDIO_DEVICE_ID_BROADCOM_43143 0xa887 #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 -- 2.20.1