diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-05-14 23:41:22 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 00:35:28 -0400 |
commit | fbabeb60ba783bf7a43858ecefc5066ac1f07162 (patch) | |
tree | 53e319022fa39f3fd44ee12214708f2e4036b920 | |
parent | 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 (diff) |
[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>
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 4 | ||||
-rw-r--r-- | drivers/block/viodasd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 0a0825781937..285f2b2e7d83 100644 --- 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) | |||
971 | for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++) { | 971 | for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++) { |
972 | snprintf(buf, 32, "viodasd@%08x", reg + i); | 972 | snprintf(buf, 32, "viodasd@%08x", reg + i); |
973 | dt_start_node(dt, buf); | 973 | dt_start_node(dt, buf); |
974 | dt_prop_str(dt, "device_type", "viodasd"); | 974 | dt_prop_str(dt, "device_type", "block"); |
975 | dt_prop_str(dt, "compatible", ""); | 975 | dt_prop_str(dt, "compatible", "IBM,iSeries-viodasd"); |
976 | dt_prop_u32(dt, "reg", reg + i); | 976 | dt_prop_u32(dt, "reg", reg + i); |
977 | dt_prop_u32(dt, "linux,unit_address", i); | 977 | dt_prop_u32(dt, "linux,unit_address", i); |
978 | dt_end_node(dt); | 978 | dt_end_node(dt); |
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index f63e07bd9f9c..b0df4f5ab97a 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c | |||
@@ -747,7 +747,7 @@ static int viodasd_remove(struct vio_dev *vdev) | |||
747 | * support. | 747 | * support. |
748 | */ | 748 | */ |
749 | static struct vio_device_id viodasd_device_table[] __devinitdata = { | 749 | static struct vio_device_id viodasd_device_table[] __devinitdata = { |
750 | { "viodasd", "" }, | 750 | { "block", "IBM,iSeries-viodasd" }, |
751 | { "", "" } | 751 | { "", "" } |
752 | }; | 752 | }; |
753 | MODULE_DEVICE_TABLE(vio, viodasd_device_table); | 753 | MODULE_DEVICE_TABLE(vio, viodasd_device_table); |