From nobody Thu Feb 02 06:57:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P6qNF4XkSz3c4Mg; Thu, 2 Feb 2023 06:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P6qNF1Vlfz4MGD; Thu, 2 Feb 2023 06:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675321037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nUZwc7zcEq/8muYOeAp8cSb/DnXvxcyxAwGeW5lh0Q=; b=GAFxfz4n99Qcnu1yYFtlNBu+IaVW2VXeKOlDjo3+sl/0k7mwpfzNBeAnC48JDfAnw+/05N 7OF4wAZEvAuzU817klj5HB8W2S/aRIaxjCHi0+SIcqnCbFmmJNhfVyBvJm9qMFN2KmhOVe gJTb/Hz4J9sn5VlFI62K1nfOSCkahPC0ba91y0IrwhLulu8xWK/L6g3XIqHNgFCnrB1YEX GCSJjqVRaCKJNxl4cGdC23CaX0WsHXBHIEoRoBqmT2lipPqpsX0fV1OejZMdEexmkWMuFs O7RmQn2VcidagohH0M6qhj9VW16n9+BWk0W+f3cYoMCXcb/6KEPJpPjZTKIqpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675321037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2nUZwc7zcEq/8muYOeAp8cSb/DnXvxcyxAwGeW5lh0Q=; b=DL2JyGnkrIh4MNs2Hm+VO+X3OLH9XoCZdLFaT0GAUNOsObVKKjHGkPz65Cza6WHJcyS7rm IO/zN1NDgF2dZaeg+9+zXva9e0yIsGDQPALqzvQrpsQaIioCIWKvJjmdQqOJZDk33/lYRe 9b0U/vlZ1St9EH1Ni2YZXbeDwu+N/N+ypblTLmnmtzLnESjKj2QfWZWqsLhpZkKP3Q2Q2W d+519LlhnmrGr/a4mKZjFT80Yuh0AONsVcJqxYvZfa4kScP21vmMXSsXx4FEAJnNjjR6jO 4eMzepSWKmYUYgACDnMo+WjHiZyw6J74YmO/vkaRYxDa8k4xJK1484+7+Cz1KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321037; a=rsa-sha256; cv=none; b=kCnchhZX9gAhK7kuGsV97kpU8simXB6VJ5TPAc85uJ+sAYSAjQE9BFfzBAj9mcBQpBpJKj WNOIgH9s7SgkDV4VCiBD/lmVQUzK+Eo+EGSu2Cl10c8SRLC1H1aOlRlAfHyT0Ngx5FoKWu NTLReO1XcmSKmg3XTAnqCFY6UuDHZqgKjtBW8XJPclATeO1W4cohaIjexlBTRjRBt+vLAU TyrkF2yX6nNYKczPAC9M7jhBaS7Y82kqrj8w40ceJ2+NDH+y7cQdON91Zr0XKv/ShVNA2U dbE7ST3pBkP/SghEVlZ79CRVB/mmT5NpqouezZARIiRkWFaA5dKfpFfQ49nTwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P6qNF0QW2zlr2; Thu, 2 Feb 2023 06:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3126vGEu003741; Thu, 2 Feb 2023 06:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vGRn003740; Thu, 2 Feb 2023 06:57:16 GMT (envelope-from git) Date: Thu, 2 Feb 2023 06:57:16 GMT Message-Id: <202302020657.3126vGRn003740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 9294c98c5c7a - stable/13 - sdio: Add CCCR speed defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9294c98c5c7a97d1550b20c19725cf61a4093f74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9294c98c5c7a97d1550b20c19725cf61a4093f74 commit 9294c98c5c7a97d1550b20c19725cf61a4093f74 Author: Emmanuel Vadot AuthorDate: 2021-07-14 15:25:36 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 06:47:34 +0000 sdio: Add CCCR speed defines Those are the defines needed to change speed on a SDIO card. (cherry picked from commit 348164aa9e5d862b65c8436861a3eb2b33bcb16e) --- sys/dev/mmc/mmcreg.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h index 8fc6ba06ff87..97ddb6dbeeb6 100644 --- a/sys/dev/mmc/mmcreg.h +++ b/sys/dev/mmc/mmcreg.h @@ -568,9 +568,21 @@ struct mmc_request { #define CCCR_BUS_WIDTH_4 (1 << 1) #define CCCR_BUS_WIDTH_1 (1 << 0) #define SD_IO_CCCR_CARDCAP 0x08 /* SDIO card capabilities */ -#define CCCR_CC_SMB (1 << 1) /* CMD53 block mode support */ +#define CCCR_CC_SMB (1 << 1) /* CMD53 block mode support */ +#define CCCR_CC_LSC (1 << 6) + #define SD_IO_CCCR_CISPTR 0x09 /* 0x09 - 0x0B */ #define SD_IO_CCCR_FN0_BLKSZ 0x10 /* 0x10 - 0x11 */ +#define SD_IO_CCCR_SPEED 0x13 +#define CCCR_SPEED_SHS (1 << 0) +#define CCCR_SPEED_BSS_MASK (0x7 << 1) +#define CCCR_SPEED_EHS (1 << 1) +#define CCCR_SPEED_SDR12 (0 << 1) +#define CCCR_SPEED_SDR25 (1 << 1) +#define CCCR_SPEED_SDR50 (2 << 1) +#define CCCR_SPEED_SDR104 (3 << 1) +#define CCCR_SPEED_DDR50 (4 << 1) + /* Function Basic Registers (FBR) */ #define SD_IO_FBR_START 0x00100 /* Offset in F0 address space */ #define SD_IO_FBR_SIZE 0x00700 /* Total size of FBR */