svn commit: r364779 - in head: share/man/man4 sys/dev/sdhci

[Mark Johnston]

Author: markj
Date: Tue Aug 25 18:32:43 2020
New Revision: 364779
URL: https://svnweb.freebsd.org/changeset/base/364779

Log:
  sdhci(4): Recognize the Texas Instruments PCIxx12 card reader.
  
  PR:		248650
  Submitted by:	Lars Herschke <lhersch at dssgmbh.de>
  MFC after:	1 week

Modified:
  head/share/man/man4/sdhci.4
  head/sys/dev/sdhci/sdhci_pci.c

Modified: head/share/man/man4/sdhci.4
==============================================================================
--- head/share/man/man4/sdhci.4	Tue Aug 25 18:30:12 2020	(r364778)
+++ head/share/man/man4/sdhci.4	Tue Aug 25 18:32:43 2020	(r364779)
@@ -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: head/sys/dev/sdhci/sdhci_pci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_pci.c	Tue Aug 25 18:30:12 2020	(r364778)
+++ head/sys/dev/sdhci/sdhci_pci.c	Tue Aug 25 18:32:43 2020	(r364779)
@@ -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",