Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit de0fe3b83f4bb47a0a6b47897bb3800862194016

Authored by Stephen Rothwell
Committed by Paul Mackerras
1 parent dc3c9b8ca2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/powerpc/platforms/iseries/setup.c
Diff comments   View file @ de0fe3b
... ... @@ -982,8 +982,8 @@
982 982 for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++) {
983 983 snprintf(buf, 32, "viocd@%08x", reg + i);
984 984 dt_start_node(dt, buf);
985   - dt_prop_str(dt, "device_type", "viocd");
986   - dt_prop_str(dt, "compatible", "");
  985 + dt_prop_str(dt, "device_type", "block");
  986 + dt_prop_str(dt, "compatible", "IBM,iSeries-viocd");
987 987 dt_prop_u32(dt, "reg", reg + i);
988 988 dt_prop_u32(dt, "linux,unit_address", i);
989 989 dt_end_node(dt);
... ... @@ -992,8 +992,8 @@
992 992 for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++) {
993 993 snprintf(buf, 32, "viotape@%08x", reg + i);
994 994 dt_start_node(dt, buf);
995   - dt_prop_str(dt, "device_type", "viotape");
996   - dt_prop_str(dt, "compatible", "");
  995 + dt_prop_str(dt, "device_type", "byte");
  996 + dt_prop_str(dt, "compatible", "IBM,iSeries-viotape");
997 997 dt_prop_u32(dt, "reg", reg + i);
998 998 dt_prop_u32(dt, "linux,unit_address", i);
999 999 dt_end_node(dt);
drivers/cdrom/viocd.c
Diff comments   View file @ de0fe3b
... ... @@ -731,7 +731,7 @@
731 731 * support.
732 732 */
733 733 static struct vio_device_id viocd_device_table[] __devinitdata = {
734   - { "viocd", "" },
  734 + { "block", "IBM,iSeries-viocd" },
735 735 { "", "" }
736 736 };
737 737 MODULE_DEVICE_TABLE(vio, viocd_device_table);
drivers/char/viotape.c
Diff comments   View file @ de0fe3b
... ... @@ -989,7 +989,7 @@
989 989 * support.
990 990 */
991 991 static struct vio_device_id viotape_device_table[] __devinitdata = {
992   - { "viotape", "" },
  992 + { "byte", "IBM,iSeries-viotape" },
993 993 { "", "" }
994 994 };
995 995 MODULE_DEVICE_TABLE(vio, viotape_device_table);