Sat Apr 19 19:47:55 2014 UTC ()

Use the conspeed and div/frac from the uart to figure out the frequency
for the console.   XXX until we actually compute from the chip clocks.


(matt)

diff -r1.7 -r1.8 src/sys/arch/evbarm/odroid/odroid_machdep.c

--- src/sys/arch/evbarm/odroid/Attic/odroid_machdep.c 2014/04/18 14:17:11	1.7
+++ src/sys/arch/evbarm/odroid/Attic/odroid_machdep.c 2014/04/19 19:47:55	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: odroid_machdep.c,v 1.7 2014/04/18 14:17:11 reinoud Exp $ */
+/*	$NetBSD: odroid_machdep.c,v 1.8 2014/04/19 19:47:55 matt Exp $ */
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Reinoud Zandijk.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.7 2014/04/18 14:17:11 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.8 2014/04/19 19:47:55 matt Exp $");
 #include "opt_evbarm_boardtype.h"
 #include "opt_exynos.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_ipkdb.h"
 #include "opt_md.h"
 #include "opt_sscom.h"
 #include "opt_arm_debug.h"
 #include "ukbd.h"
 #include "arml2cc.h"	// RPZ why is it not called opt_l2cc.h?
 @@ -423,40 +423,53 @@ strcpy(tmp, "-v");
+}
 void
 consinit(void)
+{
 	static bool consinit_called;
 	if (consinit_called)
 		return;
 	consinit_called = true;
 #if NSSCOM > 0
 	bus_space_tag_t bst = &exynos_bs_tag;
 	bus_addr_t iobase = armreg_tpidruro_read();
-	size_t i;
+	bus_space_handle_t bsh = EXYNOS_IOPHYSTOVIRT(iobase);
 	u_int i;
 	/*
 	 * No need to guess at the UART frequency since we can caclulate it.
 	 */
 	uint32_t freq = conspeed
 	   * (16 * (bus_space_read_4(bst, bsh, SSCOM_UBRDIV) + 1)
 		 + bus_space_read_4(bst, bsh, SSCOM_UFRACVAL));
 	freq = (freq + conspeed / 2) / 1000;
 	freq *= 1000;
 	for (i = 0; i < __arraycount(exynos_uarts); i++) {
 		/* attach console */
 		if (exynos_uarts[i].iobase + EXYNOS_CORE_PBASE == iobase)
 			break;
+	}
 	KASSERT(i < __arraycount(exynos_uarts));
 	printf("%s: attaching console @ %#"PRIxPTR" (%u HZ, %u bps)\n",
-	if (sscom_cnattach(&exynos_bs_tag, exynos_core_bsh,
+	    __func__, iobase, freq, conspeed);
-			&exynos_uarts[i], conspeed, EXYNOS_UART_FREQ,
+	if (sscom_cnattach(bst, exynos_core_bsh, &exynos_uarts[i],
-			conmode))
+			   conspeed, freq, conmode))
 		panic("Serial console can not be initialized");
 #ifdef VERBOSE_INIT_ARM
 	printf("Console initialized\n");
 #endif
 #else
 #error only serial console is supported
 #if NUKBD > 0
 	/* allow USB keyboards to become console */
 	ukbd_cnattach();
 #endif /* NUKBD */
 #endif
+}
 void
 odroid_device_register(device_t self, void *aux)
+{
 	prop_dictionary_t dict = device_properties(self);