From owner-p4-projects@FreeBSD.ORG  Tue May 26 20:02:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEC31106566B; Tue, 26 May 2009 20:02:36 +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 9BBE71065677
	for <perforce@FreeBSD.org>; Tue, 26 May 2009 20:02:36 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7059F8FC1A
	for <perforce@FreeBSD.org>; Tue, 26 May 2009 20:02:36 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QK2afU026793
	for <perforce@FreeBSD.org>; Tue, 26 May 2009 20:02:36 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QK2acU026791
	for perforce@freebsd.org; Tue, 26 May 2009 20:02:36 GMT
	(envelope-from syl@FreeBSD.org)
Date: Tue, 26 May 2009 20:02:36 GMT
Message-Id: <200905262002.n4QK2acU026791@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	syl@FreeBSD.org using -f
From: Sylvestre Gallon <syl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 162805 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Tue, 26 May 2009 20:02:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=162805

Change 162805 by syl@syl_rincewind on 2009/05/26 20:02:15

	Update the usart code to be SoC independant.
	Rename uart_cpu_at91rm9200usart.c to uart_cpu_at91usart.c

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#5 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#5 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#6 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#2 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 delete
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91usart.c#1 add
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#2 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#4 (text) ====

@@ -70,5 +70,7 @@
 uint32_t at91_base(void);
 uint32_t at91_irq_sys(void);
 uint32_t at91_sdramc_base(void);
+uint32_t at91_dbgu_base(void);
+uint32_t at91_usart0_base(void);
 
 #endif /* _AT91VAR_H_ */

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#5 (text) ====

@@ -18,7 +18,7 @@
 arm/at91/at91_twi.c		optional	at91_twi
 arm/at91/if_ate.c		optional	ate
 arm/at91/uart_bus_at91usart.c	optional	uart
-arm/at91/uart_cpu_at91rm9200usart.c	optional	uart
+arm/at91/uart_cpu_at91usart.c	optional	uart
 arm/at91/uart_dev_at91usart.c	optional	uart
 #
 # All the SoC we support

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#5 (text+ko) ====

@@ -319,3 +319,16 @@
 {
 	return (AT91RM92_SDRAMC_BASE);
 }
+
+uint32_t
+at91_usart0_base(void)
+{
+	return (AT91RM92_USART0_BASE);
+}
+
+uint32_t
+at91_dbgu_base(void)
+{
+	return (AT91RM92_DBGU_BASE);
+}
+

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#6 (text+ko) ====

@@ -230,3 +230,9 @@
 {
 	return (AT91SAM9261_SDRAMC_BASE);
 }
+
+uint32_t
+at91_dbgu_base(void)
+{
+	return (AT91SAM9261_DBGU_BASE);
+}

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#2 (text) ====

@@ -42,7 +42,6 @@
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/at91/at91rm92reg.h>
 #include <arm/at91/at91var.h>
 
 #include "uart_if.h"

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====

@@ -42,7 +42,6 @@
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 #include <dev/uart/uart_bus.h>
-#include <arm/at91/at91rm92reg.h>
 #include <arm/at91/at91_usartreg.h>
 #include <arm/at91/at91_pdcreg.h>
 #include <arm/at91/at91var.h>