From owner-p4-projects@FreeBSD.ORG  Thu Jun  9 08:53:32 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF45E1065673; Thu,  9 Jun 2011 08:53:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AE7D106566B
	for <perforce@freebsd.org>; Thu,  9 Jun 2011 08:53:31 +0000 (UTC)
	(envelope-from jceel@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 78AB28FC0C
	for <perforce@freebsd.org>; Thu,  9 Jun 2011 08:53:31 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p598rV2w027532
	for <perforce@freebsd.org>; Thu, 9 Jun 2011 08:53:31 GMT
	(envelope-from jceel@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p598rVTg027529
	for perforce@freebsd.org; Thu, 9 Jun 2011 08:53:31 GMT
	(envelope-from jceel@freebsd.org)
Date: Thu, 9 Jun 2011 08:53:31 GMT
Message-Id: <201106090853.p598rVTg027529@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jceel@freebsd.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 194490 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2011 08:53:32 -0000

http://p4web.freebsd.org/@@194490?ac=10

Change 194490 by jceel@jceel_cyclone on 2011/06/09 08:53:09

	Small FDT fixes.

Affected files ...

.. //depot/projects/soc2011/jceel_lpc/sys/dev/uart/uart_bus_fdt.c#2 edit
.. //depot/projects/soc2011/jceel_lpc/sys/dev/uart/uart_dev_ns8250.c#3 edit

Differences ...

==== //depot/projects/soc2011/jceel_lpc/sys/dev/uart/uart_bus_fdt.c#2 (text+ko) ====

@@ -197,7 +197,7 @@
 	err = fdt_regsize(node, &start, &size);
 	if (err)
 		return (ENXIO);
-	start += fdt_immr_va;
+	start += fdt_immr_pa;
 
 	return (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh));
 }

==== //depot/projects/soc2011/jceel_lpc/sys/dev/uart/uart_dev_ns8250.c#3 (text+ko) ====

@@ -43,6 +43,8 @@
 
 #define	DEFAULT_RCLK	1843200
 
+extern void lpc_early_puts(char *);
+
 /*
  * Clear pending interrupts. THRE is cleared by reading IIR. Data
  * that may have been received gets lost here.
@@ -238,6 +240,8 @@
 {
 	u_char val;
 
+	lpc_early_puts("ns8250_probe\r\n");
+
 	/* Check known 0 bits that don't depend on DLAB. */
 	val = uart_getreg(bas, REG_IIR);
 #if 0
@@ -251,8 +255,8 @@
 	 * the probe succeeds.
 	 */
 	val = uart_getreg(bas, REG_MCR);
-	if (val & 0xa0)
-		return (ENXIO);
+//	if (val & 0xa0)
+//		return (ENXIO);
 
 	return (0);
 }