 @@ -1,14 +1,14 @@
-/*	$NetBSD: beagle_machdep.c,v 1.45 2013/06/16 16:48:23 matt Exp $ */
+/*	$NetBSD: beagle_machdep.c,v 1.46 2013/06/17 04:37:39 matt Exp $ */
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
  * Based on lubbock_machdep.c which in turn was based on iq80310_machhdep.c
+ *
  * Copyright (c) 2002, 2003, 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.
 @@ -115,27 +115,27 @@
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTERS 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.45 2013/06/16 16:48:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.46 2013/06/17 04:37:39 matt Exp $");
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_ipkdb.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "opt_omap.h"
 #include "prcm.h"
 #include "com.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -160,26 +160,29 @@ __KERNEL_RCSID(0, "$NetBSD: beagle_machd
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
 #include <machine/bootconfig.h>
 #include <arm/armreg.h>
 #include <arm/undefined.h>
 #include <arm/arm32/machdep.h>
 #include <arm/mainbus/mainbus.h>
 #include <dev/ic/ns16550reg.h>
 #include <dev/ic/comreg.h>
 #include <arm/omap/omap_com.h>
 #include <arm/omap/omap_var.h>
 #include <arm/omap/omap_wdtvar.h>
 #include <arm/omap/omap2_prcm.h>
 #include <arm/omap/omap2_gpio.h>
 #ifdef TI_AM335X
 #  include <arm/omap/am335x_prcm.h>
 #endif
 #include <evbarm/include/autoconf.h>
 #include <evbarm/beagle/beagle.h>
 #include <dev/i2c/i2cvar.h>
 @@ -385,62 +388,66 @@ beagle_db_trap(int where)
 		oldwatchdogstate = omapwdt32k_enable(0);
 	} else {
 		omapwdt32k_enable(oldwatchdogstate);
+	}
 #endif
+}
 #endif
 void beagle_putchar(char c);
 void
 beagle_putchar(char c)
+{
 #if NCOM > 0
-	unsigned char *com0addr = (char *)CONSADDR_VA;
+	volatile uint32_t *com0addr = (volatile uint32_t *)CONSADDR_VA;
 	int timo = 150000;
-	while ((com0addr[5 * 4] & 0x20) == 0)
+	while ((com0addr[com_lsr] & LSR_TXRDY) == 0) {
 		if (--timo == 0)
 			break;
+	}
-	com0addr[0] = c;
+	com0addr[com_data] = c;
-	while ((com0addr[5 * 4] & 0x20) == 0)
+	while ((com0addr[com_lsr] & LSR_TXRDY) == 0) {
 		if (--timo == 0)
 			break;
+	}
 #endif
+}
 /*
  * u_int initarm(...)
+ *
  * Initial entry point on startup. This gets called before main() is
  * entered.
  * It should be responsible for setting up everything that must be
  * in place when main is called.
  * This includes
  *   Taking a copy of the boot configuration structure.
  *   Initialising the physical console so characters can be printed.
  *   Setting up page tables for the kernel
  *   Relocating the kernel to the bottom of physical memory
  */
 u_int
 initarm(void *arg)
+{
 	psize_t ram_size = 0;
 	char *ptr;
 #if 1
 	beagle_putchar('d');
 #endif
 	/*
 	 * When we enter here, we are using a temporary first level
 	 * translation table with section entries in it to cover the OBIO
 	 * peripherals and SDRAM.  The temporary first level translation table
 	 * is at the end of SDRAM.
 	 */
 #if defined(OMAP_3430) || defined(OMAP_3530) || defined(TI_DM37XX)
 	omap3_cpu_clk();		// find our CPU speed.
 #endif
 #if defined(OMAP_4430) || defined(OMAP_5430)
 	omap4_cpu_clk();		// find our CPU speed.
 #endif
 #if defined(TI_AM335X)
 @@ -766,27 +773,28 @@ emif_memprobe(void)
 #if defined(TI_AM335X)
 	/*
 	 * The original bbone's u-boot misprograms the EMIF so correct it
 	 * if we detect if it has the wrong value.
 	 */
 	if (sdram_config == 0x41805332)
 		sdram_config -= __SHIFTIN(1, SDRAM_CONFIG_RSIZE);
 #endif
 #ifdef OMAP_EMIF2_VBASE
 	/*
 	 * OMAP4 and OMAP5 have two EMIFs so if the 2nd one is configured
 	 * like the first, we have twice the memory.
 	 */
-	if (emif_read_sdram_config(OMAP_EMIF2_VBASE) == sdram_config)
+	const uint32_t sdram_config2 = emif_read_sdram_config(OMAP_EMIF2_VBASE);
 	if (sdram_config2 == sdram_config)
 		memsize <<= 1;
 #endif
 	const u_int ebank = __SHIFTOUT(sdram_config, SDRAM_CONFIG_EBANK);
 	const u_int ibank = __SHIFTOUT(sdram_config, SDRAM_CONFIG_IBANK);
 	const u_int rsize = 9 + __SHIFTOUT(sdram_config, SDRAM_CONFIG_RSIZE);
 	const u_int pagesize = 8 + __SHIFTOUT(sdram_config, SDRAM_CONFIG_PAGESIZE);
 	const u_int width = 2 - __SHIFTOUT(sdram_config, SDRAM_CONFIG_WIDTH);
 #ifdef TI_AM335X
 	KASSERT(ebank == 0);	// No chip selects on Sitara
 #endif
 	memsize <<= (ebank + ibank + rsize + pagesize + width);
 #ifdef VERBOSE_INIT_ARM