Module Name: src
Committed By: jmcneill
Date: Fri Apr 17 18:36:15 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_sdhc.c
src/sys/arch/evbarm/conf: ODROID-C1
Log Message:
port number is required
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_sdhc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/ODROID-C1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/amlogic_sdhc.c
diff -u src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.3 src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.4
--- src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.3 Mon Mar 16 21:37:35 2015
+++ src/sys/arch/arm/amlogic/amlogic_sdhc.c Fri Apr 17 18:36:15 2015
@@ -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 <[email protected]>
@@ -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 struct sdmmc_chip_functions amlog
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;
}
Index: src/sys/arch/evbarm/conf/ODROID-C1
diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.16 src/sys/arch/evbarm/conf/ODROID-C1:1.17
--- src/sys/arch/evbarm/conf/ODROID-C1:1.16 Fri Apr 3 23:25:07 2015
+++ src/sys/arch/evbarm/conf/ODROID-C1 Fri Apr 17 18:36:15 2015
@@ -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 @@ amlogicrng0 at amlogicio0
amlogicrtc0 at amlogicio0
# SDHC controller
-amlogicsdhc0 at amlogicio0
+amlogicsdhc0 at amlogicio0 port 1
sdmmc* at amlogicsdhc?
ld* at sdmmc?
