 @@ -1,185 +1,185 @@
-#	$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
 defparam opt_omap.h				OMAP_EMIFF_PBASE OMAP_EMIFF_SIZE
 defflag opt_omap.h				OMAP2
 defflag opt_omap.h				OMAP3: OMAP2
 defflag opt_omap.h				OMAP4: OMAP3
 defflag opt_omap.h				OMAP5: OMAP4
 defflag opt_omap.h				OMAP_2XXX: OMAP2
 defflag opt_omap.h				OMAP_2430: OMAP_2XXX
 defflag opt_omap.h				OMAP_2420: OMAP_2XXX
 defflag opt_omap.h				OMAP_3XXX: OMAP3
 defflag opt_omap.h				OMAP_3430: OMAP_3XXX
 defflag opt_omap.h				OMAP_3530: OMAP_3XXX
 defflag opt_omap.h				OMAP_4XXX: OMAP4
 defflag opt_omap.h				OMAP_4430: OMAP_4XXX
 defflag opt_omap.h				OMAP_4460: OMAP_4XXX
 defflag opt_omap.h				OMAP_5XXX: OMAP5
 defflag opt_omap.h				OMAP_5430: OMAP_5XXX
 defflag opt_omap.h				TI_AM335X: OMAP3
 defflag opt_omap.h				TI_DM37XX: OMAP3
 # OBIO just an attach point
 device	obio { [addr=-1], [size=0], [intr=-1], [mult=1], [intrbase=-1], [nobyteacc=0], [edmabase=-1]
 	     } : bus_space_generic
 attach	obio at mainbus
 file	arch/arm/omap/omap2_obio.c		obio needs-count
 # OBIO files
 file	arch/arm/omap/omap_space.c		obio
 file	arch/arm/omap/omap_a2x_space.c		obio
 file	arch/arm/arm/bus_space_a2x.S		obio
 file	arch/arm/omap/omap_a4x_space.c		obio
 file	arch/arm/arm/bus_space_a4x.S		obio
 # TI Sitara control module
 device	sitaracm
 attach	sitaracm at obio with sitaracm
 file	arch/arm/omap/sitara_cm.c		sitaracm
 file	arch/arm/omap/am335x_cm_padconf.c	ti_am335x
 # OMAP2 interrupt controller
 device	omapicu: pic, pic_splfuncs
 attach	omapicu at obio with omap2icu
 file	arch/arm/omap/omap2_icu.c		(omap2 | omap3) & omapicu
 file	arch/arm/omap/omap2430_intr.c		omap2 & !omapicu & !omap4
 # OMAP2 GPIO controllers
 device	omapgpio: gpiobus
 attach	omapgpio at obio with omap2gpio
 file	arch/arm/omap/omap2_gpio.c		(omap2 | omap3) & !ti_am335x & omapgpio
 file	arch/arm/omap/am335x_gpio.c		ti_am335x & omapgpio
 # TI_AM335X (and maybe TI OMAP4) I2C controllers
 device	tiiic: i2cbus, i2cexec
 attach	tiiic at obio with ti_iic
 file	arch/arm/omap/ti_iic.c			ti_iic
 # OMAP3 I2C controllers
 device	omapiic: i2cbus, i2cexec
 attach	omapiic at obio with omap3_i2c
 file	arch/arm/omap/omap3_i2c.c		omap3_i2c
 # OMAP3 system control module
 device	omapscm: sysmon_envsys
 attach	omapscm at obio with omap3_scm
 file	arch/arm/omap/omap3_scm.c		omap3_scm
 # OMAP dual-mode timer
 device	omapdmtimer
 file	arch/arm/omap/omap_dmtimer.c		omapdmtimer
 defparam opt_omap.h				OMAP_SYSTEM_CLOCK_FREQ
 attach	omapdmtimer at obio with omap_dmtimer_obio
 file	arch/arm/omap/am335x_dmtimer.c		ti_am335x & omapdmtimer
 # OMAP 2430 General Purpose Timer
 device	omapmputmr
 file	arch/arm/omap/omap2_mputmr.c		omapmputmr
 defparam opt_omap.h				OMAP_GP_TIMER_CLOCK_FREQ
 # OBIO/2430 GP Timer
 attach 	omapmputmr at obio with obiomputmr
 file	arch/arm/omap/obio_mputmr.c		obiomputmr
 # Dual Mode (General Purpose) Timer
 device 	omapgptmr
 attach 	omapgptmr at obio
 file	arch/arm/omap/omap2_gptmr.c		omapgptmr
 #file	arch/arm/omap/omap_pwm.c		omapgptmr
 # Watchdog timers
 device	omapwdt32k: sysmon_wdog
 file	arch/arm/omap/omap_wdt.c		omapwdt32k needs-flag
 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
 attach  motg at tiotg_port
 # SDMMC controller
 attach	sdhc at obio with obiosdhc
 file	arch/arm/omap/omap3_sdhc.c		obiosdhc
 # NAND flash controller
 device	omapnand: nandbus
 attach	omapnand at gpmc
 file	arch/arm/omap/omap2_nand.c		omapnand
 # PRCM interface
 device	prcm
 attach	prcm at obio
 file	arch/arm/omap/omap2_prcm.c		prcm needs-flag
 file	arch/arm/omap/am335x_prcm.c		ti_am335x
 # OHCI USB controller
 attach	ohci at obio with obioohci
 file	arch/arm/omap/obio_ohci.c		obioohci
 attach	ehci at obio with omap3_ehci
 file	arch/arm/omap/omap3_ehci.c		omap3_ehci
 attach	ahcisata at obio with omap5_ahcisata
 file	arch/arm/omap/omap5_ahcisata.c		omap5_ahcisata
 device	omapfb: rasops16, rasops8, wsemuldisplaydev, vcons, edid
 attach	omapfb at obio
 file	arch/arm/omap/omapfb.c			omapfb
 # TI AM335x framebuffer
 device	tifb: rasops32, rasops24, rasops16, rasops8, wsemuldisplaydev, vcons, edid
 attach	tifb at obio
 file	arch/arm/omap/tifb.c			tifb
 device	cpsw: ether, ifnet, arp, mii, mii_phy
 attach	cpsw at obio
 file	arch/arm/omap/if_cpsw.c			cpsw
 device 	omapdma
 attach 	omapdma at obio
 file	arch/arm/omap/omap3_sdma.c		omapdma needs-flag
 device	trng
 attach	trng at obio
 file	arch/arm/omap/am335x_trng.c		trng
 # these bus space methods are not bus-specific ...
+#
 file	arch/arm/omap/omap_nobyteacc_space.c	emifs | gpmc
 file	arch/arm/omap/omap_nobyteacc_io.S	emifs | gpmc

 @@ -1,330 +1,345 @@
-/*	$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
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed for the NetBSD Project by
  *	Genetec Corporation.
  * 4. The name of Genetec Corporation may not be used to endorse or
  *    promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL GENETEC CORPORATION
  * 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.
+ *
  * Copyright (c) 1997,1998, 2001, The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by IWAMOTO Toshihiro, Ichiro FUKUHARA and Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
+ *
  * Copyright (c) 1999
  *         Shin Takemura and PocketBSD Project. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the PocketBSD project
  *	and its contributors.
  * 4. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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>
 #include <arm/mainbus/mainbus.h>
 #include <arm/omap/omap_var.h>
 #include <arm/omap/omap2_gpmcreg.h>
 #include <arm/omap/omap2_gpmcvar.h>
 typedef struct {
 	boolean_t	cs_valid;
 	ulong		cs_addr;
 	ulong		cs_size;
 } gpmc_csconfig_t;
 struct gpmc_softc {
 	device_t		sc_dev;
 	bus_dma_tag_t		sc_dmac;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	gpmc_csconfig_t		sc_csconfig[GPMC_NCS];
 };
 static bus_size_t csreg7[GPMC_NCS] = {
 	GPMC_CONFIG7_0,
 	GPMC_CONFIG7_1,
 	GPMC_CONFIG7_2,
 	GPMC_CONFIG7_3,
 	GPMC_CONFIG7_4,
 	GPMC_CONFIG7_5,
 	GPMC_CONFIG7_6,
 	GPMC_CONFIG7_7,
 };
 /* prototypes */
 static int	gpmc_match(device_t, cfdata_t, void *);
 static void	gpmc_attach(device_t, device_t, void *);
 static void	gpmc_csconfig_init(struct gpmc_softc *);
 static int 	gpmc_search(device_t, cfdata_t, const int *, void *);
 static int	gpmc_print(void *, const char *);
 /* attach structures */
 CFATTACH_DECL_NEW(gpmc, sizeof(struct gpmc_softc),
 	gpmc_match, gpmc_attach, NULL, NULL);
 static int gpmc_attached;	/* XXX assumes only 1 instance */
 static int
 gpmc_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct mainbus_attach_args *mb = aux;
 	if (gpmc_attached != 0)
 		return 0;
 #if defined(OMAP2)
 	if (mb->mb_iobase == GPMC_BASE)
 		return 1;
 #endif
 	return 0;
+}
 static void
 gpmc_attach(device_t parent, device_t self, void *aux)
+{
 	struct gpmc_softc *sc = device_private(self);
 	struct mainbus_attach_args *mb = aux;
 	bus_space_handle_t ioh;
 	uint32_t rev;
 	int err;
 	sc->sc_dev = self;
 	sc->sc_iot = &omap_bs_tag;
 	err = bus_space_map(sc->sc_iot, mb->mb_iobase, GPMC_SIZE, 0, &ioh);
 	if (err != 0)
 		panic("%s: Cannot map registers, error %d",
 			device_xname(self), err);
 	aprint_normal(": General Purpose Memory Controller");
 	rev = bus_space_read_4(sc->sc_iot, ioh, GPMC_REVISION);
 	aprint_normal(", rev %d.%d\n",
 		GPMC_REVISION_REV_MAJ(rev),
 		GPMC_REVISION_REV_MIN(rev));
 	sc->sc_ioh = ioh;
 	sc->sc_dmac = NULL;
 	gpmc_csconfig_init(sc);
 	gpmc_attached = 1;
 	/*
 	 * Attach all our devices
 	 */
 	config_search_ia(gpmc_search, self, "gpmc", NULL);
+}
 static void
 gpmc_csconfig_init(struct gpmc_softc *sc)
+{
 	gpmc_csconfig_t *cs;
 	uint32_t r;
 	int i;
 	cs = &sc->sc_csconfig[0];
 	for (i=0; i < GPMC_NCS; i++) {
 		memset(cs, 0, sizeof(gpmc_csconfig_t));
 		r = bus_space_read_4(sc->sc_iot, sc->sc_ioh, csreg7[i]);
 		if ((r & GPMC_CONFIG7_CSVALID) != 0) {
 			cs->cs_valid = TRUE;
 			cs->cs_addr = omap_gpmc_config7_addr(r);
 			cs->cs_size = omap_gpmc_config7_size(r);
 			aprint_normal("%s: CS#%d valid, "
 				"addr 0x%08lx, size %3ldMB\n",
 				device_xname(sc->sc_dev), i,
 				cs->cs_addr, (cs->cs_size >> 20));
+		}
 		cs++;
+	}
+}
 static int
 gpmc_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct gpmc_softc *sc = device_private(parent);
 	struct gpmc_attach_args aa;
 	gpmc_csconfig_t *cs;
 	int i;
 	/* Set up the attach args. */
 	if (cf->cf_loc[GPMCCF_NOBYTEACC] == 1) {
 		if (cf->cf_loc[GPMCCF_MULT] == 1)
 			aa.gpmc_iot = &nobyteacc_bs_tag;
 		else
 			panic("nobyteacc specified for device with "
 				"non-byte multiplier\n");
 	} else {
 		switch (cf->cf_loc[GPMCCF_MULT]) {
 		case 1:
 			aa.gpmc_iot = &omap_bs_tag;
 			break;
 		case 2:
 			aa.gpmc_iot = &omap_a2x_bs_tag;
 			break;
 		case 4:
 			aa.gpmc_iot = &omap_a4x_bs_tag;
 			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);
 				return 0;		/* love it */
+			}
+		}
 		cs++;
+	}
 	return 1;	/* NG */
+}
 static int
 gpmc_print(void *aux, const char *name)
+{
 	struct gpmc_attach_args *sa = (struct gpmc_attach_args*)aux;
 	if (sa->gpmc_addr != GPMCCF_ADDR_DEFAULT) {
 		aprint_normal(" addr 0x%08lx", sa->gpmc_addr);
 		if (sa->gpmc_size != GPMCCF_SIZE_DEFAULT)
 			aprint_normal("-0x%08lx",
 				sa->gpmc_addr + sa->gpmc_size-1);
+	}
 	if (sa->gpmc_intr != GPMCCF_INTR_DEFAULT)
 		aprint_normal(" intr %d", sa->gpmc_intr);
 	return UNCONF;
+}
 uint32_t
 gpmc_register_read(struct gpmc_softc *sc, bus_size_t reg)
+{
 	return bus_space_read_4(sc->sc_iot, sc->sc_ioh, reg);
+}
 void
 gpmc_register_write(struct gpmc_softc *sc, bus_size_t reg, const uint32_t data)
+{
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, reg, data);
+}