diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-15 08:42:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-15 08:42:40 -0700 |
| commit | a23c218bd36e11120daf18e00a91d5dc20e288e6 (patch) | |
| tree | 0cb78182bddc622d9464465555eefc8e9ad92343 /arch/powerpc/boot/dts/tqm8548.dts | |
| parent | ea34f43a074af85823e49b9bf62f47d8d3f0e81a (diff) | |
| parent | b71a0c296cee4debaf446760fbd29ead1587a7ac (diff) | |
| download | op-kernel-dev-a23c218bd36e11120daf18e00a91d5dc20e288e6.zip op-kernel-dev-a23c218bd36e11120daf18e00a91d5dc20e288e6.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: pseries/dtl.c should include asm/firmware.h
powerpc: Fix data-corrupting bug in __futex_atomic_op
powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset()
powerpc: Allow 256kB pages with SHMEM
powerpc: Document new FSL I2C bindings and cleanup
powerpc/mm: Fix compile warning
powerpc/85xx: TQM8548: update defconfig
powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
powerpc: Add support for early tlbilx opcode
powerpc: Fix tlbilx opcode
Diffstat (limited to 'arch/powerpc/boot/dts/tqm8548.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8548.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 49145a0..673e4a7 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts @@ -85,9 +85,9 @@ interrupt-parent = <&mpic>; dfsrr; - dtt@50 { + dtt@48 { compatible = "national,lm75"; - reg = <0x50>; + reg = <0x48>; }; rtc@68 { @@ -247,7 +247,7 @@ interrupts = <31 2 32 2 33 2>; interrupt-parent = <&mpic>; tbi-handle = <&tbi2>; - phy-handle = <&phy3>; + phy-handle = <&phy4>; mdio@520 { #address-cells = <1>; @@ -275,7 +275,7 @@ interrupts = <37 2 38 2 39 2>; interrupt-parent = <&mpic>; tbi-handle = <&tbi3>; - phy-handle = <&phy4>; + phy-handle = <&phy5>; mdio@520 { #address-cells = <1>; |
