Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a2adca95c6a0741b943e7b690b13d4e56c7adac
Commit: 4a2adca95c6a0741b943e7b690b13d4e56c7adac
Parent: d8ecbb93bece05df84e654c296c3c81b3d347c2d
Author: Kim Phillips <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 13 17:26:31 2007 -0600
Committer: Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Mon Nov 19 22:04:01 2007 -0600
[POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
correct the reg property, remove duplicate io port entry, whitespace fixes.
Thanks to Peter Van Ackeren for pointing this out.
Signed-off-by: Kim Phillips <[EMAIL PROTECTED]>
Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/mpc832x_mds.dts | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts
b/arch/powerpc/boot/dts/mpc832x_mds.dts
index fcd333c..eeafa8b 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -104,7 +104,7 @@
reg = <700 100>;
device_type = "ipic";
};
-
+
[EMAIL PROTECTED] {
reg = <1400 100>;
device_type = "par_io";
@@ -117,7 +117,6 @@
3 5 1 0 2 0 /* MDC */
0 d 2 0 1 0 /* RX_CLK
(CLK9) */
3 18 2 0 1 0 /* TX_CLK
(CLK10) */
- 1 1 1 0 1 0 /* TxD1 */
1 0 1 0 1 0 /* TxD0 */
1 1 1 0 1 0 /* TxD1 */
1 2 1 0 1 0 /* TxD2 */
@@ -165,11 +164,11 @@
reg = <e0100000 480>;
brg-frequency = <0>;
bus-frequency = <BCD3D80>;
-
+
[EMAIL PROTECTED] {
device_type = "muram";
ranges = <0 00010000 00004000>;
-
+
[EMAIL PROTECTED] {
reg = <0 4000>;
};
@@ -228,7 +227,7 @@
compatible = "ucc_geth";
model = "UCC";
device-id = <4>;
- reg = <3000 200>;
+ reg = <3200 200>;
interrupts = <23>;
interrupt-parent = < &qeic >;
/*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
