From owner-p4-projects@FreeBSD.ORG  Tue Sep 23 08:50:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E1371065678; Tue, 23 Sep 2008 08:50:02 +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 0E2C31065681
	for <perforce@freebsd.org>; Tue, 23 Sep 2008 08:50:02 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F25898FC0C
	for <perforce@freebsd.org>; Tue, 23 Sep 2008 08:50:01 +0000 (UTC)
	(envelope-from raj@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 m8N8o1p9000917
	for <perforce@freebsd.org>; Tue, 23 Sep 2008 08:50:01 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8N8o1qu000915
	for perforce@freebsd.org; Tue, 23 Sep 2008 08:50:01 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 23 Sep 2008 08:50:01 GMT
Message-Id: <200809230850.m8N8o1qu000915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150332 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, 23 Sep 2008 08:50:02 -0000

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

Change 150332 by raj@raj_mimi on 2008/09/23 08:49:12

	Minor MV78100 SOC ID adjustment.

Affected files ...

.. //depot/projects/arm/src/sys/arm/mv/common.c#3 edit
.. //depot/projects/arm/src/sys/arm/mv/gpio.c#2 edit
.. //depot/projects/arm/src/sys/arm/mv/ic.c#5 edit
.. //depot/projects/arm/src/sys/arm/mv/mvreg.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/mv/common.c#3 (text+ko) ====

@@ -83,7 +83,7 @@
 	uint32_t ef = 0;
 
 	soc_id(&dev, &rev);
-	if (dev == MV_DEV_88F6281 || dev == MV_DEV_78100)
+	if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100)
 		__asm __volatile("mrc p15, 1, %0, c15, c1, 0" : "=r" (ef));
 	else if (dev == MV_DEV_88F5182 || dev == MV_DEV_88F5281)
 		__asm __volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (ef));
@@ -165,7 +165,7 @@
 	case MV_DEV_88F6281:
 		dev = "Marvell 88F6281";
 		break;
-	case MV_DEV_78100:
+	case MV_DEV_MV78100:
 		dev = "Marvell MV78100";
 		break;
 	default:

==== //depot/projects/arm/src/sys/arm/mv/gpio.c#2 (text+ko) ====

@@ -128,7 +128,7 @@
 
 	if (dev_id == MV_DEV_88F5182 ||
 	    dev_id == MV_DEV_88F5281 ||
-	    dev_id == MV_DEV_78100) {
+	    dev_id == MV_DEV_MV78100) {
 		sc->pin_num = 32;
 		sc->irq_num = 4;
 		sc->use_high = 0;

==== //depot/projects/arm/src/sys/arm/mv/ic.c#5 (text+ko) ====

@@ -98,10 +98,10 @@
 	sc->ic_high_regs = 0;
 	sc->ic_error_regs = 0;
 
-	if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_78100)
+	if (dev_id == MV_DEV_88F6281 || dev_id == MV_DEV_MV78100)
 		sc->ic_high_regs = 1;
 
-	if (dev_id == MV_DEV_78100)
+	if (dev_id == MV_DEV_MV78100)
 		sc->ic_error_regs = 1;
 
 	error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res);

==== //depot/projects/arm/src/sys/arm/mv/mvreg.h#3 (text+ko) ====

@@ -439,7 +439,7 @@
 #define MV_DEV_88F5182	0x5182
 #define MV_DEV_88F5281	0x5281
 #define MV_DEV_88F6281	0x6281
-#define MV_DEV_78100	0x6381
+#define MV_DEV_MV78100	0x6381
 
 /*
  * Decode windows definitions and macros