[PATCH] powerpc: update iSeries viodasd device-tree entries

These devices should have device_type block and a unique compatible entry.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 0a082578193708540c443d87200af4cf1997225e..285f2b2e7d83640e6fa153b020053349ed56a448 100644 (file)
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -971,8 +971,8 @@ void dt_vdevices(struct iseries_flat_dt *dt)
        for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++) {
                snprintf(buf, 32, "viodasd@%08x", reg + i);
                dt_start_node(dt, buf);
-               dt_prop_str(dt, "device_type", "viodasd");
-               dt_prop_str(dt, "compatible", "");
+               dt_prop_str(dt, "device_type", "block");
+               dt_prop_str(dt, "compatible", "IBM,iSeries-viodasd");
                dt_prop_u32(dt, "reg", reg + i);
                dt_prop_u32(dt, "linux,unit_address", i);
                dt_end_node(dt);

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index f63e07bd9f9c4e3b23f20c626c95e260451f1639..b0df4f5ab97afff4d490e9781fae37bd9984a210 100644 (file)
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -747,7 +747,7 @@ static int viodasd_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viodasd_device_table[] __devinitdata = {
-       { "viodasd", "" },
+       { "block", "IBM,iSeries-viodasd" },
        { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viodasd_device_table);