From owner-p4-projects@FreeBSD.ORG  Thu Apr  1 08:18:54 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91F891065673; Thu,  1 Apr 2010 08:18:54 +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 54A961065686
	for <perforce@freebsd.org>; Thu,  1 Apr 2010 08:18:54 +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 341418FC23
	for <perforce@freebsd.org>; Thu,  1 Apr 2010 08:18:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o318IsNS007956
	for <perforce@freebsd.org>; Thu, 1 Apr 2010 08:18:54 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o318IsKp007954
	for perforce@freebsd.org; Thu, 1 Apr 2010 08:18:54 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 1 Apr 2010 08:18:54 GMT
Message-Id: <201004010818.o318IsKp007954@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176395 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, 01 Apr 2010 08:18:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=176395

Change 176395 by raj@raj_fdt on 2010/04/01 08:18:24

	Convert QUICC (CPM) attachment to the FDT convention.

Affected files ...

.. //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#3 edit
.. //depot/projects/fdt/sys/conf/files.powerpc#20 edit
.. //depot/projects/fdt/sys/dev/quicc/quicc_bfe_fdt.c#1 add
.. //depot/projects/fdt/sys/dev/quicc/quicc_bfe_ocp.c#2 delete

Differences ...

==== //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#3 (text+ko) ====

@@ -335,40 +335,12 @@
 			device_type = "open-pic";
 		};
 
-		cpm@919c0 {
+		cpm@80000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
-			reg = <0x919c0 0x30>;
-			ranges;
-
-			muram@80000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0x0 0x80000 0x10000>;
-
-				data@0 {
-					compatible = "fsl,cpm-muram-data";
-					reg = <0x0 0x2000 0x9000 0x1000>;
-				};
-			};
-
-			brg@919f0 {
-				compatible = "fsl,mpc8555-brg",
-				             "fsl,cpm2-brg",
-				             "fsl,cpm-brg";
-				reg = <0x919f0 0x10 0x915f0 0x10>;
-			};
-
-			cpmpic: pic@90c00 {
-				interrupt-controller;
-				#address-cells = <0>;
-				#interrupt-cells = <2>;
-				interrupts = <46 2>;
-				interrupt-parent = <&mpic>;
-				reg = <0x90c00 0x80>;
-				compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
-			};
+			reg = <0x80000 0x20000>;
+			interrupts = <46 2>;
 		};
 	};
 

==== //depot/projects/fdt/sys/conf/files.powerpc#20 (text+ko) ====

@@ -39,7 +39,7 @@
 dev/ofw/ofw_pcibus.c		optional	pci aim | pci fdt
 dev/ofw/ofw_standard.c		optional	aim
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
-dev/quicc/quicc_bfe_ocp.c	optional	quicc mpc85xx
+dev/quicc/quicc_bfe_fdt.c	optional	quicc mpc85xx
 dev/scc/scc_bfe_macio.c		optional	scc powermac
 dev/sec/sec.c			optional	sec mpc85xx
 dev/sound/macio/aoa.c		optional	snd_davbus | snd_ai2s powermac