[src/trunk]: src/sys/arch port number is required

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

details:   https://anonhg.NetBSD.org/src/rev/68c9b131e40d
branches:  trunk
changeset: 337511:68c9b131e40d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Apr 17 18:36:15 2015 +0000

description:
port number is required

diffstat:

 sys/arch/arm/amlogic/amlogic_sdhc.c |  10 ++++++++--
 sys/arch/evbarm/conf/ODROID-C1      |   4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r ccd404194d06 -r 68c9b131e40d sys/arch/arm/amlogic/amlogic_sdhc.c
--- a/sys/arch/arm/amlogic/amlogic_sdhc.c       Fri Apr 17 18:24:54 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_sdhc.c       Fri Apr 17 18:36:15 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdhc.c,v 1.4 2015/04/17 18:36:15 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.4 2015/04/17 18:36:15 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -110,6 +110,12 @@
 static int
 amlogic_sdhc_match(device_t parent, cfdata_t cf, void *aux)
 {
+       struct amlogicio_attach_args * const aio = aux;
+       const struct amlogic_locators * const loc = &aio->aio_loc;
+
+       if (loc->loc_port == AMLOGICIOCF_PORT_DEFAULT)
+               return 0;
+
        return 1;
 }
 
diff -r ccd404194d06 -r 68c9b131e40d sys/arch/evbarm/conf/ODROID-C1
--- a/sys/arch/evbarm/conf/ODROID-C1    Fri Apr 17 18:24:54 2015 +0000
+++ b/sys/arch/evbarm/conf/ODROID-C1    Fri Apr 17 18:36:15 2015 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: ODROID-C1,v 1.16 2015/04/03 23:25:07 jmcneill Exp $
+#      $NetBSD: ODROID-C1,v 1.17 2015/04/17 18:36:15 jmcneill Exp $
 #
 #      Hardkernel ODROID-C1 (Amlogic S805) based SBC (Single Board Computer)
 #
@@ -59,7 +59,7 @@
 amlogicrtc0    at amlogicio0
 
 # SDHC controller
-amlogicsdhc0   at amlogicio0
+amlogicsdhc0   at amlogicio0 port 1
 sdmmc*         at amlogicsdhc?
 ld*            at sdmmc?