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

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



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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 07fb3f45

arch/powerpc/platforms/iseries/setup.c

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

drivers/block/viodasd.c

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