[PATCH] powerpc: update iSeries viocd and viotape device-tree

Make their device_type entries more generic and their compatible entries
more specific.

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 d3f94b4f28a81e465fd81e48da74bae37900f904..074d1d9497081caf64314e4bf8ffdd06ecb47882 100644 (file)
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -982,8 +982,8 @@ void dt_vdevices(struct iseries_flat_dt *dt)
        for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++) {
                snprintf(buf, 32, "viocd@%08x", reg + i);
                dt_start_node(dt, buf);
-               dt_prop_str(dt, "device_type", "viocd");
-               dt_prop_str(dt, "compatible", "");
+               dt_prop_str(dt, "device_type", "block");
+               dt_prop_str(dt, "compatible", "IBM,iSeries-viocd");
                dt_prop_u32(dt, "reg", reg + i);
                dt_prop_u32(dt, "linux,unit_address", i);
                dt_end_node(dt);
@@ -992,8 +992,8 @@ void dt_vdevices(struct iseries_flat_dt *dt)
        for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++) {
                snprintf(buf, 32, "viotape@%08x", reg + i);
                dt_start_node(dt, buf);
-               dt_prop_str(dt, "device_type", "viotape");
-               dt_prop_str(dt, "compatible", "");
+               dt_prop_str(dt, "device_type", "byte");
+               dt_prop_str(dt, "compatible", "IBM,iSeries-viotape");
                dt_prop_u32(dt, "reg", reg + i);
                dt_prop_u32(dt, "linux,unit_address", i);
                dt_end_node(dt);

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index c0f817ba7adba0a1b5defc5083b99bd8ff123d25..af6b3bfd169ba1ccb7dc8f77c44bafad408f7dd0 100644 (file)
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -731,7 +731,7 @@ static int viocd_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viocd_device_table[] __devinitdata = {
-       { "viocd", "" },
+       { "block", "IBM,iSeries-viocd" },
        { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viocd_device_table);

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 60aabdb4a046975ead521046aa1353216d3cfbf2..11c7e9de595862a9747b6b19b18d0499e357da6b 100644 (file)
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -989,7 +989,7 @@ static int viotape_remove(struct vio_dev *vdev)
  * support.
  */
 static struct vio_device_id viotape_device_table[] __devinitdata = {
-       { "viotape", "" },
+       { "byte", "IBM,iSeries-viotape" },
        { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, viotape_device_table);