git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
tqm8548-bigflash.dts
diff --git
a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index
19aa723
..
00f7ed7
100644
(file)
--- a/
arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/
arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@
-85,9
+85,9
@@
interrupt-parent = <&mpic>;
dfsrr;
interrupt-parent = <&mpic>;
dfsrr;
- dtt@
50
{
+ dtt@
48
{
compatible = "national,lm75";
compatible = "national,lm75";
- reg = <0x
50
>;
+ reg = <0x
48
>;
};
rtc@68 {
};
rtc@68 {
@@
-247,7
+247,7
@@
interrupts = <31 2 32 2 33 2>;
interrupt-parent = <&mpic>;
tbi-handle = <&tbi2>;
interrupts = <31 2 32 2 33 2>;
interrupt-parent = <&mpic>;
tbi-handle = <&tbi2>;
- phy-handle = <&phy
3
>;
+ phy-handle = <&phy
4
>;
mdio@520 {
#address-cells = <1>;
mdio@520 {
#address-cells = <1>;
@@
-275,7
+275,7
@@
interrupts = <37 2 38 2 39 2>;
interrupt-parent = <&mpic>;
tbi-handle = <&tbi3>;
interrupts = <37 2 38 2 39 2>;
interrupt-parent = <&mpic>;
tbi-handle = <&tbi3>;
- phy-handle = <&phy
4
>;
+ phy-handle = <&phy
5
>;
mdio@520 {
#address-cells = <1>;
mdio@520 {
#address-cells = <1>;