Merge remote branch 'origin' into secretlab/next-devicetree
Grant Likely [Sat, 22 May 2010 06:36:56 +0000 (00:36 -0600)]
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

52 files changed:
1  2 
arch/powerpc/kernel/vio.c
arch/sparc/kernel/time_32.c
drivers/ata/pata_macio.c
drivers/ata/pata_mpc52xx.c
drivers/crypto/talitos.c
drivers/dma/fsldma.c
drivers/dma/ppc4xx/adma.c
drivers/gpio/pca953x.c
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/i2c-core.c
drivers/macintosh/smu.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/nand/fsl_elbc_nand.c
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/pasemi_nand.c
drivers/mtd/nand/socrates_nand.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/sja1000/sja1000_of_platform.c
drivers/net/ehea/ehea_main.c
drivers/net/fec_mpc52xx.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/fs_enet/mac-fcc.c
drivers/net/fs_enet/mac-fec.c
drivers/net/fs_enet/mac-scc.c
drivers/net/fsl_pq_mdio.c
drivers/net/gianfar.c
drivers/net/greth.c
drivers/net/ibm_newemac/core.c
drivers/net/ll_temac_main.c
drivers/net/myri_sbus.c
drivers/net/niu.c
drivers/net/sunbmac.c
drivers/net/sunhme.c
drivers/net/sunlance.c
drivers/net/sunqe.c
drivers/net/ucc_geth.c
drivers/net/xilinx_emaclite.c
drivers/of/of_mdio.c
drivers/sbus/char/flash.c
drivers/scsi/ibmvscsi/ibmvfc.c
drivers/scsi/ibmvscsi/ibmvscsi.c
drivers/serial/mpc52xx_uart.c
drivers/serial/pmac_zilog.c
drivers/serial/sunzilog.c
drivers/serial/uartlite.c
drivers/spi/spi_mpc8xxx.c
drivers/usb/host/fhci-hcd.c
drivers/usb/host/isp1760-if.c
include/linux/device.h
include/linux/i2c.h

@@@ -1320,6 -1325,23 +1325,23 @@@ static ssize_t devspec_show(struct devi
        return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
  }
  
+ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+ {
+       const struct vio_dev *vio_dev = to_vio_dev(dev);
+       struct device_node *dn;
+       const char *cp;
 -      dn = dev->archdata.of_node;
++      dn = dev->of_node;
+       if (!dn)
+               return -ENODEV;
+       cp = of_get_property(dn, "compatible", NULL);
+       if (!cp)
+               return -ENODEV;
+       return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
+ }
  static struct device_attribute vio_dev_attrs[] = {
        __ATTR_RO(name),
        __ATTR_RO(devspec),
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -440,8 -440,8 +440,8 @@@ static int __devinit cpm_i2c_setup(stru
  
        init_waitqueue_head(&cpm->i2c_wait);
  
 -      cpm->irq = of_irq_to_resource(ofdev->node, 0, NULL);
 +      cpm->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
-       if (cpm->irq == NO_IRQ)
+       if (!cpm->irq)
                return -EINVAL;
  
        /* Install interrupt handler. */
Simple merge
@@@ -567,8 -567,8 +567,8 @@@ static int __devinit fsl_i2c_probe(stru
                goto fail_map;
        }
  
 -      i2c->irq = irq_of_parse_and_map(op->node, 0);
 +      i2c->irq = irq_of_parse_and_map(op->dev.of_node, 0);
-       if (i2c->irq != NO_IRQ) { /* i2c->irq = NO_IRQ implies polling */
+       if (i2c->irq) { /* no i2c->irq implies polling */
                result = request_irq(i2c->irq, mpc_i2c_isr,
                                     IRQF_SHARED, "i2c-mpc", i2c);
                if (result < 0) {
Simple merge
Simple merge
@@@ -177,10 -219,9 +219,9 @@@ static int __devinit of_flash_probe(str
                                    const struct of_device_id *match)
  {
  #ifdef CONFIG_MTD_PARTITIONS
-       static const char *part_probe_types[]
-               = { "cmdlinepart", "RedBoot", NULL };
+       const char **part_probe_types;
  #endif
 -      struct device_node *dp = dev->node;
 +      struct device_node *dp = dev->dev.of_node;
        struct resource res;
        struct of_flash *info;
        const char *probe_type = match->data;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -3054,16 -3167,12 +3167,14 @@@ MODULE_DEVICE_TABLE(of, gfar_match)
  
  /* Structure for a device driver */
  static struct of_platform_driver gfar_driver = {
 -      .name = "fsl-gianfar",
 -      .match_table = gfar_match,
 -
 +      .driver = {
 +              .name = "fsl-gianfar",
 +              .owner = THIS_MODULE,
 +              .pm = GFAR_PM_OPS,
 +              .of_match_table = gfar_match,
 +      },
        .probe = gfar_probe,
        .remove = gfar_remove,
-       .suspend = gfar_legacy_suspend,
-       .resume = gfar_legacy_resume,
 -      .driver.pm = GFAR_PM_OPS,
  };
  
  static int __init gfar_init(void)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -597,11 -597,11 +597,11 @@@ ulite_of_probe(struct of_device *op, co
                return rc;
        }
  
 -      irq = irq_of_parse_and_map(op->node, 0);
 +      irq = irq_of_parse_and_map(op->dev.of_node, 0);
  
 -      id = of_get_property(op->node, "port-number", NULL);
 +      id = of_get_property(op->dev.of_node, "port-number", NULL);
  
-       return ulite_assign(&op->dev, id ? *id : -1, res.start+3, irq);
+       return ulite_assign(&op->dev, id ? *id : -1, res.start, irq);
  }
  
  static int __devexit ulite_of_remove(struct of_device *op)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge