From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 08/11] mmc: sdio: Move SDIO IDs from ath10k driver to common include file Date: Fri, 22 May 2020 16:44:09 +0200 Message-Id: <20200522144412.19712-9-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 RHMgbWFjcm9zLgoKQ2hlY2tzIGZvciBkZXZpY2UgSURzIGFyZSBzbGlnaHRseSBtb2RpZmllZCB0 byB1c2UgU0RJTyBkZXZpY2UgSURzLgpUaGlzIGFsbG93cyByZW1vdmFsIG9mIGFsbCBjdXN0b20g TUFOVUZBQ1RVUkVSIG1hY3JvcyBmcm9tIGF0aDEway4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9o w6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEw ay9zZGlvLmMgfCAyNSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL25ldC93aXJl bGVzcy9hdGgvYXRoMTBrL3NkaW8uaCB8ICA4IC0tLS0tLS0tCiBpbmNsdWRlL2xpbnV4L21tYy9z ZGlvX2lkcy5oICAgICAgICAgICB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlv bnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNz L2F0aC9hdGgxMGsvc2Rpby5jIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEway9zZGlv LmMKaW5kZXggMWY3MDliNjVjMjliLi41OWU3MjU1MTUwNDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsvc2Rpby5jCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz L2F0aC9hdGgxMGsvc2Rpby5jCkBAIC0xMDgzLDEwICsxMDgzLDEwIEBAIHN0YXRpYyB2b2lkIGF0 aDEwa19zZGlvX3NldF9tYm94X2luZm8oc3RydWN0IGF0aDEwayAqYXIpCiAKIAltYm94X2luZm8t PmV4dF9pbmZvWzBdLmh0Y19leHRfYWRkciA9IEFUSDEwS19ISUZfTUJPWDBfRVhUX0JBU0VfQURE UjsKIAotCWRldl9pZF9iYXNlID0gRklFTERfR0VUKFFDQV9NQU5VRkFDVFVSRVJfSURfQkFTRSwg ZGV2aWNlKTsKLQlkZXZfaWRfY2hpcHJldiA9IEZJRUxEX0dFVChRQ0FfTUFOVUZBQ1RVUkVSX0lE X1JFVl9NQVNLLCBkZXZpY2UpOworCWRldl9pZF9iYXNlID0gKGRldmljZSAmIDB4MEYwMCk7CisJ ZGV2X2lkX2NoaXByZXYgPSAoZGV2aWNlICYgMHgwMEZGKTsKIAlzd2l0Y2ggKGRldl9pZF9iYXNl KSB7Ci0JY2FzZSBRQ0FfTUFOVUZBQ1RVUkVSX0lEX0FSNjAwNV9CQVNFOgorCWNhc2UgKFNESU9f REVWSUNFX0lEX0FUSEVST1NfQVI2MDA1ICYgMHgwRjAwKToKIAkJaWYgKGRldl9pZF9jaGlwcmV2 IDwgNCkKIAkJCW1ib3hfaW5mby0+ZXh0X2luZm9bMF0uaHRjX2V4dF9zeiA9CiAJCQkJQVRIMTBL X0hJRl9NQk9YMF9FWFRfV0lEVEg7CkBAIC0xMDk3LDcgKzEwOTcsNyBAQCBzdGF0aWMgdm9pZCBh dGgxMGtfc2Rpb19zZXRfbWJveF9pbmZvKHN0cnVjdCBhdGgxMGsgKmFyKQogCQkJbWJveF9pbmZv LT5leHRfaW5mb1swXS5odGNfZXh0X3N6ID0KIAkJCQlBVEgxMEtfSElGX01CT1gwX0VYVF9XSURU SF9ST01FXzJfMDsKIAkJYnJlYWs7Ci0JY2FzZSBRQ0FfTUFOVUZBQ1RVUkVSX0lEX1FDQTkzNzdf QkFTRToKKwljYXNlIChTRElPX0RFVklDRV9JRF9BVEhFUk9TX1FDQTkzNzcgJiAweDBGMDApOgog CQltYm94X2luZm8tPmV4dF9pbmZvWzBdLmh0Y19leHRfc3ogPQogCQkJQVRIMTBLX0hJRl9NQk9Y MF9FWFRfV0lEVEhfUk9NRV8yXzA7CiAJCWJyZWFrOwpAQCAtMjE4NSwxOSArMjE4NSwxNiBAQCBz dGF0aWMgaW50IGF0aDEwa19zZGlvX3Byb2JlKHN0cnVjdCBzZGlvX2Z1bmMgKmZ1bmMsCiAJc2ti X3F1ZXVlX2hlYWRfaW5pdCgmYXJfc2Rpby0+cnhfaGVhZCk7CiAJSU5JVF9XT1JLKCZhcl9zZGlv LT5hc3luY193b3JrX3J4LCBhdGgxMGtfcnhfaW5kaWNhdGlvbl9hc3luY193b3JrKTsKIAotCWRl dl9pZF9iYXNlID0gRklFTERfR0VUKFFDQV9NQU5VRkFDVFVSRVJfSURfQkFTRSwgaWQtPmRldmlj ZSk7Ci0Jc3dpdGNoIChkZXZfaWRfYmFzZSkgewotCWNhc2UgUUNBX01BTlVGQUNUVVJFUl9JRF9B UjYwMDVfQkFTRToKLQljYXNlIFFDQV9NQU5VRkFDVFVSRVJfSURfUUNBOTM3N19CQVNFOgotCQlh ci0+ZGV2X2lkID0gUUNBOTM3N18xXzBfREVWSUNFX0lEOwotCQlicmVhazsKLQlkZWZhdWx0Ogor CWRldl9pZF9iYXNlID0gKGlkLT5kZXZpY2UgJiAweDBGMDApOworCWlmIChkZXZfaWRfYmFzZSAh PSAoU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDUgJiAweDBGMDApICYmCisJICAgIGRldl9p ZF9iYXNlICE9IChTRElPX0RFVklDRV9JRF9BVEhFUk9TX1FDQTkzNzcgJiAweDBGMDApKSB7CiAJ CXJldCA9IC1FTk9ERVY7CiAJCWF0aDEwa19lcnIoYXIsICJ1bnN1cHBvcnRlZCBkZXZpY2UgaWQg JXUgKDB4JXgpXG4iLAogCQkJICAgZGV2X2lkX2Jhc2UsIGlkLT5kZXZpY2UpOwogCQlnb3RvIGVy cl9mcmVlX3dxOwogCX0KIAorCWFyLT5kZXZfaWQgPSBRQ0E5Mzc3XzFfMF9ERVZJQ0VfSUQ7CiAJ YXItPmlkLnZlbmRvciA9IGlkLT52ZW5kb3I7CiAJYXItPmlkLmRldmljZSA9IGlkLT5kZXZpY2U7 CiAKQEAgLTIyNDYsMTAgKzIyNDMsOCBAQCBzdGF0aWMgdm9pZCBhdGgxMGtfc2Rpb19yZW1vdmUo c3RydWN0IHNkaW9fZnVuYyAqZnVuYykKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBzZGlvX2Rl dmljZV9pZCBhdGgxMGtfc2Rpb19kZXZpY2VzW10gPSB7Ci0Je1NESU9fREVWSUNFKFFDQV9NQU5V RkFDVFVSRVJfQ09ERSwKLQkJICAgICAoUUNBX1NESU9fSURfQVI2MDA1X0JBU0UgfCAweEEpKX0s Ci0Je1NESU9fREVWSUNFKFFDQV9NQU5VRkFDVFVSRVJfQ09ERSwKLQkJICAgICAoUUNBX1NESU9f SURfUUNBOTM3N19CQVNFIHwgMHgxKSl9LAorCXtTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9B VEhFUk9TLCBTRElPX0RFVklDRV9JRF9BVEhFUk9TX0FSNjAwNSl9LAorCXtTRElPX0RFVklDRShT RElPX1ZFTkRPUl9JRF9BVEhFUk9TLCBTRElPX0RFVklDRV9JRF9BVEhFUk9TX1FDQTkzNzcpfSwK IAl7fSwKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsv c2Rpby5oIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEway9zZGlvLmgKaW5kZXggMzMx OTVmNDlhY2FiLi5lODk1MWY5Y2RiNWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNz L2F0aC9hdGgxMGsvc2Rpby5oCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsv c2Rpby5oCkBAIC0xMCwxNCArMTAsNiBAQAogCiAjZGVmaW5lIEFUSDEwS19ISUZfTUJPWF9CTE9D S19TSVpFICAgICAgICAgICAgICAyNTYKIAotI2RlZmluZSBRQ0FfTUFOVUZBQ1RVUkVSX0lEX0JB U0UgICAgICAgICAgICAgICAgR0VOTUFTSygxMSwgOCkKLSNkZWZpbmUgUUNBX01BTlVGQUNUVVJF Ul9JRF9BUjYwMDVfQkFTRSAgICAgICAgIDB4NQotI2RlZmluZSBRQ0FfTUFOVUZBQ1RVUkVSX0lE X1FDQTkzNzdfQkFTRSAgICAgICAgMHg3Ci0jZGVmaW5lIFFDQV9TRElPX0lEX0FSNjAwNV9CQVNF ICAgICAgICAgICAgICAgICAweDUwMAotI2RlZmluZSBRQ0FfU0RJT19JRF9RQ0E5Mzc3X0JBU0Ug ICAgICAgICAgICAgICAgMHg3MDAKLSNkZWZpbmUgUUNBX01BTlVGQUNUVVJFUl9JRF9SRVZfTUFT SyAgICAgICAgICAgIDB4MDBGRgotI2RlZmluZSBRQ0FfTUFOVUZBQ1RVUkVSX0NPREUgICAgICAg ICAgICAgICAgICAgMHgyNzEgLyogUXVhbGNvbW0vQXRoZXJvcyAqLwotCiAjZGVmaW5lIEFUSDEw S19TRElPX01BWF9CVUZGRVJfU0laRSAgICAgICAgICAgICA0MDk2IC8qVW5zdXJlIG9mIHRoaXMg Y29uc3RhbnQqLwogCiAvKiBNYWlsYm94IGFkZHJlc3MgaW4gU0RJTyBhZGRyZXNzIHNwYWNlICov CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5oIGIvaW5jbHVkZS9saW51 eC9tbWMvc2Rpb19pZHMuaAppbmRleCA5NWI2N2FiN2QwNmEuLjI4OTRmNzczOWFjYyAxMDA2NDQK LS0tIGEvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaAorKysgYi9pbmNsdWRlL2xpbnV4L21t Yy9zZGlvX2lkcy5oCkBAIC0zMyw2ICszMyw4IEBACiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0FU SEVST1NfQVI2MDA0XzAyCTB4MDQwMgogI2RlZmluZSBTRElPX0RFVklDRV9JRF9BVEhFUk9TX0FS NjAwNF8xOAkweDA0MTgKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19BUjYwMDRfMTkJ MHgwNDE5CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0FUSEVST1NfQVI2MDA1CQkweDA1MEEKKyNk ZWZpbmUgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19RQ0E5Mzc3CQkweDA3MDEKIAogI2RlZmluZSBT RElPX1ZFTkRPUl9JRF9CUk9BRENPTQkJCTB4MDJkMAogI2RlZmluZSBTRElPX0RFVklDRV9JRF9C Uk9BRENPTV80MzE0MwkJMHhhODg3Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0CmF0aDEwa0BsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8vYXRoMTBrCg== 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 9C9E1C433E0 for ; Fri, 22 May 2020 14:46:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CFD22054F for ; Fri, 22 May 2020 14:46:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158784; bh=ye3nclsR7uSWC4P9+t5adbuuNtCeDZmeeSpzKSyy8xk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZUUj3BxfQdGO2NjCyEt5DDrKmI0Byen3MtEjF8BAUysXtwpgGz5eQJ5BZMcrGbts+ jrZ0Mn4qrToch2/3HQIg+EAhLJpFs/NaDeHYeaks9DmSPVIbVgIAuIsOKL/y2tDjRA p7XZa/6yKZC6T1xue38y9TpoHyeAALNQv3SVxUPs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730393AbgEVOqG (ORCPT ); Fri, 22 May 2020 10:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:48570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730381AbgEVOqD (ORCPT ); Fri, 22 May 2020 10:46:03 -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 9F7DB204EF; Fri, 22 May 2020 14:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158762; bh=ye3nclsR7uSWC4P9+t5adbuuNtCeDZmeeSpzKSyy8xk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wkChRlczdOdI08bn6JmrTqB0hHPKi6knDknVJA0wcJzRcFQpPYgwccJ/S6aUPypGY qZtidpRlBISxgtHh1AbOHYLfLI0hpayMbnRrGZKGb1OVTdzzwLOdG/XFkttxm3qrEy gcMhq8pIIdy7nwnjs5ARl7RK9WFIERyQhkTKXOgc= Received: by pali.im (Postfix) id D613951E; Fri, 22 May 2020 16:46:00 +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 08/11] mmc: sdio: Move SDIO IDs from ath10k driver to common include file Date: Fri, 22 May 2020 16:44:09 +0200 Message-Id: <20200522144412.19712-9-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. Checks for device IDs are slightly modified to use SDIO device IDs. This allows removal of all custom MANUFACTURER macros from ath10k. Signed-off-by: Pali Rohár --- drivers/net/wireless/ath/ath10k/sdio.c | 25 ++++++++++--------------- drivers/net/wireless/ath/ath10k/sdio.h | 8 -------- include/linux/mmc/sdio_ids.h | 2 ++ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index 1f709b65c29b..59e725515041 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -1083,10 +1083,10 @@ static void ath10k_sdio_set_mbox_info(struct ath10k *ar) mbox_info->ext_info[0].htc_ext_addr = ATH10K_HIF_MBOX0_EXT_BASE_ADDR; - dev_id_base = FIELD_GET(QCA_MANUFACTURER_ID_BASE, device); - dev_id_chiprev = FIELD_GET(QCA_MANUFACTURER_ID_REV_MASK, device); + dev_id_base = (device & 0x0F00); + dev_id_chiprev = (device & 0x00FF); switch (dev_id_base) { - case QCA_MANUFACTURER_ID_AR6005_BASE: + case (SDIO_DEVICE_ID_ATHEROS_AR6005 & 0x0F00): if (dev_id_chiprev < 4) mbox_info->ext_info[0].htc_ext_sz = ATH10K_HIF_MBOX0_EXT_WIDTH; @@ -1097,7 +1097,7 @@ static void ath10k_sdio_set_mbox_info(struct ath10k *ar) mbox_info->ext_info[0].htc_ext_sz = ATH10K_HIF_MBOX0_EXT_WIDTH_ROME_2_0; break; - case QCA_MANUFACTURER_ID_QCA9377_BASE: + case (SDIO_DEVICE_ID_ATHEROS_QCA9377 & 0x0F00): mbox_info->ext_info[0].htc_ext_sz = ATH10K_HIF_MBOX0_EXT_WIDTH_ROME_2_0; break; @@ -2185,19 +2185,16 @@ static int ath10k_sdio_probe(struct sdio_func *func, skb_queue_head_init(&ar_sdio->rx_head); INIT_WORK(&ar_sdio->async_work_rx, ath10k_rx_indication_async_work); - dev_id_base = FIELD_GET(QCA_MANUFACTURER_ID_BASE, id->device); - switch (dev_id_base) { - case QCA_MANUFACTURER_ID_AR6005_BASE: - case QCA_MANUFACTURER_ID_QCA9377_BASE: - ar->dev_id = QCA9377_1_0_DEVICE_ID; - break; - default: + dev_id_base = (id->device & 0x0F00); + if (dev_id_base != (SDIO_DEVICE_ID_ATHEROS_AR6005 & 0x0F00) && + dev_id_base != (SDIO_DEVICE_ID_ATHEROS_QCA9377 & 0x0F00)) { ret = -ENODEV; ath10k_err(ar, "unsupported device id %u (0x%x)\n", dev_id_base, id->device); goto err_free_wq; } + ar->dev_id = QCA9377_1_0_DEVICE_ID; ar->id.vendor = id->vendor; ar->id.device = id->device; @@ -2246,10 +2243,8 @@ static void ath10k_sdio_remove(struct sdio_func *func) } static const struct sdio_device_id ath10k_sdio_devices[] = { - {SDIO_DEVICE(QCA_MANUFACTURER_CODE, - (QCA_SDIO_ID_AR6005_BASE | 0xA))}, - {SDIO_DEVICE(QCA_MANUFACTURER_CODE, - (QCA_SDIO_ID_QCA9377_BASE | 0x1))}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_AR6005)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_QCA9377)}, {}, }; diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h index 33195f49acab..e8951f9cdb5f 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.h +++ b/drivers/net/wireless/ath/ath10k/sdio.h @@ -10,14 +10,6 @@ #define ATH10K_HIF_MBOX_BLOCK_SIZE 256 -#define QCA_MANUFACTURER_ID_BASE GENMASK(11, 8) -#define QCA_MANUFACTURER_ID_AR6005_BASE 0x5 -#define QCA_MANUFACTURER_ID_QCA9377_BASE 0x7 -#define QCA_SDIO_ID_AR6005_BASE 0x500 -#define QCA_SDIO_ID_QCA9377_BASE 0x700 -#define QCA_MANUFACTURER_ID_REV_MASK 0x00FF -#define QCA_MANUFACTURER_CODE 0x271 /* Qualcomm/Atheros */ - #define ATH10K_SDIO_MAX_BUFFER_SIZE 4096 /*Unsure of this constant*/ /* Mailbox address in SDIO address space */ diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 95b67ab7d06a..2894f7739acc 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -33,6 +33,8 @@ #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_DEVICE_ID_ATHEROS_AR6005 0x050A +#define SDIO_DEVICE_ID_ATHEROS_QCA9377 0x0701 #define SDIO_VENDOR_ID_BROADCOM 0x02d0 #define SDIO_DEVICE_ID_BROADCOM_43143 0xa887 -- 2.20.1