 @@ -1,14 +1,14 @@
-#	$NetBSD: files.omap2,v 1.33 2016/07/04 15:35:55 kiyohara Exp $
+#	$NetBSD: files.omap2,v 1.34 2016/10/04 15:23:40 kiyohara Exp $
+#
 # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support
 # Based on xscale/files.pxa2x0
+#
 include "arch/arm/pic/files.pic"
 include "arch/arm/cortex/files.cortex"
 file	arch/arm/arm32/irq_dispatch.S
 file	arch/arm/omap/omap_dma.c
 # Memory size in megabytes
 defparam opt_omap.h				MEMSIZE
 @@ -107,27 +107,27 @@ file	arch/arm/omap/omap_wdt.c		omapwdt32
 attach	omapwdt32k at obio with obiowdt32k
 file	arch/arm/omap/obio_wdt.c		obiowdt32k
 # L3 Interconnect
 device	L3i { [addr=-1], [size=0], [intr=-1], [mult=1], [nobyteacc=0]
 	      } : bus_space_generic
 attach	L3i at mainbus
 file	arch/arm/omap/omap2_l3i.c		omap2 | omap3
 # General Purpose Memory Controller
 # XXX some addl. chip select config parms may be desired here (e.g. timing)
 # XXX so far we just use the setup established by boot firmware
-device	gpmc { [addr=-1], [size=0], [intr=-1], [mult=1], [nobyteacc=0]
+device	gpmc { [cs=-1], [addr=-1], [size=0], [intr=-1], [mult=1], [nobyteacc=0]
 	      } : bus_space_generic
 attach	gpmc at mainbus
 file	arch/arm/omap/omap2_gpmc.c		gpmc
 device	edma
 attach	edma at mainbus
 file	arch/arm/omap/omap_edma.c		edma needs-flag
 # TI OTG controller
 define  tiotg_port {[port = -1], [mode = -1]}
 device	tiotg: tiotg_port
 attach	tiotg at mainbus
 file	arch/arm/omap/tiotg.c			tiotg

 @@ -1,17 +1,17 @@
-/*	$Id: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $	*/
+/*	$Id: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $	*/
 /* adapted from: */
-/*	$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $ */
+/*	$NetBSD: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $ */
 /*
  * Autoconfiguration support for the Texas Instruments OMAP GPMC bus.
  * Based on arm/omap/omap_emifs.c which in turn was derived
  * Based on arm/xscale/pxa2x0.c which in turn was derived
  * from arm/sa11x0/sa11x0.c
+ *
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -92,27 +92,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 #include <arm/cpufunc.h>
 @@ -268,27 +268,42 @@ gpmc_search(device_t parent, cfdata_t cf
 			break;
 		default:
 			panic("Unsupported EMIFS multiplier.");
 			break;
+		}
+	}
 	aa.gpmc_dmac = sc->sc_dmac;
 	aa.gpmc_addr = cf->cf_loc[GPMCCF_ADDR];
 	aa.gpmc_size = cf->cf_loc[GPMCCF_SIZE];
 	aa.gpmc_intr = cf->cf_loc[GPMCCF_INTR];
 	cs = &sc->sc_csconfig[0];
-	for (i=0; i < GPMC_NCS; i++) {
+	for (i = 0; i < GPMC_NCS; i++) {
 		if (cf->cf_loc[GPMCCF_CS] != GPMCCF_CS_DEFAULT) {
 			if (i != cf->cf_loc[GPMCCF_CS]) {
 				cs++;
 				continue;
+			}
 			if (aa.gpmc_addr != GPMCCF_ADDR_DEFAULT
 			&&  aa.gpmc_addr != cs->cs_addr)
 				panic("cs:addr missmatch:"
 				    " cs %d(0x%08lx), addr 0x%08lx\n",
 				    cf->cf_loc[GPMCCF_CS], cs->cs_addr,
 				    aa.gpmc_addr);
 			aa.gpmc_addr = cs->cs_addr;
+		}
 		if ((aa.gpmc_addr >= cs->cs_addr)
 		&&  (aa.gpmc_addr < (cs->cs_addr + cs->cs_size))) {
 			/* XXX
 			 * if size was specified, then check it too
 			 * otherwise just assume it is OK
 			 */
 			if ((aa.gpmc_size != GPMCCF_SIZE_DEFAULT)
 			&&  ((aa.gpmc_addr + aa.gpmc_size)
 				>= (cs->cs_addr + cs->cs_size)))
 					continue;	/* NG */
 			aa.gpmc_cs = i;
 			if (config_match(parent, cf, &aa)) {
 				config_attach(parent, cf, &aa, gpmc_print);