---

yaml --- r: 67576 b: refs/heads/master c: 52aff9f h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 48c9639 · 48c9639
1 parent fb59bac
commit 48c9639
Show file tree

Hide file tree

Showing 17 changed files with 187 additions and 1,372 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895532a166010d8d8b4d58d63d21012eced22492
+refs/heads/master: 52aff9f93e452b3a55be74018dc90eb0ddde0a9c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2288,8 +2288,6 @@ S:	Maintained
 LINUX FOR POWERPC EMBEDDED MPC52XX
 P:	Sylvain Munaut
 M:	tnt@246tNt.com
-P:	Grant Likely
-M:	grant.likely@secretlab.ca
 W:	http://www.246tNt.com/mpc52xx/
 W:	http://www.penguinppc.org/
 L:	linuxppc-dev@ozlabs.org
@@ -2308,7 +2306,7 @@ S:	Maintained
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 P:	Grant Likely
 M:	grant.likely@secretlab.ca
-W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
+W:	http://www.secretlab.ca/
 L:	linuxppc-dev@ozlabs.org
 S:	Maintained
 

diff --git a/trunk/arch/powerpc/boot/dts/kilauea.dts b/trunk/arch/powerpc/boot/dts/kilauea.dts
diff --git a/trunk/arch/powerpc/boot/dts/mpc8272ads.dts b/trunk/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -121,7 +121,7 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
-			reg = <119c0 30 0 2000>;
+			reg = <119c0 30>;
 			ranges;
 
 			muram@0 {

diff --git a/trunk/arch/powerpc/boot/uartlite.c b/trunk/arch/powerpc/boot/uartlite.c
@@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c)
 
 static unsigned char uartlite_getc(void)
 {
-	u32 reg = 0;
-	while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */
+	u32 reg = ULITE_STATUS_RXVALID;
+	while (reg & ULITE_STATUS_RXVALID) /* spin on RXVALID bit */
 		reg = in_be32(reg_base + ULITE_STATUS);
 	return in_be32(reg_base + ULITE_RX);
 }