Commit de0fe3b8 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent dc3c9b8c

arch/powerpc/platforms/iseries/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/cdrom/viocd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/char/viotape.c

+1 −1
Original line number Diff line number Diff line
@@ -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);