[src/netbsd-9]: src/sys/dev/sdmmc Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8d5eeb01e19
branches:  netbsd-9
changeset: 964029:f8d5eeb01e19
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 20 18:15:43 2020 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1021):

        sys/dev/sdmmc/sdhc.c: revision 1.107
        sys/dev/sdmmc/sdhcreg.h: revision 1.21

Identify SDHC 4.1 and 4.2. From {DragonFly,Free}BSD.

diffstat:

 sys/dev/sdmmc/sdhc.c    |  10 ++++++++--
 sys/dev/sdmmc/sdhcreg.h |   4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 038e2da71a79 -r f8d5eeb01e19 sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Sat Jul 18 15:10:21 2020 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Mon Jul 20 18:15:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.103.2.1 2020/02/25 18:40:43 martin Exp $    */
+/*     $NetBSD: sdhc.c,v 1.103.2.2 2020/07/20 18:15:43 martin Exp $    */
 /*     $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $        */
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.103.2.1 2020/02/25 18:40:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.103.2.2 2020/07/20 18:15:43 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -324,6 +324,12 @@
        case SDHC_SPEC_VERS_400:
                aprint_normal("4.0");
                break;
+       case SDHC_SPEC_VERS_410:
+               aprint_normal("4.1");
+               break;
+       case SDHC_SPEC_VERS_420:
+               aprint_normal("4.2");
+               break;
        case SDHC_SPEC_NOVERS:
                hp->specver = -1;
                aprint_normal("NO-VERS");
diff -r 038e2da71a79 -r f8d5eeb01e19 sys/dev/sdmmc/sdhcreg.h
--- a/sys/dev/sdmmc/sdhcreg.h   Sat Jul 18 15:10:21 2020 +0000
+++ b/sys/dev/sdmmc/sdhcreg.h   Mon Jul 20 18:15:43 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhcreg.h,v 1.19 2017/06/23 08:43:59 ryo Exp $ */
+/*     $NetBSD: sdhcreg.h,v 1.19.12.1 2020/07/20 18:15:43 martin Exp $ */
 /*     $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $       */
 
 /*
@@ -246,6 +246,8 @@
 #define SDHC_SPEC_VERS_200             0x01
 #define SDHC_SPEC_VERS_300             0x02
 #define SDHC_SPEC_VERS_400             0x03
+#define SDHC_SPEC_VERS_410             0x04
+#define SDHC_SPEC_VERS_420             0x05
 #define SDHC_SPEC_NOVERS               0xff    /* dummy */
 
 /* SDHC_CAPABILITIES decoding */