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

6 files changed, 16 insertions, 16 deletions

diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index 231bae756637..b6f1fc6eb960 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -84,9 +84,9 @@
                         interrupt-parent = <&mpic>;
                         dfsrr;
 
-                        dtt@50 {
+                        dtt@48 {
                                 compatible = "national,lm75";
-                                reg = <0x50>;
+                                reg = <0x48>;
                         };
 
                         rtc@68 {
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index 4356a1f08295..fa6a3d54a8a5 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -83,9 +83,9 @@
                         interrupt-parent = <&mpic>;
                         dfsrr;
 
-                        dtt@50 {
+                        dtt@48 {
                                 compatible = "national,lm75";
-                                reg = <0x50>;
+                                reg = <0x48>;
                         };
 
                         rtc@68 {
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 19aa72301c83..00f7ed7a2455 100644
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.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>;
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 49145a04fc6c..673e4a778ac8 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>;
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index 06d366ebbda3..6a99f1eef7ad 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -83,9 +83,9 @@
                         interrupt-parent = <&mpic>;
                         dfsrr;
 
-                        dtt@50 {
+                        dtt@48 {
                                 compatible = "national,lm75";
-                                reg = <0x50>;
+                                reg = <0x48>;
                         };
 
                         rtc@68 {
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index feff915e0492..b6c2d71defd3 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -85,9 +85,9 @@
                         interrupt-parent = <&mpic>;
                         dfsrr;
 
-                        dtt@50 {
+                        dtt@48 {
                                 compatible = "national,lm75";
-                                reg = <0x50>;
+                                reg = <0x48>;
                         };
 
                         rtc@68 {