From nobody Wed Aug 10 20:07:35 2022 X-Original-To: dev-commits-src-main@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 4M31FN0FT7z4Y6Nj; Wed, 10 Aug 2022 20:07:36 +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 4M31FM5VsHz3qKG; Wed, 10 Aug 2022 20:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162055; 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=O9icM48RIF04GcXTow4a3W+ZcpXdjnUMTVvvq/cjNtk=; b=I+Qy/QR83V8O63POljQ8Kr+URPHGiFpE9Af1bFRKX+Cisnp5tMNYwu6hOSi7tYPVqBoq1s Xr/dsMR4AOhwJ5Y93oeCWApIfWB5vOcQWT31SWAZCEH/gH3KdJNRvZMbNv+7A/SNEDaCdv Yw7sgT/kNEBV94JbJexzkuZb8zxfZzksTGSuUNeYXxpCyJPbgUZQsc2Wl55F/ot6q9o31V rYbwCtP7kvBbbU587mqcHFQTo2AW2deJ1PTiMaXEguAx/dmWo17K/aDzKbMC0REd0MWGqA WEL5/KVt9gdvP/GLhHHgGoxjkiFlN34vaKWf/4jJ1gYaDlwAdBiMVvmu2Qz2wA== 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 4M31FM4WmDzPKh; Wed, 10 Aug 2022 20:07:35 +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 27AK7Z74001104; Wed, 10 Aug 2022 20:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AK7Z0g001103; Wed, 10 Aug 2022 20:07:35 GMT (envelope-from git) Date: Wed, 10 Aug 2022 20:07:35 GMT Message-Id: <202208102007.27AK7Z0g001103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 348164aa9e5d - main - sdio: Add CCCR speed defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 348164aa9e5d862b65c8436861a3eb2b33bcb16e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162055; 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=O9icM48RIF04GcXTow4a3W+ZcpXdjnUMTVvvq/cjNtk=; b=Bq+ZIfWx4CgGVvN5powuPjMnhy028BFL4RGeRixiwLzx035EsBv9Qvl4zB0DxC/qfPEU+b tAQPDbminlsC/QZKPsQaHP4oaftPqPMp4jedYlShTn2wcGjHpgFdN6WHOaWw1TMyDpC9MJ YdDSKl6zAcyM4G3eYBZVSl+s2YAwyogNhzxvEUYUP3DG2CXyVzb8OjEz0OpWoK4Ki5wr7v tzUGjGq8iNRM1Sq4EMQsOdkTqXuBHO37dK4j042bT3jPT2GCBT6lBe8fbNt0G5c5lQdzse QpSM36hlo7V2D3Ku5ANZeeUrnqMOv4ynrr2ry95Jak+VKQDQ82CjOLpsziS2wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660162055; a=rsa-sha256; cv=none; b=w2F4oze0PFwUqn72jhS/cdpy9TwFRtIBIZaXd+BX00pj/m+FENdN/ZzQMAIlTuar1PfSoh EKbVqtW1oGpXVeTqOKOOB51gUWuoXgCic9jubKZDkQf7RBWrRxwZg9nn0gu5I9kyTy9/bj 4bqaXB/suOyIUt2cemRIcKT5dnxt6m9iSEnV8J/3ZN1TQlIwfaW8HMEtDuyB3nSlfm4YJE AsLZjaPCjO6IzVC3Htkib4fGOlEYVcbJ79Xh9buEMVkkh5lhLcLZaAKZB2is6nmf72ln1k f61sYwmH31xPhboeO5sKJjtyR1zZsnsRqH0R6Q3WyWypUVUbjTX7nHIzrt6UCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=348164aa9e5d862b65c8436861a3eb2b33bcb16e commit 348164aa9e5d862b65c8436861a3eb2b33bcb16e Author: Emmanuel Vadot AuthorDate: 2021-07-14 15:25:36 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-10 20:07:24 +0000 sdio: Add CCCR speed defines Those are the defines needed to change speed on a SDIO card. --- 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 */