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

diff --combined arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 19aa72301c837348b7d04c91c0b167faa232569c,5b669ea0da2c8926230a1978178bd151f960a368..00f7ed7a24552295020fdc632b52527863f38709
--- 1/arch/powerpc/boot/dts/tqm8548-bigflash.dts
--- 2/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@@ -85,9 -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 +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 +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>;
@@@ -397,13 -397,10 +397,13 @@@
                upm@3,0 {
                        #address-cells = <0>;
                        #size-cells = <0>;
 -                      compatible = "fsl,upm-nand";
 +                      compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand";
                        reg = <3 0x0 0x800>;
                        fsl,upm-addr-offset = <0x10>;
                        fsl,upm-cmd-offset = <0x08>;
 +                      /* Micron MT29F8G08FAB multi-chip device */
 +                      fsl,upm-addr-line-cs-offsets = <0x0 0x200>;
 +                      fsl,upm-wait-flags = <0x5>;
                        chip-delay = <25>; // in micro-seconds
  
                        nand@0 {
@@@ -412,7 -409,7 +412,7 @@@
  
                                partition@0 {
                                            label = "fs";
 -                                          reg = <0x00000000 0x01000000>;
 +                                          reg = <0x00000000 0x10000000>;
                                };
                        };
                };

diff --combined arch/powerpc/boot/dts/tqm8548.dts
index 49145a04fc6c2b892535036ec2b1de89a76e38b7,61437bfd3127ea6b7258b4cbcfb872d13cde6b57..673e4a778ac8129753a32bdd449c93cd3038b1e6
--- 1/arch/powerpc/boot/dts/tqm8548.dts
--- 2/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@@ -85,9 -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 +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 +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>;
@@@ -397,13 -397,10 +397,13 @@@
                upm@3,0 {
                        #address-cells = <0>;
                        #size-cells = <0>;
 -                      compatible = "fsl,upm-nand";
 +                      compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand";
                        reg = <3 0x0 0x800>;
                        fsl,upm-addr-offset = <0x10>;
                        fsl,upm-cmd-offset = <0x08>;
 +                      /* Micron MT29F8G08FAB multi-chip device */
 +                      fsl,upm-addr-line-cs-offsets = <0x0 0x200>;
 +                      fsl,upm-wait-flags = <0x5>;
                        chip-delay = <25>; // in micro-seconds
  
                        nand@0 {
@@@ -412,7 -409,7 +412,7 @@@
  
                                partition@0 {
                                            label = "fs";
 -                                          reg = <0x00000000 0x01000000>;
 +                                          reg = <0x00000000 0x10000000>;
                                };
                        };
                };