Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

3 files changed, 23 insertions, 112 deletions

diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
index 6f019f19be71..e74bb949c289 100644
--- a/drivers/char/hvc_beat.c
+++ b/drivers/char/hvc_beat.c
@@ -97,7 +97,7 @@ static int hvc_beat_config(char *p)
         return 0;
 }
 
-static int hvc_beat_console_init(void)
+static int __init hvc_beat_console_init(void)
 {
         if (hvc_beat_useit && machine_is_compatible("Beat")) {
                 hvc_instantiate(0, 0, &hvc_beat_get_put_ops);
@@ -106,7 +106,7 @@ static int hvc_beat_console_init(void)
 }
 
 /* temp */
-static int hvc_beat_init(void)
+static int __init hvc_beat_init(void)
 {
         struct hvc_struct *hp;
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 7901d5f218ec..a2894d425153 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2253,19 +2253,19 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
                 return ret;
         }
 
-        regsize = get_property(np, "reg-size", &proplen);
+        regsize = of_get_property(np, "reg-size", &proplen);
         if (regsize && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regsize from OF\n");
                 return -EINVAL;
         }
 
-        regspacing = get_property(np, "reg-spacing", &proplen);
+        regspacing = of_get_property(np, "reg-spacing", &proplen);
         if (regspacing && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regspacing from OF\n");
                 return -EINVAL;
         }
 
-        regshift = get_property(np, "reg-shift", &proplen);
+        regshift = of_get_property(np, "reg-shift", &proplen);
         if (regshift && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regshift from OF\n");
                 return -EINVAL;
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index e12275df6ea2..f1d60f0cef8f 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -92,47 +92,6 @@ struct viot_devinfo_struct {
 #define VIOTAPOP_SETPART       14
 #define VIOTAPOP_UNLOAD        15
 
-struct viotapelpevent {
-        struct HvLpEvent event;
-        u32 reserved;
-        u16 version;
-        u16 sub_type_result;
-        u16 tape;
-        u16 flags;
-        u32 token;
-        u64 len;
-        union {
-                struct {
-                        u32 tape_op;
-                        u32 count;
-                } op;
-                struct {
-                        u32 type;
-                        u32 resid;
-                        u32 dsreg;
-                        u32 gstat;
-                        u32 erreg;
-                        u32 file_no;
-                        u32 block_no;
-                } get_status;
-                struct {
-                        u32 block_no;
-                } get_pos;
-        } u;
-};
-
-enum viotapesubtype {
-        viotapeopen = 0x0001,
-        viotapeclose = 0x0002,
-        viotaperead = 0x0003,
-        viotapewrite = 0x0004,
-        viotapegetinfo = 0x0005,
-        viotapeop = 0x0006,
-        viotapegetpos = 0x0007,
-        viotapesetpos = 0x0008,
-        viotapegetstatus = 0x0009
-};
-
 enum viotaperc {
         viotape_InvalidRange = 0x0601,
         viotape_InvalidToken = 0x0602,
@@ -223,14 +182,11 @@ static const struct vio_error_entry viotape_err_table[] = {
 #define VIOT_WRITING            2
 
 /* Our info on the tapes */
-struct tape_descr {
-        char rsrcname[10];
-        char type[4];
-        char model[3];
-};
-
-static struct tape_descr *viotape_unitinfo;
-static dma_addr_t viotape_unitinfo_token;
+static struct {
+        const char *rsrcname;
+        const char *type;
+        const char *model;
+} viotape_unitinfo[VIOTAPE_MAX_TAPE];
 
 static struct mtget viomtget[VIOTAPE_MAX_TAPE];
 
@@ -381,53 +337,6 @@ int tape_rc_to_errno(int tape_rc, char *operation, int tapeno)
         return -err->errno;
 }
 
-/* Get info on all tapes from OS/400 */
-static int get_viotape_info(void)
-{
-        HvLpEvent_Rc hvrc;
-        int i;
-        size_t len = sizeof(*viotape_unitinfo) * VIOTAPE_MAX_TAPE;
-        struct op_struct *op = get_op_struct();
-
-        if (op == NULL)
-                return -ENOMEM;
-
-        viotape_unitinfo = dma_alloc_coherent(iSeries_vio_dev, len,
-                &viotape_unitinfo_token, GFP_ATOMIC);
-        if (viotape_unitinfo == NULL) {
-                free_op_struct(op);
-                return -ENOMEM;
-        }
-
-        memset(viotape_unitinfo, 0, len);
-
-        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
-                        HvLpEvent_Type_VirtualIo,
-                        viomajorsubtype_tape | viotapegetinfo,
-                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
-                        viopath_sourceinst(viopath_hostLp),
-                        viopath_targetinst(viopath_hostLp),
-                        (u64) (unsigned long) op, VIOVERSION << 16,
-                        viotape_unitinfo_token, len, 0, 0);
-        if (hvrc != HvLpEvent_Rc_Good) {
-                printk(VIOTAPE_KERN_WARN "hv error on op %d\n",
-                                (int)hvrc);
-                free_op_struct(op);
-                return -EIO;
-        }
-
-        wait_for_completion(&op->com);
-
-        free_op_struct(op);
-
-        for (i = 0;
-             ((i < VIOTAPE_MAX_TAPE) && (viotape_unitinfo[i].rsrcname[0]));
-             i++)
-                viotape_numdev++;
-        return 0;
-}
-
-
 /* Write */
 static ssize_t viotap_write(struct file *file, const char *buf,
                 size_t count, loff_t * ppos)
@@ -899,7 +808,6 @@ static void vioHandleTapeEvent(struct HvLpEvent *event)
         tapeminor = event->xSubtype & VIOMINOR_SUBTYPE_MASK;
         op = (struct op_struct *)event->xCorrelationToken;
         switch (tapeminor) {
-        case viotapegetinfo:
         case viotapeopen:
         case viotapeclose:
                 op->rc = tevent->sub_type_result;
@@ -942,11 +850,23 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 {
         int i = vdev->unit_address;
         int j;
+        struct device_node *node = vdev->dev.archdata.of_node;
 
-        if (i >= viotape_numdev)
+        if (i > VIOTAPE_MAX_TAPE)
+                return -ENODEV;
+        if (!node)
                 return -ENODEV;
 
+        if (i >= viotape_numdev)
+                viotape_numdev = i + 1;
+
         tape_device[i] = &vdev->dev;
+        viotape_unitinfo[i].rsrcname = of_get_property(node,
+                                        "linux,vio_rsrcname", NULL);
+        viotape_unitinfo[i].type = of_get_property(node, "linux,vio_type",
+                                        NULL);
+        viotape_unitinfo[i].model = of_get_property(node, "linux,vio_model",
+                                        NULL);
 
         state[i].cur_part = 0;
         for (j = 0; j < MAX_PARTITIONS; ++j)
@@ -1044,11 +964,6 @@ int __init viotap_init(void)
                 goto unreg_chrdev;
         }
 
-        if ((ret = get_viotape_info()) < 0) {
-                printk(VIOTAPE_KERN_WARN "Unable to obtain virtual device information");
-                goto unreg_class;
-        }
-
         ret = vio_register_driver(&viotape_driver);
         if (ret)
                 goto unreg_class;
@@ -1102,10 +1017,6 @@ static void __exit viotap_exit(void)
         vio_unregister_driver(&viotape_driver);
         class_destroy(tape_class);
         unregister_chrdev(VIOTAPE_MAJOR, "viotape");
-        if (viotape_unitinfo)
-                dma_free_coherent(iSeries_vio_dev,
-                                sizeof(viotape_unitinfo[0]) * VIOTAPE_MAX_TAPE,
-                                viotape_unitinfo, viotape_unitinfo_token);
         viopath_close(viopath_hostLp, viomajorsubtype_tape, VIOTAPE_MAXREQ + 2);
         vio_clearHandler(viomajorsubtype_tape);
         clear_op_struct_pool();