Module Name: src
Committed By: jmcneill
Date: Sun May 3 17:24:45 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_com.c tegra_reg.h
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
UART clock source is PLLP. Set com type to COM_TYPE_TEGRA.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_com.c
diff -u src/sys/arch/arm/nvidia/tegra_com.c:1.1 src/sys/arch/arm/nvidia/tegra_com.c:1.2
--- src/sys/arch/arm/nvidia/tegra_com.c:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_com.c Sun May 3 17:24:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_com.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_com.c,v 1.2 2015/05/03 17:24:45 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.2 2015/05/03 17:24:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -88,8 +88,8 @@ tegra_com_attach(device_t parent, device
bus_space_handle_t bsh;
sc->sc_dev = self;
- sc->sc_frequency = TEGRA_UART_FREQ;
- sc->sc_type = COM_TYPE_NORMAL;
+ sc->sc_frequency = tegra_car_uart_rate(loc->loc_port);
+ sc->sc_type = COM_TYPE_TEGRA;
if (com_is_console(bst, iobase, &bsh) == 0
&& bus_space_subregion(bst, tio->tio_bsh,
Index: src/sys/arch/arm/nvidia/tegra_reg.h
diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.6 src/sys/arch/arm/nvidia/tegra_reg.h:1.7
--- src/sys/arch/arm/nvidia/tegra_reg.h:1.6 Sun May 3 01:07:44 2015
+++ src/sys/arch/arm/nvidia/tegra_reg.h Sun May 3 17:24:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_reg.h,v 1.6 2015/05/03 01:07:44 jmcneill Exp $ */
+/* $NetBSD: tegra_reg.h,v 1.7 2015/05/03 17:24:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -66,7 +66,6 @@
#define TEGRA_AHB_A2_VBASE 0xfd000000
#define TEGRA_REF_FREQ 12000000
-#define TEGRA_UART_FREQ TEGRA_REF_FREQ
/* APB */
#define TEGRA_UARTA_OFFSET 0x00006000
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.9 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.10
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.9 Sun May 3 01:07:44 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Sun May 3 17:24:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.9 2015/05/03 01:07:44 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.10 2015/05/03 17:24:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.9 2015/05/03 01:07:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.10 2015/05/03 17:24:45 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -354,8 +354,9 @@ consinit(void)
#if NCOM > 0
const bus_space_tag_t bst = &armv7_generic_a4x_bs_tag;
- if (comcnattach(bst, CONSADDR, CONSPEED, TEGRA_UART_FREQ,
- COM_TYPE_NORMAL, CONMODE)) {
+ const u_int freq = tegra_car_uart_rate(3);
+ if (comcnattach(bst, CONSADDR, CONSPEED, freq,
+ COM_TYPE_TEGRA, CONMODE)) {
panic("Serial console cannot be initialized.");
}
#else
