Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
  [POWERPC] PS3: Update ps3_defconfig
  [POWERPC] PS3: Remove unsupported wakeup sources
  [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
  [POWERPC] PS3: Add time include to lpm
  [POWERPC] Fix slb.c compile warnings
  [POWERPC] Xilinx: Fix compile warnings
  [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
  [RAPIDIO] fix current kernel-doc notation
  [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
  Fix a potential issue in mpc52xx uart driver
  [POWERPC] mpc5200: Allow for fixed speed MII configurations
  [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board

diff --combined arch/powerpc/sysdev/fsl_soc.c
index 324c01b70dddfc14701210dc1547c3dfd9a65fab,b59408798fd846039a5b78cf54cbd03bca7b90b3..3a7054e2bb75722a731632af377da31f6420496b
--- 1/arch/powerpc/sysdev/fsl_soc.c
--- 2/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@@ -389,8 -389,8 +389,8 @@@ static int __init gfar_of_init(void
                        }
  
                        gfar_data.phy_id = *id;
-                       snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x",
-                                       res.start);
+                       snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%llx",
+                                (unsigned long long)res.start);
  
                        of_node_put(phy);
                        of_node_put(mdio);
@@@ -418,21 -418,22 +418,21 @@@ arch_initcall(gfar_of_init)
  #include <linux/i2c.h>
  struct i2c_driver_device {
        char    *of_device;
 -      char    *i2c_driver;
        char    *i2c_type;
  };
  
  static struct i2c_driver_device i2c_devices[] __initdata = {
 -      {"ricoh,rs5c372a", "rtc-rs5c372", "rs5c372a",},
 -      {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
 -      {"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
 -      {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
 -      {"dallas,ds1307",  "rtc-ds1307",  "ds1307",},
 -      {"dallas,ds1337",  "rtc-ds1307",  "ds1337",},
 -      {"dallas,ds1338",  "rtc-ds1307",  "ds1338",},
 -      {"dallas,ds1339",  "rtc-ds1307",  "ds1339",},
 -      {"dallas,ds1340",  "rtc-ds1307",  "ds1340",},
 -      {"stm,m41t00",     "rtc-ds1307",  "m41t00"},
 -      {"dallas,ds1374",  "rtc-ds1374",  "rtc-ds1374",},
 +      {"ricoh,rs5c372a", "rs5c372a"},
 +      {"ricoh,rs5c372b", "rs5c372b"},
 +      {"ricoh,rv5c386",  "rv5c386"},
 +      {"ricoh,rv5c387a", "rv5c387a"},
 +      {"dallas,ds1307",  "ds1307"},
 +      {"dallas,ds1337",  "ds1337"},
 +      {"dallas,ds1338",  "ds1338"},
 +      {"dallas,ds1339",  "ds1339"},
 +      {"dallas,ds1340",  "ds1340"},
 +      {"stm,m41t00",     "m41t00"},
 +      {"dallas,ds1374",  "rtc-ds1374"},
  };
  
  static int __init of_find_i2c_driver(struct device_node *node,
@@@ -443,7 -444,9 +443,7 @@@
        for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
                if (!of_device_is_compatible(node, i2c_devices[i].of_device))
                        continue;
 -              if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
 -                          KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
 -                  strlcpy(info->type, i2c_devices[i].i2c_type,
 +              if (strlcpy(info->type, i2c_devices[i].i2c_type,
                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
                        return -ENOMEM;
                return 0;

diff --combined include/linux/rio.h
index c1c99c9643d38f5373e779dcbe5211e9bec31537,0201849480daca8099d1975b330bf4d7a117e5b2..dc0c75556c63c763da2f29e1173606b0502ae78b
--- 1/include/linux/rio.h
--- 2/include/linux/rio.h
+++ b/include/linux/rio.h
@@@ -14,6 -14,8 +14,6 @@@
  #ifndef LINUX_RIO_H
  #define LINUX_RIO_H
  
 -#ifdef __KERNEL__
 -
  #include <linux/types.h>
  #include <linux/ioport.h>
  #include <linux/list.h>
@@@ -161,6 -163,8 +161,8 @@@ enum rio_phy_type 
   * @ops: configuration space functions
   * @id: Port ID, unique among all ports
   * @index: Port index, unique among all port interfaces of the same type
+  * @sys_size: RapidIO common transport system size
+  * @phy_type: RapidIO phy type
   * @name: Port name string
   * @priv: Master port private data
   */
@@@ -329,4 -333,5 +331,4 @@@ extern void rio_close_inb_mbox(struct r
  extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int);
  extern void rio_close_outb_mbox(struct rio_mport *, int);
  
 -#endif                                /* __KERNEL__ */
  #endif                                /* LINUX_RIO_H */