 @@ -1,14 +1,14 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.50 2014/06/07 10:30:13 kiyohara Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.51 2016/03/31 14:33:17 kiyohara Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
+ *
  * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
  * 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
 @@ -159,26 +159,27 @@
 #include <sys/termios.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/autoconf.h>
 #include <machine/bootconfig.h>
 #include <arm/locore.h>
 #include <arm/arm32/machdep.h>
 #ifdef OVERO
 #include <arm/omap/omap2_gpmcreg.h>
 #include <arm/omap/omap2_obiovar.h>
 #include <arm/omap/omap2_prcm.h>
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap_var.h>
 #include <arm/omap/omap_com.h>
 #endif
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 #include <evbarm/gumstix/gumstixreg.h>
 #include <evbarm/gumstix/gumstixvar.h>
 #include <dev/cons.h>
 @@ -325,26 +326,33 @@ static const struct pmap_devmap gumstix_
 		_S(4 * COM_NPORTS),
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE,
 	},
+	{
 		GUMSTIX_LCDC_VBASE,
 		_A(PXA2X0_LCDC_BASE),
 		_S(4 * COM_NPORTS),
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE,
 	},
 #elif defined(OVERO)
+	{
 		OVERO_L4_CORE_VBASE,
 		_A(OMAP3530_L4_CORE_BASE),
 		_S(L1_S_SIZE),		/* No need 16MB.  Use only first 1MB */
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE
 	},
+	{
 		OVERO_L4_PERIPHERAL_VBASE,
 		_A(OMAP3530_L4_PERIPHERAL_BASE),
 		_S(OMAP3530_L4_PERIPHERAL_SIZE),
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE
 	},
+	{
 		OVERO_GPMC_VBASE,
 		_A(GPMC_BASE),
 		_S(GPMC_SIZE),
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE
 	},
 @@ -910,14 +918,38 @@ gumstix_device_register(device_t dev, vo
 			    " property for %s\n", device_xname(dev));
+		}
 		if (prop_dictionary_set_bool(dict,
 		    "Ganged-power-mask-on-port2", 1) == false) {
 			printf("WARNING: unable to set power-mask for port2"
 			    " property for %s\n", device_xname(dev));
+		}
 		if (prop_dictionary_set_bool(dict,
 		    "Ganged-power-mask-on-port3", 1) == false) {
 			printf("WARNING: unable to set power-mask for port3"
 			    " property for %s\n", device_xname(dev));
+		}
+	}
 	if (device_is_a(dev, "omapmputmr")) {
 #ifdef OVERO
 		struct obio_attach_args *obio = aux;
 		int en;
 		switch (obio->obio_addr) {
 		case 0x49032000:	/* GPTIMER2 */
 		case 0x49034000:	/* GPTIMER3 */
 		case 0x49036000:	/* GPTIMER4 */
 		case 0x49038000:	/* GPTIMER5 */
 		case 0x4903a000:	/* GPTIMER6 */
 		case 0x4903c000:	/* GPTIMER7 */
 		case 0x4903e000:	/* GPTIMER8 */
 		case 0x49040000:	/* GPTIMER9 */
 			/* Ensure enable PRCM.CM_[FI]CLKEN_PER[3:10]. */
 			en = 1 << (((obio->obio_addr >> 13) & 0x3f) - 0x16);
 			ioreg_write(OVERO_L4_CORE_VBASE + 0x5000,
 			    ioreg_read(OVERO_L4_CORE_VBASE + 0x5000) | en);
 			ioreg_write(OVERO_L4_CORE_VBASE + 0x5010,
 			    ioreg_read(OVERO_L4_CORE_VBASE + 0x5010) | en);
 			break;
+		}
 #endif
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gumstixreg.h,v 1.7 2012/12/24 06:49:41 kiyohara Exp $  */
+/*	$NetBSD: gumstixreg.h,v 1.8 2016/03/31 14:33:17 kiyohara Exp $  */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
+ *
  * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
  * 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
 @@ -37,27 +37,28 @@
  * Logical mapping for onboard/integrated peripherals
  * that are used while bootstrapping.
  */
 #define GUMSTIX_IO_AREA_VBASE		0xfd000000
 #define GUMSTIX_INTCTL_VBASE		0xfd000000
 #define GUMSTIX_CLKMAN_VBASE		0xfd100000
 #define GUMSTIX_GPIO_VBASE		0xfd200000
 #define GUMSTIX_FFUART_VBASE		0xfd300000
 #define GUMSTIX_STUART_VBASE		0xfd400000
 #define GUMSTIX_BTUART_VBASE		0xfd500000
 #define GUMSTIX_HWUART_VBASE		0xfd600000
 #define GUMSTIX_LCDC_VBASE		0xfd700000
-#define OVERO_L4_PERIPHERAL_VBASE	0xc0000000
+#define OVERO_L4_CORE_VBASE		0xc0000000
-#define OVERO_GPMC_VBASE		0xc0100000
+#define OVERO_L4_PERIPHERAL_VBASE	0xc0100000
 #define OVERO_GPMC_VBASE		0xc0200000
 #define ioreg_read(a)		(*(volatile unsigned *)(a))
 #define ioreg_write(a,v)	(*(volatile unsigned *)(a)=(v))
 #define ioreg16_read(a)		(*(volatile uint16_t *)(a))
 #define ioreg16_write(a,v)	(*(volatile uint16_t *)(a)=(v))
 #define ioreg8_read(a)		(*(volatile uint8_t *)(a))
 #define ioreg8_write(a,v)	(*(volatile uint8_t *)(a)=(v))
 #endif /* _EVBARM_GUMSTIXREG_H_ */