[src/trunk]: src/sys/arch/arm/amlogic Use symbolic names for hwtype values.

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

details:   https://anonhg.NetBSD.org/src/rev/06dfe2d9075e
branches:  trunk
changeset: 948812:06dfe2d9075e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 01 11:58:21 2021 +0000

description:
Use symbolic names for hwtype values.

diffstat:

 sys/arch/arm/amlogic/mesongx_mmc.c |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r f8ca88cf21e2 -r 06dfe2d9075e sys/arch/arm/amlogic/mesongx_mmc.c
--- a/sys/arch/arm/amlogic/mesongx_mmc.c        Fri Jan 01 11:58:03 2021 +0000
+++ b/sys/arch/arm/amlogic/mesongx_mmc.c        Fri Jan 01 11:58:21 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.7 2021/01/01 11:51:47 jmcneill Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.7 2021/01/01 11:51:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -262,10 +262,15 @@
 #define MMC_READ(sc, reg) \
        bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
 
+enum {
+       MESONGX_MMC_V2 = 2,
+       MESONGX_MMC_V3 = 3,
+};
+
 static const struct of_compat_data compat_data[] = {
-       { "amlogic,meson-gx-mmc",       2 },
-       { "amlogic,meson-gxbb-mmc",     2 },
-       { "amlogic,meson-axg-mmc",      3 },
+       { "amlogic,meson-gx-mmc",       MESONGX_MMC_V2 },
+       { "amlogic,meson-gxbb-mmc",     MESONGX_MMC_V2 },
+       { "amlogic,meson-axg-mmc",      MESONGX_MMC_V3 },
        { NULL }
 };
 
@@ -492,7 +497,7 @@
                return ERANGE;
 
        val = MMC_READ(sc, SD_EMMC_CLOCK);
-       if (sc->sc_hwtype == 3)
+       if (sc->sc_hwtype == MESONGX_MMC_V3)
                val |= CLOCK_CFG_V3_ALWAYS_ON;
        else
                val |= CLOCK_CFG_V2_ALWAYS_ON;