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] pasemi: Remove warning in mpic_pasemi_msi.c
  [POWERPC] pasemi: Register i2c devices at boot
  [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
  [POWERPC] Fix warning in pseries/power.c
  [POWERPC] Fix bootwrapper builds with older gcc versions
  [POWERPC] Fix dt_mem_next_cell() to read the full address
  [POWERPC] Kill sparse warnings in kprobes
  [POWERPC] spufs: fix scheduler starvation by idle contexts
  [POWERPC] 44x: Add multiplatform defconfig
  [POWERPC] 44x: Fix Kconfig formatting
  [POWERPC] 4xx: Update defconfigs for 2.6.25
  [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
  [POWERPC] PPC440EP Interrupt Triggering and Level Settings
  [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table

1 files changed, 97 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/pasemi/misc.c b/arch/powerpc/platforms/pasemi/misc.c
new file mode 100644
index 000000000000..ded7d152d00c
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/misc.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2007 PA Semi, Inc
+ *
+ * Parts based on arch/powerpc/sysdev/fsl_soc.c:
+ *
+ * 2006 (c) MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/of.h>
+#include <linux/i2c.h>
+
+#ifdef CONFIG_I2C_BOARDINFO
+/* The below is from fsl_soc.c.  It's copied because since there are no
+ * official bus bindings at this time it doesn't make sense to share across
+ * the platforms, even though they happen to be common.
+ */
+struct i2c_driver_device {
+        char    *of_device;
+        char    *i2c_driver;
+        char    *i2c_type;
+};
+
+static struct i2c_driver_device i2c_devices[] __initdata = {
+        {"dallas,ds1338",  "rtc-ds1307",  "ds1338"},
+};
+
+static int __init find_i2c_driver(struct device_node *node,
+                                     struct i2c_board_info *info)
+{
+        int i;
+
+        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,
+                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
+                        return -ENOMEM;
+                return 0;
+        }
+        return -ENODEV;
+}
+
+static int __init pasemi_register_i2c_devices(void)
+{
+        struct pci_dev *pdev;
+        struct device_node *adap_node;
+        struct device_node *node;
+
+        pdev = NULL;
+        while ((pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa003, pdev))) {
+                adap_node = pci_device_to_OF_node(pdev);
+
+                if (!adap_node)
+                        continue;
+
+                node = NULL;
+                while ((node = of_get_next_child(adap_node, node))) {
+                        struct i2c_board_info info = {};
+                        const u32 *addr;
+                        int len;
+
+                        addr = of_get_property(node, "reg", &len);
+                        if (!addr || len < sizeof(int) ||
+                            *addr > (1 << 10) - 1) {
+                                printk(KERN_WARNING
+                                        "pasemi_register_i2c_devices: "
+                                        "invalid i2c device entry\n");
+                                continue;
+                        }
+
+                        info.irq = irq_of_parse_and_map(node, 0);
+                        if (info.irq == NO_IRQ)
+                                info.irq = -1;
+
+                        if (find_i2c_driver(node, &info) < 0)
+                                continue;
+
+                        info.addr = *addr;
+
+                        i2c_register_board_info(PCI_FUNC(pdev->devfn), &info,
+                                                1);
+                }
+        }
+        return 0;
+}
+device_initcall(pasemi_register_i2c_devices);
+#endif