From owner-svn-src-all@freebsd.org Tue Sep 1 13:58:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44FD43C8EC7; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgpZ217rwz4YHF; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A3391A6DB; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081DwHnB044596; Tue, 1 Sep 2020 13:58:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081DwHBs044594; Tue, 1 Sep 2020 13:58:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011358.081DwHBs044594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 13:58:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365038 - in stable/12: share/man/man4 sys/dev/sdhci X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12: share/man/man4 sys/dev/sdhci X-SVN-Commit-Revision: 365038 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:58:18 -0000 Author: markj Date: Tue Sep 1 13:58:17 2020 New Revision: 365038 URL: https://svnweb.freebsd.org/changeset/base/365038 Log: MFC r364779: sdhci(4): Recognize the Texas Instruments PCIxx12 card reader. PR: 248650 Modified: stable/12/share/man/man4/sdhci.4 stable/12/sys/dev/sdhci/sdhci_pci.c Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/sdhci.4 ============================================================================== --- stable/12/share/man/man4/sdhci.4 Tue Sep 1 13:19:15 2020 (r365037) +++ stable/12/share/man/man4/sdhci.4 Tue Sep 1 13:58:17 2020 (r365038) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 9, 2012 +.Dd August 25, 2020 .Dt SDHCI 4 .Os .Sh NAME @@ -71,7 +71,7 @@ RICOH R5C822 .It RICOH R5CE823 .It -TI PCIXX21/XX11 +TI PCIXX21/XX11/XX12 .El .Sh SEE ALSO .Xr mmc 4 , Modified: stable/12/sys/dev/sdhci/sdhci_pci.c ============================================================================== --- stable/12/sys/dev/sdhci/sdhci_pci.c Tue Sep 1 13:19:15 2020 (r365037) +++ stable/12/sys/dev/sdhci/sdhci_pci.c Tue Sep 1 13:58:17 2020 (r365038) @@ -90,6 +90,9 @@ static const struct sdhci_device { SDHCI_QUIRK_LOWER_FREQUENCY }, { 0x8034104c, 0xffff, "TI XX21/XX11 SD", SDHCI_QUIRK_FORCE_DMA }, + { 0x803c104c, 0xffff, "TI XX12 SD", + SDHCI_QUIRK_FORCE_DMA | + SDHCI_QUIRK_WAITFOR_RESET_ASSERTED }, { 0x05501524, 0xffff, "ENE CB712 SD", SDHCI_QUIRK_BROKEN_TIMINGS }, { 0x05511524, 0xffff, "ENE CB712 SD 2",